Commit graph

337 commits

Author SHA1 Message Date
Simon Howard
20f405ec54 Fix CP437-Unicode mapping of cedilla character.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2492
2012-02-03 21:38:06 +00:00
Simon Howard
85b5a7487d Upgrade the input box and label widgets to use UTF-8 strings.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2491
2012-02-03 21:10:36 +00:00
Simon Howard
d745a6409c Support Unicode input by mapping typed Unicode characters >= 128 up into
a higher range to avoid conflicts with Doom's key constants.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2490
2012-02-03 21:09:57 +00:00
Simon Howard
c818fb0216 Split off UTF-8 code into separate file and add extra functions.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2489
2012-02-03 20:21:17 +00:00
Simon Howard
d4df22aa1e Beginnings of limited textscreen UTF-8 support.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2487
2012-02-02 23:35:16 +00:00
Simon Howard
1138de4fb6 Fix scroll bar behavior (thanks Alexandre Xavier).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2484
2012-02-02 21:10:20 +00:00
Simon Howard
379d372c65 Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2464
2011-10-23 20:07:40 +00:00
Simon Howard
cc87c97e4b Fix numeric keypad when entering values in text boxes (thanks Twelve).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2463
2011-10-23 19:53:06 +00:00
Simon Howard
8ee96dadb9 Fix crash when closing a window.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2462
2011-10-23 19:42:43 +00:00
Simon Howard
cc7a430448 Don't save value when destructor is called.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2461
2011-10-23 19:28:10 +00:00
Simon Howard
dd52766c7b Rework textscreen focus handling so that input boxes will stop editing
when they lose their focus (thanks Twelve).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2460
2011-10-23 19:25:55 +00:00
Simon Howard
c58ed9c72d Fix crash when calling TXT_Shutdown twice.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2418
2011-10-13 20:19:42 +00:00
Simon Howard
98ecb00e9d Don't allow dropdown widget pop-up window to be placed outside the
boundaries of the screen.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2391
2011-09-20 22:06:12 +00:00
Simon Howard
4fba2ab2dd Add TXT_MessageBox convenience function.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2388
2011-09-20 20:47:19 +00:00
Simon Howard
96f7da6adf Hook query code into setup tool, and add search results window.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2383
2011-09-18 14:16:27 +00:00
Simon Howard
391e7466b1 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2347
2011-06-13 22:21:37 +00:00
Simon Howard
30952764cf Fix libtextscreen window hotkeys to work when shift is held down /
capslock turned on. Fix a similar problem in-game when typing cheat
codes or using menu hotkeys (thanks Alexandre Xavier).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2327
2011-04-17 17:33:04 +00:00
Simon Howard
eb86fcdf30 Allow the shift key to be held down when changing key/mouse/joystick
bindings to prevent bindings to the same key from being cleared (thanks
myk).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2325
2011-04-11 19:49:45 +00:00
Simon Howard
d4ef7c3772 Fix action area minimum width calculation.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2324
2011-04-09 00:27:13 +00:00
Simon Howard
954eeae87e Close dropdown list popup windows when clicking outside the window.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2323
2011-04-04 20:30:17 +00:00
Simon Howard
eac4192d1b Fix crash.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2322
2011-04-04 20:12:59 +00:00
Simon Howard
fe9fc9e107 Fix crash.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2321
2011-04-04 20:09:42 +00:00
Simon Howard
9f3f6683d9 Change the background color when hovering over widgets.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2320
2011-04-04 20:07:07 +00:00
Simon Howard
a69af94b58 Scroll faster in reaction to the scroll wheel.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2310
2011-03-27 23:45:53 +00:00
Simon Howard
e339efa45f Switch separator to show "screen mode" or "window size" depending on
whether fullscreen is turned on or not.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2308
2011-03-22 21:33:17 +00:00
Simon Howard
bc087b49e2 Fix scrollbars so that clicks scroll the pane to a location that matches
the clicked location. Interpret mousewheel events so that scroll panes
can be scrolled.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2307
2011-03-22 21:08:04 +00:00
Simon Howard
a9996b41e9 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2258
2011-02-12 15:38:08 +00:00
Simon Howard
a366f68b29 Fix bug with libtextscreen where it was not possible to type a '+'
(thanks Alexandre Xavier).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2249
2011-02-05 16:50:28 +00:00
Simon Howard
83fb03a0e0 When large numbers of screen resolutions are detected, increase the
number of columns in the mode list to fit them all on-screen. Remove
superfluous left-side spacing from the checkbox and radio button widgets
so that the modes can be packed closer together.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2242
2011-01-31 01:25:47 +00:00
Simon Howard
d1a3967194 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2214
2010-12-10 23:46:22 +00:00
Simon Howard
8dab0a3e63 Merge from trunk. This is slightly out of date as I did the merge
several days ago.

