Commit Graph

3341 Commits

Author SHA1 Message Date
Eli Gottlieb
bad338e4af Fixed overwriting of SDL_shape.c in merge. 2010-08-09 20:27:45 -04:00
Eli Gottlieb
61432b5725 Merging branches. Will begin correcting mistakes introduced by merging. 2010-08-09 15:41:33 -04:00
Eli Gottlieb
75d19f4863 Reformatting code to match the rest of SDL. Variable names seem OK; replaced tabs with 4 spaces each for indentation. 2010-08-09 15:37:20 -04:00
egottlieb
75a9691e3e Fixed lots of little bugs in Win32 shaping and in SDL_CalculateShapeTree(). Still not actually showing anything on Windows, though there's no crashes and everything compiles fine. Bugger. 2010-08-06 20:22:14 -04:00
egottlieb
2ad29056fc Fixed the off-by-one bug in SDL_RecursivelyCalculateShapeTree(). 2010-08-06 13:52:38 -04:00
egottlieb
082b1f9d41 Finally figured out how to use autorelease pools. 2010-08-05 21:27:32 -04:00
egottlieb
86bd63adea Improving Cocoa implementation and fixed a small bug in SDL_shape.c. 2010-08-05 18:58:45 -04:00
egottlieb
f6801f7941 Shaped windows for Cocoa build and testshape runs, but the actual shaping doesn't work. Something, however, is definitely happening, because we get the backgrounds drawn in two different colors. 2010-08-05 01:03:24 -04:00
egottlieb
c2c9b63c50 Correcting minor bugs and adding assertions to help me track down a NULL pointer bug in Cocoa code. 2010-08-05 00:53:38 -04:00
egottlieb
c4d3ce5615 Building under OS X with command-line tools now works. 2010-08-03 23:41:57 -04:00
egottlieb
db9e3b827b Compiling for cocoa now works. Does it run? We'll see. 2010-08-03 23:22:31 -04:00
egottlieb
63f5546ab0 Implemented shaped windows for Cocoa. Still need to see if they actually work. 2010-08-03 21:56:05 -04:00
egottlieb
1123728a5d Removed superfluous VS2010 build files. 2010-08-03 10:10:06 -04:00
egottlieb
4a74542b6e Got basic, pre-actually-writing-anything Cocoa to build. 2010-08-03 00:47:33 -04:00
Eli Gottlieb
122c35caa0 Why wasn't this in the repository? 2010-08-02 23:58:22 -04:00
Eli Gottlieb
f24f9b94db Added SDL_cocoashape.h 2010-08-02 23:33:04 -04:00
egottlieb
1d4ad960e8 Added and re-added VS2010 solution files. 2010-08-02 22:20:13 -04:00
egottlieb
d8d77da906 Added VS2010 build files. 2010-08-02 21:43:08 -04:00
egottlieb
ce799da578 Worked on Windows implementation and the quad-trees. 2010-08-02 01:54:59 -04:00
egottlieb
1341532f15 Added VS2010 tests solution file. 2010-08-01 23:27:22 -04:00
egottlieb
94bc2a7db5 Added Windows build files for testshape. 2010-08-01 23:26:37 -04:00
egottlieb
157494348a Converted some project files to VS2010, adding new files. Backups were made. 2010-08-01 23:16:32 -04:00
egottlieb
ad864c387a Changed the file name to its correct, required one. 2010-08-01 23:07:59 -04:00
Eli Gottlieb
fd29b00539 Fixed a couple of bugs in the general and X11 shape code, and fixed a bug in testshape that was keeping it from recognizing surfaces without alpha. Thanks to Andreas's bit-bashing tip, X11 shaped windows now work entirely, AFAICT. 2010-08-01 21:10:42 -04:00
Eli Gottlieb
d184c2cdf1 Added Andreas's VS2010 patch for testshape. 2010-07-30 18:04:21 -04:00
Eli Gottlieb
c94b94e367 Added Andreas's patch to fix my silly C++-style errors. 2010-07-29 22:57:39 -04:00
Eli Gottlieb
ee13761474 Added the header to the repo. Oops. 2010-07-29 12:49:17 -04:00
Eli Gottlieb
dee5233291 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32. 2010-07-28 23:35:24 -04:00
Eli Gottlieb
6d3fa3eec4 Added shapes folder to hg. 2010-07-26 21:49:32 -04:00
Eli Gottlieb
5e4e70b2bf Working on Cocoa implementation. 2010-07-26 21:48:53 -04:00
Eli Gottlieb
1439b491f6 OK, it appears that dramatic hacks are not necessary to make Cocoa work... 2010-07-26 20:41:45 -04:00
Eli Gottlieb
1ed6481157 Rejiggering the way shaped windows are created as preparation for OS X implementation. Fixed overdrive bug in test program that appears to have been introduced by someone other than myself. 2010-07-26 17:27:04 -04:00
Eli Gottlieb
0b10a1cb52 More work on color-key mode. 2010-07-23 01:48:42 -04:00
Eli Gottlieb
5416c894f4 Added color-key mode and redid the code to work with it. 2010-07-22 23:11:01 -04:00
Eli Gottlieb
e58ba0a462 Reapplied Win32 make-it-build patch. What's going on? Still get rendering artifacts when testing on x11, have literally no idea why. 2010-07-20 12:42:43 -04:00
Eli Gottlieb
a765c590a3 Put the render loop back in its right place, but with delaying functionality to keep it down to roughly 60fps, not eating up all the X11 time. 2010-07-19 00:24:02 -04:00
Eli Gottlieb
725ae8e50b Boxed up the rendering loop and turned it into a redraw/update function. This makes things way more responsive, usable again. 2010-07-18 23:51:47 -04:00
Eli Gottlieb
8a85a825dc Added code to make testshape switch shapes on keystrokes and exit on an ESC keystroke. 2010-07-18 23:36:39 -04:00
Eli Gottlieb
d85a315678 Minor bugfixes. testshape now draws a shaped window with bizarre, pixellated gashes of transparency across it, and in doing so seems to hog a system resource and slow the rest of the video system down. 2010-07-18 23:05:40 -04:00
Eli Gottlieb
f35e180363 Added #define's for error codes returned from SDL shaped-window API. 2010-07-18 22:24:52 -04:00
Eli Gottlieb
4cae3679e9 Same place as before, but optimizing a bit to try to isolate the spot in the program that locks things up. 2010-07-18 22:17:52 -04:00
Eli Gottlieb
c78de4899e Rewrote test program for shaped windows. It definitely displays recognizable pictures now, but the resizing and shaping functionality isn't behaving correctly, possibly due to a miscalculation of alpha values. 2010-07-18 21:31:22 -04:00
Eli Gottlieb
61b1acb7fb Updated testeyes.c. It now shows some kind of gibberish Missingno-type picture somewhere on the screen and, possibly, hangs the window system. On the upside, the Missingno is definitely a non-rectangular window. 2010-07-18 15:15:05 -04:00
Eli Gottlieb
21443b71eb Added SDL_win32shape.h to version control. D'oh. 2010-07-18 14:47:04 -04:00
Eli Gottlieb
bc85c58194 Added in Visual Studio patch. 2010-07-15 01:41:38 -04:00
Eli Gottlieb
8445183d9e Numerous bug fixes that keep testeyes from crashing and dying. 2010-07-14 00:49:28 -04:00
Ryan C. Gordon
8607c1b980 Check configure-defined macro before doing _anything_ with XShape. 2010-07-13 02:43:49 -04:00
Ryan C. Gordon
bf17cebd40 Add XShape test to configure scripts. 2010-07-13 02:43:10 -04:00
Ryan C. Gordon
5d5a40c96b Removed compiled testeyes from revision control. Added it to ignore list. 2010-07-13 02:27:59 -04:00
Ryan C. Gordon
ed00333a03 Make sure we have XShape symbols before we allow a shaped window. 2010-07-13 02:26:50 -04:00