jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4343 commits 2 branches 0 tags 17 MiB
Commit graph

337 commits

Author SHA1 Message Date
Simon Howard
fa3dc6f589 Strip out SDL_VERSION_ATLEAST #ifdef conditionals. 
These were added ages ago as hacks to make the code compile with SDL2,
back when SDL2 was still in development. They aren't relevant any more
and aren't useful - the actual SDL2 port is proceeding on sdl2-branch.
 2015-04-10 23:44:13 -04:00
Simon Howard
981d972f3d Add missing #includes. 2015-04-10 23:42:01 -04:00
Simon Howard
356554c229 textscreen: Add help URL functionality for windows. 
This adds the ability to associate a URL with a window that gives
some extra information about it and the configuration options found
in it.
 2015-04-04 21:29:33 -04:00
Simon Howard
833d8a838b textscreen: Remove screen size-based font selection. 
This was removed on Windows a while back in favour of a more
conservative approach that examined the system DPI settings, but the
logic still remained for other systems and it really isn't a good
idea. Remove the logic that chooses a large font on large monitors,
and add a TODO comment to add proper Linux font selection in the
future, based on the Gtk+ HiDPI setting.
 2015-03-29 23:21:08 -04:00
Simon Howard
01a743cd35 Fix mistaken uses of memcpy() on overlapping memory. 
The source and destination arguments to memcpy() cannot be overlapping
as this is undefined behavior. In these situations memmove() must be
used instead, and OpenBSD actually throws an error if this is done.

Thanks to ryan-sg for reporting this. This fixes #510.
 2015-02-22 00:28:23 -05:00
Dave Murphy
d66659c606 allow building in subdirectory or outside source directory 2014-12-26 15:40:46 +00:00
Simon Howard
1344aa973b textscreen: Change default window title. 
Just set this to the empty string.
 2014-12-06 01:57:34 -05:00
Simon Howard
076c8400e6 Fix alpha channel for icons. 
Tweak the convert-icon script to include the alpha channel value
as well as RGB. Fix i_video and the setup code to set the icon
including the alpha channel.

While we're at it, replace the current PNG icons with 128x128 high
quality versions so that they look nice on retina display Macs.
 2014-12-06 01:54:36 -05:00
Simon Howard
5e59e11b31 libtextscreen: Convert video code to SDL2. 
This gets the basic libtextscreen up and running under SDL2. Not
everything works yet (most notably keyboard input is kind of broken)
but it's a start.
 2014-11-28 17:49:23 -05:00
Simon Howard
326e00f5cf Update SDL_Keysym symbols to SDL2 constants. 
SDL_keysym has changed to SDLK_Keysym, and some of the SDLK_ constants
have changed names to be more consistent.
 2014-11-28 15:39:38 -05:00
Simon Howard
6b217ee03c textscreen: Exit immediately when all windows close. 
The main loop should exit when the last window closes, but the loop
code was waiting for one event to be received before this took
effect.

This fixes #474. Thanks to Alexandre-Xavier for the report.
 2014-11-27 18:58:58 -05:00
Simon Howard
16c56ea0c4 textscreen: Don't allow input of unprintable characters. 
If a Unicode character is not part of the Extended ASCII set that
we can display on screen, don't allow it to be typed (which would
display a backwards question mark). Thanks Alexandre-Xavier for this
suggestion on #229.
 2014-10-19 16:52:36 -04:00
Simon Howard
77d7e984d1 textscreen: Fix use-after-free with mouse press. 
When propagating mouse button presses to widgets within the window,
return from MouseButtonPress() immediately, or we will fall through
to additional code that references the window structure. If the
handler for the widget we clicked on closes the window, this will
have been freed.

This fixed #439. Thanks to DuClare for telling me about this.
 2014-10-14 01:26:14 -04:00
James Haley
0d7f38c751 Warning fixes (23 remain...) 2014-08-16 17:30:00 -05:00
Simon Howard
7684ddcfd8 Clean up file headers. 
This change rewrites and simplifies the copyright headers at the top
of all source files:

 * Remove "Emacs style mode select" line; this line was included in
   the headers for the originally released source files and appears
   to be to set the file type for old versions of Emacs. I'm not sure
   entirely why it was required but I don't think it is any more.
 * Remove "You should have received a copy of..." text from copyright
   header. This refers to the old 59 Temple Place address where the
   FSF headquarters used to be located and is no longer correct.
   Rather than change to the new address, just remove the paragraph
   as it is superfluous anyway. This fixes #311.
 * Remove ---- separator lines so that the file headers are barer
   and more simplified.
 2014-05-05 00:20:54 -04:00
Simon Howard
242fa1ee46 textscreen: Fix jump when clicking on scrollbars. 
Clicking on a scrollbar should scroll the cursor to that location, but
the logic for it was buggy because of loss of precision when doing an
integer divide. When dividing by bar_max, seek up to the nearest value
so that the cursor always arrives where we clicked.

Thanks to Alexandre-Xavier for reporting this bug. This fixes #359.
 2014-04-29 01:47:13 -04:00
Simon Howard
32803819a0 textscreen: Init screen at native bit depth. 
Always call SDL_SetVideoMode with bpp=0 to use the desktop's native
bit depth, and instead draw into an intermediate 8-bit screenbuffer
surface. This ensures that we do not encounter any palette mess-ups
as on some systems true 8-bit screen modes are poorly supported.
 2014-04-12 16:31:31 -04:00
