Skip to content

Commit d54fd2c

Browse files
MightyJosipMightyJosip
committed
Merge remote-tracking branch 'upstream/main' into NewImage
2 parents c9e21c4 + b7d9fc2 commit d54fd2c

File tree

6 files changed

+68
-118
lines changed

6 files changed

+68
-118
lines changed

‎.github/workflows/build-manylinux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Build and push Docker image
5858
if: steps.inspect.outcome == 'failure'
59-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
59+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
6060
with:
6161
context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
6262
file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}

‎README.rst‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -110,61 +110,6 @@ Much more information about installing and compiling is available
110110
on the `Compilation wiki page`_.
111111

112112

113-
Credits
114-
-------
115-
116-
Thanks to everyone who has helped contribute to this library.
117-
Special thanks are also in order.
118-
119-
* Marcus Von Appen: many changes, and fixes, 1.7.1+ freebsd maintainer
120-
* Lenard Lindstrom: the 1.8+ windows maintainer, many changes, and fixes
121-
* Brian Fisher for svn auto builder, bug tracker and many contributions
122-
* Rene Dudfield: many changes, and fixes, 1.7+ release manager/maintainer
123-
* Phil Hassey for his work on the pygame.org website
124-
* DR0ID for his work on the sprite module
125-
* Richard Goedeken for his smoothscale function
126-
* Ulf Ekström for his pixel perfect collision detection code
127-
* Pete Shinners: original author
128-
* David Clark for filling the right-hand-man position
129-
* Ed Boraas and Francis Irving: Debian packages
130-
* Maxim Sobolev: FreeBSD packaging
131-
* Bob Ippolito: macOS and OS X porting (much work!)
132-
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
133-
* Nat Pryce for starting our unit tests
134-
* Dan Richter for documentation work
135-
* TheCorruptor for his incredible logos and graphics
136-
* Nicholas Dudfield: many test improvements
137-
* Alex Folkner for pygame-ctypes
138-
139-
Thanks to those sending in patches and fixes: Niki Spahiev, Gordon
140-
Tyler, Nathaniel Pryce, Dave Wallace, John Popplewell, Michael Urman,
141-
Andrew Straw, Michael Hudson, Ole Martin Bjoerndalen, Herve Cauwelier,
142-
James Mazer, Lalo Martins, Timothy Stranex, Chad Lester, Matthias
143-
Spiller, Bo Jangeborg, Dmitry Borisov, Campbell Barton, Diego Essaya,
144-
Eyal Lotem, Regis Desgroppes, Emmanuel Hainry, Randy Kaelber,
145-
Matthew L Daniel, Nirav Patel, Forrest Voight, Charlie Nolan,
146-
Frankie Robertson, John Krukoff, Lorenz Quack, Nick Irvine,
147-
Michael George, Saul Spatz, Thomas Ibbotson, Tom Rothamel, Evan Kroske,
148-
Cambell Barton.
149-
150-
And our bug hunters above and beyond: Angus, Guillaume Proux, Frank
151-
Raiser, Austin Henry, Kaweh Kazemi, Arturo Aldama, Mike Mulcheck,
152-
Michael Benfield, David Lau
153-
154-
There's many more folks out there who've submitted helpful ideas, kept
155-
this project going, and basically made our life easier. Thanks!
156-
157-
Many thank you's for people making documentation comments, and adding to the
158-
`pygame documentation`_ and the `pygame-ce documentation`_.
159-
160-
Also many thanks for people creating games and putting them on the
161-
pygame.org website for others to learn from and enjoy.
162-
163-
Lots of thanks to James Paige for hosting the pygame bugzilla.
164-
165-
Also a big thanks to Roger Dingledine and the crew at SEUL.ORG for our
166-
excellent hosting.
167-
168113
Dependencies
169114
------------
170115

@@ -238,8 +183,6 @@ See docs/licenses for licenses of dependencies.
238183
:target: https://github.com/psf/black
239184

240185
.. _Pygame: https://pyga.me
241-
.. _pygame-ce documentation: https://pyga.me/docs/
242-
.. _pygame documentation: https://www.pygame.org/docs/
243186
.. _Simple DirectMedia Layer library: https://www.libsdl.org
244187
.. _Compilation wiki page: https://github.com/pygame-community/pygame-ce/wiki#compiling
245188
.. _docs page: https://pyga.me/docs