Subversion-branch: /branches/raven-branch
Subversion-revision: 2212
2010-12-10 22:44:01 +00:00
Simon Howard
af3e4412d3 Change alignment of actions in a window's action area so that there is
equal space either side of the center widget. This is more aesthetically
pleasing.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2208
2010-12-10 20:43:05 +00:00
Simon Howard
56824b130b Replace txt_widget_t#selectable with a callback function to query
whether the widget is selectable. This stops the table code from
selecting things that aren't really selectable - eg. empty tables,
scrollpanes containing unselectable widgets, etc.
Fixes a bug with the warp menu (thanks Proteh).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2207
2010-12-10 20:31:46 +00:00
Simon Howard
2a786cc67e Allow textscreen font to be overridden using the TEXTSCREEN_FONT command
line variable.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2195
2010-12-05 14:42:09 +00:00
Simon Howard
1162b2c65c Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1924
2010-04-30 20:53:31 +00:00
Simon Howard
6f8ac36f66 Add textscreen Doxyfile to dist. Add .desktop file to svn:ignore. Add
opl ctags file to localvimrc.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1922
2010-04-30 19:38:24 +00:00
Simon Howard
677729c658 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1845
2010-02-05 23:08:12 +00:00
Simon Howard
a9e2d244a5 Add tags files to svn:ignore properties.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1828
2010-01-27 19:16:26 +00:00
Simon Howard
7972eefbf4 Fix textscreen black border bug.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1745
2009-12-12 01:20:49 +00:00
Simon Howard
afa0c4c797 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1737
2009-11-21 16:36:46 +00:00
Simon Howard
9ea3cb62c9 Perform bounds checking on values passed to TXT_UpdateScreenArea() to
avoid crashes.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1728
2009-11-05 19:57:55 +00:00
Simon Howard
3771126689 Initial hacks for compiling under SDL 1.3.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1726
2009-10-26 19:28:12 +00:00
Simon Howard
410579ec66 Change British English spellings to American English, for consistency.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1699
2009-09-30 23:07:03 +00:00
Simon Howard
42f7a9b8a2 Use "const char" in libtextscreen where appropriate (thanks entryway).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1679
2009-09-20 15:27:40 +00:00
Simon Howard
ec81c27ef5 Allow PGUP/PGDN to scroll up and down in scroll panes (thanks
LionsPhil).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1631
2009-08-27 23:27:47 +00:00
Simon Howard
1715116ef1 Remove redundant variable assignment (thanks Quasar/Yagisan)
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1630
2009-07-20 22:27:59 +00:00
Simon Howard
0f5de61b74 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1596
2009-06-12 00:23:33 +00:00
Simon Howard
779a2157c0 Grab the input in setup when reading a new key binding, so that Windows
CE buttons are read properly. Map buttons to PC function keys.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1594
2009-06-11 19:41:20 +00:00
Simon Howard
ec03448333 Fix wince include. Use top_builddir instead of .. where appropriate.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1591
2009-06-11 00:32:17 +00:00
Simon Howard
122dcc372f Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1579
2009-06-09 18:28:51 +00:00
Simon Howard
895f440628 Catch errors when initialising SDL. Use the small textscreen font by
default on Windows CE if no fullscreen modes are available.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1570
2009-06-07 16:41:46 +00:00
Simon Howard
0be19fa1fe Fix tags for functions using TXT_UNCAST_ARG.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1532
2009-05-26 22:14:24 +00:00
Simon Howard
664c359032 Merge from trunk. Note that src/i_sdlsound.c has not yet been merged as
it contains too many conflicts at present.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1522
2009-05-14 19:45:22 +00:00
Simon Howard
21d67cd730 Make txt_inputboxes emit a "changed" signal when their value is changed.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1520
2009-05-12 18:01:27 +00:00
Simon Howard
5859134e1c Better ASCII chart.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1509
2009-05-05 00:00:53 +00:00
Simon Howard
3b2481de03 Minor smallfont fixups.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1508
2009-05-04 23:46:27 +00:00
Simon Howard
c944d2ab2f Add copyright headers to textscreen examples.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1505
2009-05-01 21:05:57 +00:00
Simon Howard
30c46a6d70 More smallfont fixups.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1504
2009-04-26 16:59:08 +00:00
Simon Howard
8f2df5e7cf Fix up some extended ASCII characters.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1503
2009-04-23 19:58:11 +00:00
Simon Howard
40d03a9c38 Oops.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1502
2009-04-23 18:19:52 +00:00
Simon Howard
c2a270f893 Add small textscreen font for low resolution displays, based on the
Atari-Small font by Tom Fine.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1501
2009-04-23 18:18:43 +00:00
Simon Howard
6e2c404f64 Update from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1467
2009-03-12 22:20:07 +00:00
Simon Howard
f9c51c1b5c Add "make doc" target to run Doxygen, and add a Doxyfile. Add @file tags
to start of header files so that Doxygen will process them.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1451
2009-03-08 22:51:25 +00:00
Simon Howard
11f9260535 Add documentation for high-level txt_desktop.h functions.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1450
2009-03-07 00:35:08 +00:00
Simon Howard
2b5dae761b Add documentation for high-level textscreen functions.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1449
2009-03-07 00:24:45 +00:00
Simon Howard
9b5d574982 Fix signed/unsigned conversion warning.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1448
2009-03-06 20:01:32 +00:00
Simon Howard
67fbcdce28 Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1442
2009-02-08 17:52:08 +00:00
Simon Howard
39b7cb7bb2 Fix layout of widgets within scroll panes. Scroll scroll panes in
response to keyboard events.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1440
2009-01-30 23:53:47 +00:00
Simon Howard
a6be65e608 Shrink text box slightly.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1439
2009-01-29 23:26:03 +00:00
Simon Howard
61361932bf Allow clicking within scroll bars to set position.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1438
2009-01-29 23:00:14 +00:00
Simon Howard
5a122d591e Add scrollable pane widget to textscreen library.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1437
2009-01-29 22:54:13 +00:00
Simon Howard
b9b0c2abfb Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1423
2008-12-20 20:25:22 +00:00
Simon Howard
a0062502d1 Add SDL_CFLAGS, SDL_LDFLAGS to default compile flags, and check for SDL
in configure before checking for libraries and headers, to fix Windows.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1412
2008-12-09 19:56:43 +00:00
Simon Howard
a2afcffe4c Use the hardware palette for textscreen and Hexen graphical startup.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1403
2008-12-02 19:19:48 +00:00
Simon Howard
9935860426 Add fixes for MSVC warnings (thanks entryway).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1095
2008-02-28 20:04:10 +00:00
Simon Howard
65ed2a3208 Update chocolate-setup to the new screen mode config system.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1042
2008-02-04 22:43:11 +00:00
Simon Howard
75ce08abd6 #define inline to _inline in MSVC.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 976
2007-10-18 23:40:50 +00:00
Simon Howard
e4681dd485 Allow more than the standard three mouse buttons to be defined through
setup (hopefully)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 939
2007-07-29 23:41:12 +00:00
Simon Howard
18a8a2ced6 Make the numeric keypad behave like Vanilla does.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 935
2007-07-08 20:53:18 +00:00
Simon Howard
7ecdb1bfab Add *.exe to svn:ignore.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 899
2007-06-09 18:00:19 +00:00
Simon Howard
9d7126c11b Rename txt_main.c to txt_sdl.c; add txt_sdl.h for SDL-specific API
functions, while keeping txt_main.h for the common API. Add
TXT_SDL_SetEventCallback to allow programs to intercept SDL events in
the textscreen main loop.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 892
2007-06-04 18:32:50 +00:00
Simon Howard
2e3e45cb9b Add TXT_SetWindowTitle function to wrap SDL_WM_SetCaption, so that
txt_desktop.c doesn't need to call SDL functions directly.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 885
2007-05-24 14:29:08 +00:00
Simon Howard
6a36c84b15 <SDL.h> -> "SDL.h"
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 866
2007-03-27 11:40:04 +00:00
Simon Howard
c5a4f04bc2 Fix discrepancy between Doom and setup program when prompting for keys.
Add the ability to enable/disable key mappings so that the raw key can
be read in setup, exactly the same way that it is in Doom.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 846
2007-03-09 12:35:18 +00:00
Simon Howard
32762cc65d Fix library ordering for libtextscreen.a; fixes windows compile.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 841
2007-02-24 02:19:45 +00:00
Simon Howard
1041b5c556 Set svn:ignore properties on directories.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 824
2007-01-06 22:26:23 +00:00
Simon Howard
a64a06c4bb Clear the current value when entering a new value in number input boxes.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 816
2007-01-05 23:36:35 +00:00
Simon Howard
8ac5ecc67a Fix typing '_' and '+' in textscreen code.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 815
2007-01-05 23:35:30 +00:00
Simon Howard
20a1417b2e Add function to set radio button labels.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 779
2006-12-16 01:53:54 +00:00
Simon Howard
e54cabaad0 Make dropdown lists emit a signal when set.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 778
2006-12-16 01:53:17 +00:00
Simon Howard
38d45b879b Add missing #include.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 765
2006-12-05 21:05:26 +00:00
Simon Howard
eb0a57a271 Shut up compiler warnings.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 728
2006-10-24 19:32:26 +00:00
Simon Howard
939bb4cf3e Detect failures to initialise textscreen library and bomb out with an
error mess
age.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 727
2006-10-24 19:23:16 +00:00
Simon Howard
9ee3b53c8e Stackable clip areas (useful for a future implementation of scrollable
panes).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 713
2006-10-23 07:13:16 +00:00
Simon Howard
7216263bb7 Shut up compiler warnings
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 695
2006-10-11 23:03:19 +00:00
Simon Howard
be3d314a61 Add float spin control and use it for the acceleration controller in setup.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 692
2006-10-07 00:59:03 +00:00
Simon Howard
88b3410b6a Alternate textscreen palette that fits the Tango desktop guidelines: see
http://uwstopia.nl/blog/2006/07/tango-terminal

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 690
2006-10-06 17:10:16 +00:00
Simon Howard
d3d4f6587f Add TXT_NewButton2 for creating a button with a callback (for convenience).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 673
2006-09-26 23:48:23 +00:00
Simon Howard
0755f5ac88 Add TXT_AddWidgets for adding multiple widgets to a table.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 672
2006-09-26 23:47:27 +00:00
Simon Howard
84e1b1ac11 Make examples call TXT_Shutdown before quit.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 669
2006-09-25 23:09:32 +00:00
Simon Howard
c083656d0e Convenience function for creating a horizontal box.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 659
2006-09-24 13:07:30 +00:00
Simon Howard
681c7bee78 Debug code for drawing an ASCII chart.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 658
2006-09-24 13:06:32 +00:00
Simon Howard
ae660b7198 Use proper arrow characters on spin controls and change their color.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 657
2006-09-24 13:05:44 +00:00
Simon Howard
a904f5b3ea Fix declaration of TXT_NewWindowSelectAction
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 656
2006-09-24 13:04:40 +00:00
Simon Howard
165a20cf3e Add the ability to type in values for spin controls, like with normal
input boxes.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 651
2006-09-22 18:24:53 +00:00
Simon Howard
a825be92fb Rename Accept to Select.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 648
2006-09-21 18:25:55 +00:00
Simon Howard
0cff90defc Fix some warnings in textscreen code.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 645
2006-09-21 16:25:10 +00:00
Simon Howard
e903ecbffb Use NULL for initialising pointers rather than 0.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 644
2006-09-21 11:49:13 +00:00
Russell Rice
6339c4cbeb Fix a lot of warnings (for fussy compilers) and one always-true check
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 641
2006-09-21 11:13:28 +00:00
Simon Howard
7768cfde84 Add spin control widget.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 635
2006-09-20 18:05:10 +00:00
Simon Howard
7bc72c666d Fix textscreen warnings.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 626
2006-09-19 23:49:20 +00:00
Simon Howard
d7ef9e1512 'widgets' variable was used uninitialised. For some reason this didn't
always crash!

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 624
2006-09-19 23:20:14 +00:00
Simon Howard
3dd7131d41 Check column is valid when finding a selectable column. Fixes weird
scrolling behavior.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 620
2006-09-19 21:13:56 +00:00
Simon Howard
e558fa3f2d Fix TXT_SelectWidgets with NULL spacers.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 615
2006-09-18 22:19:30 +00:00
Simon Howard
ef8bdb1fea Add function to set button label.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 614
2006-09-18 22:19:00 +00:00
Simon Howard
47ae7506fc Repeat key presses when the key is held down - thanks to Mad_Mac for this
one :-)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 613
2006-09-18 12:13:40 +00:00
Simon Howard
fb5f3408be Add command line arguments to main() in textscreen examples.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 602
2006-09-09 19:11:05 +00:00
Simon Howard
80cdf0868c Include SDL.h in the textscreen headers; the SDL headers need to be
included where main() is defined.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 600
2006-09-09 16:52:01 +00:00
Simon Howard
bf2f9ea62a Add reference counts on callback tables so that if a callback destroys
the widget that owns the callback the program doesnt crash.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 599
2006-09-09 16:48:09 +00:00
Simon Howard
c0d6fcfe03 Add missing copyright notices to textscreen and setup files.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 590
2006-08-31 20:40:48 +00:00
Simon Howard
2fd49a65af Add dropdown listbox widget
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 578
2006-08-31 18:12:05 +00:00
Simon Howard
fe1a0afdd7 Exit the main loop automatically after all windows are closed
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 577
2006-08-31 18:11:47 +00:00
Simon Howard
5e303c43da Add window listener functions to allow spying on keys and mouse buttons
received by windows. Emit a 'closed' signal when a window is closed.
Allow windows to have no action buttons.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 576
2006-08-31 18:11:26 +00:00
Simon Howard
b20f94345c Change name of escape window actions to 'Close' and add a separate
'Abort' button creator.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 575
2006-08-31 18:11:07 +00:00
Simon Howard
4306fa5993 Center the calculator in the window.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 574
2006-08-31 18:10:49 +00:00
Simon Howard
7cd8727f6c Add TXT_SelectWidget function to select a widget in a table,
TXT_SetColumnWidths to set table column widths. Don't send key presses
to unselectable widgets.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 573
2006-08-31 18:09:34 +00:00
Simon Howard
58978769f5 Allow multiple callbacks for the same signal on widgets
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 572
2006-08-31 18:09:25 +00:00
Simon Howard
e9376daee4 Initialise string input boxes to not editing
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 571
2006-08-31 18:09:17 +00:00
Simon Howard
e5d6ce3318 More efficient TXT_Sleep function that puts the textscreen code to sleep
until an event is received or the screen needs to blink.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 570
2006-08-31 18:08:43 +00:00
Simon Howard
6b9f3748cf Add inverted checkboxes (tick in box when value is false)
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 565
2006-06-29 18:07:32 +00:00
Simon Howard
cef6abcea6 Always add a bit of padding inside windows (removes the need to add padding
explicitly in labels). Set the window title from the desktop title. 
Only draw widget selection highlight in the window with focus (top window).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 560
2006-06-20 18:48:21 +00:00
Simon Howard
48d2fd26ca Make clicking on "accept" action buttons send enter keypresses to the window.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 554
2006-06-02 20:50:51 +00:00
Simon Howard
ef92ce016e Make mouse button presses on widgets actually do useful things
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 553
2006-06-02 20:14:39 +00:00
Simon Howard
02f4a0dcf4 Add utility functions to create "Abort" and "Accept" window actions
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 551
2006-06-02 19:45:41 +00:00
Simon Howard
e9619f83e9 Draw the bottom separator in windows at the full window width.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 550
2006-06-02 19:36:37 +00:00
Simon Howard
517af9477b textscreen: Rejig how the entire drawing process works. Add a recursive
layout method that assigns the position and size of widgets for the whole
window before drawing. Add another method that responds to mouse button
presses. Allow windows to have no title bar by specifying NULL as the
title.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 547
2006-06-02 19:29:24 +00:00
Simon Howard
b3e5170bbb Add ability to make widgets right aligned or centered within tables.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 546
2006-05-29 21:39:12 +00:00
Simon Howard
64b2890756 Convert calculator example to struts
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 545
2006-05-29 21:02:38 +00:00
Simon Howard
22b0863185 Add textscreen.h top level header to avoid having to include all txt_*
headers individually.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 542
2006-05-29 20:00:41 +00:00
Simon Howard
1531993b05 Allow struts to force height as well as width. Hide "start game" button
for players which are not the game controller.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 541
2006-05-29 19:54:11 +00:00
Simon Howard
936e7e116d Shut up compiler warnings.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 540
2006-05-29 19:31:45 +00:00
Simon Howard
3a5668eeb6 Add strut class to allow table column width to be forced.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 539
2006-05-29 19:22:51 +00:00
Simon Howard
2ceb004be6 Add key description for spacebar.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 533
2006-05-26 19:15:05 +00:00
Simon Howard
42ebb5bebb Allow NULL to be added to tables to specify a spacer (empty cell).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 530
2006-05-25 21:27:34 +00:00
Simon Howard
76e7702170 Allow the fg/bg colors to be set on labels.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 529
2006-05-25 21:26:13 +00:00
Simon Howard
2808929cf6 Allow the fg/bg colors to be set on labels.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 528
2006-05-25 21:07:14 +00:00
Simon Howard
7b54c078de Build textscreen/ before textscreen/examples/
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 527
2006-05-25 20:40:57 +00:00
Simon Howard
1f101a63a6 Move textscreen GUI demos into an examples/ subdir.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 524
2006-05-24 21:35:45 +00:00
Simon Howard
b03198720a Add small calculator GUI demo.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 523
2006-05-24 20:27:40 +00:00
Simon Howard
f7bf1488d8 Only allow digits to be typed in number input boxes.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 522
2006-05-24 19:08:58 +00:00
Simon Howard
6ea4e1e25c Add input box widget, and include in guitest.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 520
2006-05-23 22:52:01 +00:00
Simon Howard
3fbef9d278 Make TXT_GetChar return the unicode value of the key pressed. For text
boxes.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 519
2006-05-23 22:51:09 +00:00
Simon Howard
240a1cfcca Add a default action to close windows when escape is pressed. Do not
make escape quit the program unless there are no open windows. Add
TXT_ExitMainLoop().

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 518
2006-05-23 19:33:35 +00:00
Simon Howard
59864df095 Fix compiler warnings caused by missing includes.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 517
2006-05-23 11:46:09 +00:00
Simon Howard
a27b3c9287 Add actions demonstration to guitest.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 516
2006-05-23 00:25:36 +00:00
Simon Howard
1de18c1397 Add window action class for action area labels at the bottom of windows.
Adjust txt_table_t to expand tables to their maximum width when they
only have one column (ensures separators reach the window edges).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 515
2006-05-23 00:07:02 +00:00
Simon Howard
7666630775 Eat keypresses when pressing buttons.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 514
2006-05-23 00:05:05 +00:00
Simon Howard
1d79686ecf Add TXT_GetKeyDescription() to provide descriptions of key codes.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 513
2006-05-23 00:04:27 +00:00
Simon Howard
aafc38483e Updated GUI test which demonstrates signals used to update a label.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 512
2006-05-22 19:25:19 +00:00
Simon Howard
2ad24f982e Add TXT_SetLabel() function to set the label value.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 511
2006-05-22 19:23:28 +00:00
Simon Howard
7c18ad6ccf CAST -> TXT_CAST_ARG, UNCAST -> TXT_UNCAST_ARG.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 509
2006-05-22 11:59:11 +00:00
Simon Howard
11643c0887 Add casting macros to allow for easy casts between types.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 503
2006-05-22 00:56:12 +00:00
Simon Howard
8d188ff3d1 More signals to detect when checkboxes/radiobuttons are changed.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 502
2006-05-22 00:26:34 +00:00
Simon Howard
283f71d0f5 Add a signals architecture to allow callbacks on GUI events.
Make all widget classes initialise widgets by calling TXT_InitWidget.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 501
2006-05-22 00:20:48 +00:00
Simon Howard
d90a63ed26 Reformat source files in Makefile.am.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 500
2006-05-21 21:01:46 +00:00
Simon Howard
992856ec4f Add radio button class.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 499
2006-05-21 20:58:24 +00:00
Simon Howard
9908aee502 Initialise the table selection on table creation.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 498
2006-05-21 20:56:28 +00:00
Simon Howard
9ba105fa4e Always select a valid widget in a table before drawing the table.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 497
2006-05-21 00:07:11 +00:00
Simon Howard
47287b6532 Add missing free() call.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 496
2006-05-20 21:37:34 +00:00
Simon Howard
1df732ab78 Updated guitest.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 495
2006-05-20 21:37:07 +00:00
Simon Howard
27307fa2d7 Add label class.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 494
2006-05-20 21:36:28 +00:00
Simon Howard
56912a4dcc Make all windows be tables with one column.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 493
2006-05-20 21:01:04 +00:00
Simon Howard
8741ed0339 Add table class. Allow widgets with heights of more than one line.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 492
2006-05-20 20:49:50 +00:00
Simon Howard
6ecffa76f7 Checkbox class
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 491
2006-05-20 17:37:57 +00:00
Simon Howard
62b5f95367 Add main loop function and forward key presses to widgets.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 490
2006-05-20 16:34:34 +00:00
Simon Howard
1ba69c88d2 Clip windows against the workspace boundaries.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 487
2006-05-20 15:45:36 +00:00
Simon Howard
f761f821f9 Add selectable and visible properties to widgets. Allow the position of
windows to be set based on position of top/bottom/center,left/right,center
coordinates.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 486
2006-05-20 15:15:17 +00:00
Simon Howard
344823214b Split off text mode gui desktop code into a separate file. Rename some
of the functions in txt_gui.c.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 483
2006-05-19 19:57:59 +00:00
Simon Howard
aaf96ab501 Add TXT_SetDesktopTitle()
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 482
2006-05-18 19:48:03 +00:00
Simon Howard
f6e8d4c46e Make TXT_AddWidget take a NULL pointer so different widget types can
be passed to it.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 481
2006-05-18 18:55:24 +00:00
Simon Howard
978ddf5398 Initial working text-mode GUI framework.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 480
2006-05-18 18:48:24 +00:00
Simon Howard
e3e4b06115 Change the format of color commands. Reorganise the waiting dialog.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 292
2006-01-14 00:10:54 +00:00
Simon Howard
d78780cfc3 Add text-mode I/O functions.
Use text-mode screen for the waiting screen.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 291
2006-01-13 23:56:00 +00:00
Simon Howard
01a403802e Textscreen getchar() function; remove SDL code from I_Endoom.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 289
2006-01-13 18:23:28 +00:00
Simon Howard
443163fc15 Handle blinking text in ENDOOM lumps properly.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 183
2005-10-09 20:19:21 +00:00
Simon Howard
6a9e5dd7e7 Cannot do arithmetic on void pointers in standard C
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 181
2005-10-09 16:42:46 +00:00
Simon Howard
f75826fa71 Text mode emulation code
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 146
2005-10-02 03:16:03 +00:00