Simon Howard
c30f4a2f65 misc: Fix safe vsnprintf() function. 
An off-by-one error in the function caused the strings to be truncated
one character too early. Change the return value check so that
negative values are also interpreted as indicating truncation; this is
the behavior of the Win32 API.
 2014-04-01 22:06:09 -04:00
Simon Howard
a9d9335b20 textscreen: Use safe string functions. 
Define TXT_{StringCopy,StringConcat,snprintf,vsnprintf} as analogs of
the m_misc.c versions so that the textscreen library does not need a
dependency on the Doom code, and change all textscreen code to use
these instead of unsafe functions. This fixes #372.
 2014-04-01 21:49:16 -04:00
Simon Howard
e85edb9e6f textscreen: Add label for PrintScreen key. 
Needed to properly fix bug #369.
 2014-03-28 00:37:17 -04:00
Simon Howard
8a699c6ebc Define a keyboard scan code for PrintScreen. 
There is no real scan code for the PrintScreen key under DOS, but it
is convenient to be able to bind it as a screenshot key. Define a
"fake" scancode (126) to represent PrintScreen so that it can be
represented as a key binding in configuration files. Also add some
comments/notes to the scantokey[] lookup table.

This fixes #369.
 2014-03-27 20:52:09 -04:00
Simon Howard
9c1b1ff290 Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2742
 2013-11-03 06:23:21 +00:00
Simon Howard
162ba0b777 Change gradient characters of 'large' textscreen font to be direct 
scale-ups of the standard res versions of the characters: in addition to
giving a more 'authentic' retro look, this fixes a problem where the
high-frequency dot patterns can cause weird moire effects on some
monitors.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2735
 2013-10-31 02:59:07 +00:00
Simon Howard
387fcd4fa4 Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2731
 2013-10-28 05:02:36 +00:00
Simon Howard
5387e91e31 Use system DPI setting on Windows to determine whether to use the large 
font.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2730
 2013-10-28 05:01:33 +00:00
Simon Howard
ee40db2fcd Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2725
 2013-10-28 01:27:15 +00:00
Simon Howard
552d300e26 Determine which textscreen font to use by looking at the current desktop 
screen resolution, not the largest fullscreen resolution offered by SDL.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2724
 2013-10-28 01:23:10 +00:00
Simon Howard
ead4a7a8bd Oops. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2717
 2013-10-20 20:37:48 +00:00
Simon Howard
c5defc73af Disable file selector dialog on Windows. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2716
 2013-10-20 20:28:47 +00:00
Simon Howard
f2c204ccca Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2639
 2013-09-08 19:10:40 +00:00
Simon Howard
e10af52152 Fix file select widget to emit "changed" signal properly. Reset variable 
value to empty string rather than NULL if cancel is pressed in dialog
(thanks Alexandre Xavier).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2638
 2013-09-08 18:57:20 +00:00
Simon Howard
58fba3477d Add textscreen functions to raise and lower windows. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2628
 2013-08-31 00:12:09 +00:00
Simon Howard
63acb55b18 Remove Windows CE support. 
What support exists is for obsolete devices I no longer possess; I've
never been contacted about the port and it's been several years since
I even bothered to build a new version. All the extra overrides are
clutter that can just be removed.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2615
 2013-08-11 17:32:29 +00:00
Simon Howard
ba1c027718 Remove use of WINAPI macro to fix compile under MSVC. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2602
 2013-05-27 17:56:06 +00:00
Simon Howard
ce8a95a5b9 Correct incorrect doc comment. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2579
 2013-04-01 16:38:55 +00:00
Simon Howard
47af28e168 Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2577
 2013-04-01 14:59:34 +00:00
Simon Howard
bd0f386997 Fix Doxygen comments. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2576
 2013-03-31 20:38:03 +00:00
Simon Howard
f346e3391d Add back call to TXT_Delay to fix OS X freeze. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2575
 2013-03-31 19:38:04 +00:00
Simon Howard
daa0897ec9 Allow backspace or delete to clear the contents of an input box. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2574
 2013-03-31 19:32:49 +00:00
Simon Howard
9963de836f Don't hog the CPU while waiting for the file selector. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2573
 2013-03-31 19:32:22 +00:00
Simon Howard
fdd021c565 Fix file selector issues with Windows build. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2571
 2013-03-31 19:09:45 +00:00
Simon Howard
3ac144025a Add file selector widget to textscreen library. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2570
 2013-03-31 18:46:25 +00:00
Simon Howard
f1934e990d Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2553
 2012-12-24 00:03:41 +00:00
Simon Howard
7b9cfe4a61 Fix up weird looking '9' character in large font. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2549
 2012-12-23 01:43:41 +00:00
Simon Howard
a42a4824fa Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2546
 2012-12-14 01:18:38 +00:00
Simon Howard
9f1a64f856 Add high-resolution font for textscreen. 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2543
 2012-11-18 21:56:18 +00:00
Simon Howard
993315afc4 Merge from trunk. 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2537
 2012-10-28 23:45:08 +00:00
Simon Howard
003c82ce37 Remove some calls to TXT_FGColor by using the new TXT_SaveColors system 
instead. Remove the unused "embedded color code" system from TXT_Puts.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2508
 2012-03-04 12:06:29 +00:00
Simon Howard
9ffd1cc4d4 Rework the way that window background colors are set, and change the 
background color of inactive windows to black, to give better contrast
when viewing many layered windows.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2507
 2012-03-01 20:26:56 +00:00
Simon Howard
c6b8f11637 Fix crash when typing lots of Unicode characters into a number input 
box.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2494
 2012-02-03 22:05:49 +00:00
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