‎docs/LEGACY_CREDITS.rst‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
Credits
2+
-------
3+
4+
Thanks to everyone who has helped contribute to this library.
5+
Special thanks are also in order.
6+
7+
* Marcus Von Appen: many changes, and fixes, 1.7.1+ freebsd maintainer
8+
* Lenard Lindstrom: the 1.8+ windows maintainer, many changes, and fixes
9+
* Brian Fisher for svn auto builder, bug tracker and many contributions
10+
* Rene Dudfield: many changes, and fixes, 1.7+ release manager/maintainer
11+
* Phil Hassey for his work on the pygame.org website
12+
* DR0ID for his work on the sprite module
13+
* Richard Goedeken for his smoothscale function
14+
* Ulf Ekström for his pixel perfect collision detection code
15+
* Pete Shinners: original author
16+
* David Clark for filling the right-hand-man position
17+
* Ed Boraas and Francis Irving: Debian packages
18+
* Maxim Sobolev: FreeBSD packaging
19+
* Bob Ippolito: macOS and OS X porting (much work!)
20+
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
21+
* Nat Pryce for starting our unit tests
22+
* Dan Richter for documentation work
23+
* TheCorruptor for his incredible logos and graphics
24+
* Nicholas Dudfield: many test improvements
25+
* Alex Folkner for pygame-ctypes
26+
27+
Thanks to those sending in patches and fixes: Niki Spahiev, Gordon
28+
Tyler, Nathaniel Pryce, Dave Wallace, John Popplewell, Michael Urman,
29+
Andrew Straw, Michael Hudson, Ole Martin Bjoerndalen, Herve Cauwelier,
30+
James Mazer, Lalo Martins, Timothy Stranex, Chad Lester, Matthias
31+
Spiller, Bo Jangeborg, Dmitry Borisov, Campbell Barton, Diego Essaya,
32+
Eyal Lotem, Regis Desgroppes, Emmanuel Hainry, Randy Kaelber,
33+
Matthew L Daniel, Nirav Patel, Forrest Voight, Charlie Nolan,
34+
Frankie Robertson, John Krukoff, Lorenz Quack, Nick Irvine,
35+
Michael George, Saul Spatz, Thomas Ibbotson, Tom Rothamel, Evan Kroske,
36+
Cambell Barton.
37+
38+
And our bug hunters above and beyond: Angus, Guillaume Proux, Frank
39+
Raiser, Austin Henry, Kaweh Kazemi, Arturo Aldama, Mike Mulcheck,
40+
Michael Benfield, David Lau
41+
42+
There's many more folks out there who've submitted helpful ideas, kept
43+
this project going, and basically made our life easier. Thanks!
44+
45+
Many thank you's for people making documentation comments, and adding to the
46+
`pygame documentation`_ and the `pygame-ce documentation`_.
47+
48+
Also many thanks for people creating games and putting them on the
49+
pygame.org website for others to learn from and enjoy.
50+
51+
Lots of thanks to James Paige for hosting the pygame bugzilla.
52+
53+
Also a big thanks to Roger Dingledine and the crew at SEUL.ORG for our
54+
excellent hosting.
55+
56+
57+
.. _pygame-ce documentation: https://pyga.me/docs/
58+
.. _pygame documentation: https://www.pygame.org/docs/

‎docs/reST/ref/event.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ specific attributes.
7272
KEYDOWN key, mod, unicode, scancode
7373
KEYUP key, mod, unicode, scancode
7474
MOUSEMOTION pos, rel, buttons, touch
75-
MOUSEBUTTONUP pos, button, touch
76-
MOUSEBUTTONDOWN pos, button, touch
75+
MOUSEBUTTONUP pos, button, touch, clicks
76+
MOUSEBUTTONDOWN pos, button, touch, clicks
7777
JOYAXISMOTION joy (deprecated), instance_id, axis, value
7878
JOYBALLMOTION joy (deprecated), instance_id, ball, rel
7979
JOYHATMOTION joy (deprecated), instance_id, hat, value
@@ -87,6 +87,12 @@ specific attributes.
8787

8888
.. versionchangedold:: 2.0.1 The ``unicode`` attribute was added to ``KEYUP`` event.
8989

90+
.. versionchangedold:: 2.5.7 The ``clicks`` attribute was added to ``MOUSEBUTTONDOWN`` and ``MOUSEBUTTONUP`` events.
91+
92+
The ``clicks`` attribute of the ``MOUSEBUTTONDOWN`` and ``MOUSEBUTTONUP`` events indicate the number of clicks occurring
93+
in rapid succession, e.g. ``1`` for single-click, ``2`` for double-click, etc. Note that double, triple, or more clicks
94+
will still fire mouse events for each individual click, with a progressively increasing ``clicks`` attribute.
95+
9096
Note that ``ACTIVEEVENT``, ``VIDEORESIZE`` and ``VIDEOEXPOSE`` are considered
9197
as "legacy" events, the use of pygame2 ``WINDOWEVENT`` API is recommended over
9298
the use of this older API.

‎docs/readmes/README.it.rst‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -69,62 +69,6 @@ configurare automaticamente, compilare e installare pygame-ce.
6969
Più informazioni riguardo all'installazione e alla compilazione sono
7070
disponibili sulla `Compilation wiki page`_.
7171

72-
Crediti
73-
-------
74-
75-
Grazie a tutti coloro che hanno aiutato a contribuire per questa libraria.
76-
In ordine sono riportati i ringraziamenti speciali.
77-
78-
* Marcus Von Appen: many changes, and fixes, 1.7.1+ freebsd maintainer
79-
* Lenard Lindstrom: the 1.8+ windows maintainer, many changes, and fixes
80-
* Brian Fisher for svn auto builder, bug tracker and many contributions
81-
* Rene Dudfield: many changes, and fixes, 1.7+ release manager/maintainer
82-
* Phil Hassey for his work on the pygame.org website
83-
* DR0ID for his work on the sprite module
84-
* Richard Goedeken for his smoothscale function
85-
* Ulf Ekström for his pixel perfect collision detection code
86-
* Pete Shinners: original author
87-
* David Clark for filling the right-hand-man position
88-
* Ed Boraas and Francis Irving: Debian packages
89-
* Maxim Sobolev: FreeBSD packaging
90-
* Bob Ippolito: macOS and OS X porting (much work!)
91-
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
92-
* Nat Pryce for starting our unit tests
93-
* Dan Richter for documentation work
94-
* TheCorruptor for his incredible logos and graphics
95-
* Nicholas Dudfield: many test improvements
96-
* Alex Folkner for pygame-ctypes
97-
98-
Grazie a coloro che inviano patches e correzioni: Niki Spahiev, Gordon
99-
Tyler, Nathaniel Pryce, Dave Wallace, John Popplewell, Michael Urman,
100-
Andrew Straw, Michael Hudson, Ole Martin Bjoerndalen, Herve Cauwelier,
101-
James Mazer, Lalo Martins, Timothy Stranex, Chad Lester, Matthias
102-
Spiller, Bo Jangeborg, Dmitry Borisov, Campbell Barton, Diego Essaya,
103-
Eyal Lotem, Regis Desgroppes, Emmanuel Hainry, Randy Kaelber,
104-
Matthew L Daniel, Nirav Patel, Forrest Voight, Charlie Nolan,
105-
Frankie Robertson, John Krukoff, Lorenz Quack, Nick Irvine,
106-
Michael George, Saul Spatz, Thomas Ibbotson, Tom Rothamel, Evan Kroske,
107-
Cambell Barton.
108-
109-
E ai nostri incredibili cacciatori di bug: Angus, Guillaume Proux, Frank
110-
Raiser, Austin Henry, Kaweh Kazemi, Arturo Aldama, Mike Mulcheck,
111-
Michael Benfield, David Lau.
112-
113-
Ci sono molte altre persone là fuori che hanno condiviso utili idee, che
114-
hanno mantenuto il progetto in vita e che ci hanno essenzialmente reso la
115-
vita più facile. Grazie!
116-
117-
Molte grazie alle persone che pubblicano commenti sulla documentazione e che
118-
contribuiscono alla `pygame documentation`_ e alla `pygame-ce documentation`_.
119-
120-
Altrettanti ringraziamenti alle persone che creano giochi e che li pubblicano
121-
sul sito pygame.org per rendere possibile agli altri di imparare da essi e di divertirsi.
122-
123-
Molte grazie a James Paige per aver ospitato il bugzilla di pygame.
124-
125-
Un altro grande ringraziamento a Roger Dingledine e al team di SEUL.ORG
126-
per un hosting eccellente.
127-
12872
Requisiti
12973
---------
13074

@@ -203,8 +147,6 @@ Controlla docs/licenses per le licenze dei requisiti.
203147
:target: https://github.com/psf/black
204148

205149
.. _Pygame: https://pyga.me
206-
.. _pygame-ce documentation: https://pyga.me/docs/
207-
.. _pygame documentation: https://www.pygame.org/docs/
208150
.. _Simple DirectMedia Layer library: https://www.libsdl.org
209151
.. _Compilation wiki page: https://github.com/pygame-community/pygame-ce/wiki#compiling
210152
.. _docs page: https://pyga.me/docs

‎src_c/event.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,7 @@ dict_from_event(SDL_Event *event)
12111211
(int)event->button.y);
12121212
_pg_insobj(dict, "pos", obj);
12131213
_pg_insobj(dict, "button", PyLong_FromLong(event->button.button));
1214+
_pg_insobj(dict, "clicks", PyLong_FromLong(event->button.clicks));
12141215
_pg_insobj(
12151216
dict, "touch",
12161217
PyBool_FromLong((event->button.which == SDL_TOUCH_MOUSEID)));

0 commit comments

Comments
 (0)