From 6991960a8b0bacc87c2c5183c2098e606bf5d72d Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 25 Jun 2014 19:12:26 +0200 Subject: Remove cmovie support --- src/z-term.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 31e5b308..2e27173f 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -17,8 +17,6 @@ extern "C" { #include "h-basic.h" -#define IN_MAINWINDOW (Term == term_screen) - /* * A term_win is a "window" for a Term * @@ -280,10 +278,6 @@ struct term /**** Available Variables ****/ extern term *Term; -extern FILE *movfile; -extern int do_movies; -extern int last_paused; - /**** Available Functions ****/ -- cgit v1.2.3 From c65ae1ca380849a0aa399f6c612ea260d6a2e5c1 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 26 Jun 2014 03:23:42 +0200 Subject: Remove unused scansubdir() and TERM_XTRA_SCANSUBDIR --- src/z-term.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 2e27173f..fd1955fa 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -271,7 +271,6 @@ struct term #define TERM_XTRA_LEVEL 12 /* Change the "soft" level (optional) */ #define TERM_XTRA_DELAY 13 /* Delay some milliseconds (optional) */ #define TERM_XTRA_GET_DELAY 14 /* Get the cuyrrent time in milliseconds (optional) */ -#define TERM_XTRA_SCANSUBDIR 15 /* Scan for subdir in a dir */ #define TERM_XTRA_RENAME_MAIN_WIN 16 /* Rename the main game window */ @@ -284,9 +283,6 @@ extern term *Term; extern errr Term_user(int n); extern errr Term_xtra(int n, int v); extern long Term_xtra_long; -extern char scansubdir_dir[1024]; -extern int scansubdir_max; -extern cptr scansubdir_result[255]; extern void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc, byte ea, char ec); extern void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc, byte *ea, char *ec); -- cgit v1.2.3 From ca71ccff098e4eec97480d2a08773a06629cc66e Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 26 Jun 2014 06:50:06 +0200 Subject: Simplify PR_* redraw code and remove direct references to Term members --- src/z-term.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index fd1955fa..51e5760b 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -300,6 +300,7 @@ extern errr Term_erase(int x, int y, int n); extern errr Term_clear(void); extern errr Term_redraw(void); extern errr Term_redraw_section(int x1, int y1, int x2, int y2); +extern void Term_bell(); extern errr Term_get_cursor(int *v); extern errr Term_get_size(int *w, int *h); -- cgit v1.2.3 From ec23e119e24a32f4607dfdc0f43e8726febc4043 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 26 Jun 2014 07:25:00 +0200 Subject: Remove pointless Term_user --- src/z-term.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 51e5760b..677b7510 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -215,8 +215,6 @@ struct term void (*init_hook)(term *t); void (*nuke_hook)(term *t); - errr (*user_hook)(int n); - errr (*xtra_hook)(int n, int v); errr (*curs_hook)(int x, int y); @@ -280,7 +278,6 @@ extern term *Term; /**** Available Functions ****/ -extern errr Term_user(int n); extern errr Term_xtra(int n, int v); extern long Term_xtra_long; -- cgit v1.2.3 From 33bcbd13586471c8a1a3ce89389885d7a72e50c3 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 26 Jun 2014 17:52:56 +0200 Subject: Remove unused fields from "struct term" --- src/z-term.h | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 677b7510..ae892821 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -65,19 +65,9 @@ struct term_win /* * An actual "term" structure * - * - Extra "user" info (used by application) - * * - Extra "data" info (used by implementation) * * - * - Flag "user_flag" - * An extra "user" flag (used by application) - * - * - * - Flag "data_flag" - * An extra "data" flag (used by implementation) - * - * * - Flag "active_flag" * This "term" is "active" * @@ -105,9 +95,6 @@ struct term_win * - Flag "always_text" * Use the "Term_text()" routine for invisible text * - * - Flag "unused_flag" - * Reserved for future use - * * - Flag "never_bored" * Never call the "TERM_XTRA_BORED" action * @@ -166,14 +153,8 @@ typedef struct term term; struct term { - vptr user; - vptr data; - bool_ user_flag; - - bool_ data_flag; - bool_ active_flag; bool_ mapped_flag; bool_ total_erase; @@ -183,7 +164,6 @@ struct term bool_ always_pict; bool_ higher_pict; bool_ always_text; - bool_ unused_flag; bool_ never_bored; bool_ never_frosh; @@ -191,10 +171,8 @@ struct term char char_blank; char *key_queue; - u16b key_head; u16b key_tail; - u16b key_xtra; u16b key_size; byte wid; -- cgit v1.2.3 From f161bba68c00185721371cec291b2276f7daa04e Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 5 Jun 2014 21:03:45 +0200 Subject: Remove unused Term_exchange() --- src/z-term.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index ae892821..c8854112 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -187,7 +187,6 @@ struct term term_win *old; term_win *scr; - term_win *tmp; term_win *mem; void (*init_hook)(term *t); @@ -292,8 +291,6 @@ extern term_win* Term_save_to(void); extern errr Term_load(void); extern errr Term_load_from(term_win *save, bool_ final); -extern errr Term_exchange(void); - extern errr Term_resize(int w, int h); extern errr Term_activate(term *t); -- cgit v1.2.3 From 7c1a3ab8b8a9bc3f229389e08e398f6fa9c317d8 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 2 Jul 2014 19:21:30 +0200 Subject: Remove "platform" sound support --- src/z-term.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index c8854112..7b739ab7 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -225,7 +225,6 @@ struct term * The "TERM_XTRA_EVENT" action uses "v" to "wait" for an event * The "TERM_XTRA_SHAPE" action uses "v" to "show" the cursor * The "TERM_XTRA_FROSH" action uses "v" for the index of the row - * The "TERM_XTRA_SOUND" action uses "v" for the index of a sound * The "TERM_XTRA_ALIVE" action uses "v" to "activate" (or "close") * The "TERM_XTRA_LEVEL" action uses "v" to "resume" (or "suspend") * The "TERM_XTRA_DELAY" action uses "v" as a "millisecond" value @@ -239,7 +238,6 @@ struct term #define TERM_XTRA_FROSH 5 /* Flush one row (optional) */ #define TERM_XTRA_FRESH 6 /* Flush all rows (optional) */ #define TERM_XTRA_NOISE 7 /* Make a noise (optional) */ -#define TERM_XTRA_SOUND 8 /* Make a sound (optional) */ #define TERM_XTRA_BORED 9 /* Handle stuff when bored (optional) */ #define TERM_XTRA_REACT 10 /* React to global changes (optional) */ #define TERM_XTRA_ALIVE 11 /* Change the "hard" level (optional) */ -- cgit v1.2.3 From 25f27454b680ae37439ef2f573988f74ebbb90e6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 2 Jul 2014 18:55:11 +0200 Subject: Remove graphics support --- src/z-term.h | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 7b739ab7..8a6ed3a0 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -46,18 +46,6 @@ struct term_win byte *va; char *vc; - byte **ta; - char **tc; - - byte *vta; - char *vtc; - - byte **ea; - char **ec; - - byte *vea; - char *vec; - }; @@ -86,12 +74,6 @@ struct term_win * - Flag "soft_cursor" * This "term" uses a "software" cursor * - * - Flag "always_pict" - * Use the "Term_pict()" routine for all text - * - * - Flag "higher_pict" - * Use the "Term_pict()" routine for special text - * * - Flag "always_text" * Use the "Term_text()" routine for invisible text * @@ -161,8 +143,6 @@ struct term bool_ fixed_shape; bool_ icky_corner; bool_ soft_cursor; - bool_ always_pict; - bool_ higher_pict; bool_ always_text; bool_ never_bored; bool_ never_frosh; @@ -202,8 +182,6 @@ struct term void (*resize_hook)(void); - errr (*pict_hook)(int x, int y, int n, const byte *ap, const char *cp, const byte *tap, const char *tcp, const byte *eap, const char *ecp); - }; @@ -256,8 +234,7 @@ extern term *Term; extern errr Term_xtra(int n, int v); extern long Term_xtra_long; -extern void Term_queue_char(int x, int y, byte a, char c, byte ta, char tc, byte ea, char ec); -extern void Term_queue_line(int x, int y, int n, byte *a, char *c, byte *ta, char *tc, byte *ea, char *ec); +extern void Term_queue_char(int x, int y, byte a, char c); extern void Term_queue_chars(int x, int y, int n, byte a, cptr s); extern errr Term_fresh(void); -- cgit v1.2.3 From 4f0516c42de23fedbd77e78b563b5b63c99a7bdc Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 4 Jul 2014 20:49:37 +0200 Subject: Remove TERM_XTRA_FROSH --- src/z-term.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 8a6ed3a0..80562786 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -80,8 +80,6 @@ struct term_win * - Flag "never_bored" * Never call the "TERM_XTRA_BORED" action * - * - Flag "never_frosh" - * Never call the "TERM_XTRA_FROSH" action * * * - Value "attr_blank" @@ -145,7 +143,6 @@ struct term bool_ soft_cursor; bool_ always_text; bool_ never_bored; - bool_ never_frosh; byte attr_blank; char char_blank; @@ -202,7 +199,6 @@ struct term * * The "TERM_XTRA_EVENT" action uses "v" to "wait" for an event * The "TERM_XTRA_SHAPE" action uses "v" to "show" the cursor - * The "TERM_XTRA_FROSH" action uses "v" for the index of the row * The "TERM_XTRA_ALIVE" action uses "v" to "activate" (or "close") * The "TERM_XTRA_LEVEL" action uses "v" to "resume" (or "suspend") * The "TERM_XTRA_DELAY" action uses "v" as a "millisecond" value @@ -213,7 +209,6 @@ struct term #define TERM_XTRA_FLUSH 2 /* Flush all pending events */ #define TERM_XTRA_CLEAR 3 /* Clear the entire window */ #define TERM_XTRA_SHAPE 4 /* Set cursor shape (optional) */ -#define TERM_XTRA_FROSH 5 /* Flush one row (optional) */ #define TERM_XTRA_FRESH 6 /* Flush all rows (optional) */ #define TERM_XTRA_NOISE 7 /* Make a noise (optional) */ #define TERM_XTRA_BORED 9 /* Handle stuff when bored (optional) */ -- cgit v1.2.3 From 58129b61b5e0aa228eb8e4d0ee2d94702b46e5ba Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 19 Nov 2014 18:53:34 +0100 Subject: Remove TERM_XTRA_GET_DELAY It was effectively unused since the removal of cmovies --- src/z-term.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 80562786..afbdf837 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -216,7 +216,6 @@ struct term #define TERM_XTRA_ALIVE 11 /* Change the "hard" level (optional) */ #define TERM_XTRA_LEVEL 12 /* Change the "soft" level (optional) */ #define TERM_XTRA_DELAY 13 /* Delay some milliseconds (optional) */ -#define TERM_XTRA_GET_DELAY 14 /* Get the cuyrrent time in milliseconds (optional) */ #define TERM_XTRA_RENAME_MAIN_WIN 16 /* Rename the main game window */ @@ -227,7 +226,6 @@ extern term *Term; /**** Available Functions ****/ extern errr Term_xtra(int n, int v); -extern long Term_xtra_long; extern void Term_queue_char(int x, int y, byte a, char c); extern void Term_queue_chars(int x, int y, int n, byte a, cptr s); -- cgit v1.2.3 From 26024b29723d0e0c3e1922003d81b9dfef5463ba Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 5 Jun 2014 21:21:12 +0200 Subject: Fix doc comment --- src/z-term.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index afbdf837..6ada1905 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -116,8 +116,6 @@ struct term_win * - Hook for init-ing the term * - Hook for nuke-ing the term * - * - Hook for user actions - * * - Hook for extra actions * * - Hook for placing the cursor -- cgit v1.2.3 From 4d351b8d07c25415d5848e9486eb5cb52f02d72e Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 16 Dec 2014 18:51:06 +0100 Subject: Replace usleep with C++11 this_thread::sleep_for() Also remove TERM_XTRA_DELAY. The terminal abstraction should not be used for providing general platform independence. As a side effect this reintroduces support for "delay" on SDL, not sure if that's a good idea or not. --- src/z-term.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 6ada1905..dae3200a 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -199,7 +199,6 @@ struct term * The "TERM_XTRA_SHAPE" action uses "v" to "show" the cursor * The "TERM_XTRA_ALIVE" action uses "v" to "activate" (or "close") * The "TERM_XTRA_LEVEL" action uses "v" to "resume" (or "suspend") - * The "TERM_XTRA_DELAY" action uses "v" as a "millisecond" value * * The other actions do not need a "v" code, so "zero" is used. */ @@ -213,7 +212,6 @@ struct term #define TERM_XTRA_REACT 10 /* React to global changes (optional) */ #define TERM_XTRA_ALIVE 11 /* Change the "hard" level (optional) */ #define TERM_XTRA_LEVEL 12 /* Change the "soft" level (optional) */ -#define TERM_XTRA_DELAY 13 /* Delay some milliseconds (optional) */ #define TERM_XTRA_RENAME_MAIN_WIN 16 /* Rename the main game window */ -- cgit v1.2.3 From c8a270e51dc22f39ed048ab1cc609e6e456df58f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sun, 7 Jun 2015 17:49:09 +0200 Subject: Split types.h into separate header for each type --- src/z-term.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index dae3200a..a52a5c27 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -181,8 +181,32 @@ struct term +/*** Color constants ***/ +/* + * Angband "attributes" (with symbols, and base (R,G,B) codes) + * + * The "(R,G,B)" codes are given in "fourths" of the "maximal" value, + * and should "gamma corrected" on most (non-Macintosh) machines. + */ +#define TERM_DARK 0 /* 'd' */ /* 0,0,0 */ +#define TERM_WHITE 1 /* 'w' */ /* 4,4,4 */ +#define TERM_SLATE 2 /* 's' */ /* 2,2,2 */ +#define TERM_ORANGE 3 /* 'o' */ /* 4,2,0 */ +#define TERM_RED 4 /* 'r' */ /* 3,0,0 */ +#define TERM_GREEN 5 /* 'g' */ /* 0,2,1 */ +#define TERM_BLUE 6 /* 'b' */ /* 0,0,4 */ +#define TERM_UMBER 7 /* 'u' */ /* 2,1,0 */ +#define TERM_L_DARK 8 /* 'D' */ /* 1,1,1 */ +#define TERM_L_WHITE 9 /* 'W' */ /* 3,3,3 */ +#define TERM_VIOLET 10 /* 'v' */ /* 4,0,4 */ +#define TERM_YELLOW 11 /* 'y' */ /* 4,4,0 */ +#define TERM_L_RED 12 /* 'R' */ /* 4,0,0 */ +#define TERM_L_GREEN 13 /* 'G' */ /* 0,4,0 */ +#define TERM_L_BLUE 14 /* 'B' */ /* 0,4,4 */ +#define TERM_L_UMBER 15 /* 'U' */ /* 3,2,1 */ + /**** Available Constants ****/ -- cgit v1.2.3 From e4b4f4730a2fb39da766892adbf3419bf5e7f48f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 11 Dec 2015 08:09:30 +0100 Subject: Remove redundant parameter from Term_load_from() --- src/z-term.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index a52a5c27..241e3d76 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -277,7 +277,7 @@ extern errr Term_inkey(char *ch, bool_ wait, bool_ take); extern errr Term_save(void); extern term_win* Term_save_to(void); extern errr Term_load(void); -extern errr Term_load_from(term_win *save, bool_ final); +extern errr Term_load_from(term_win *save); extern errr Term_resize(int w, int h); -- cgit v1.2.3 From da0c4cf2afcdf90d758868112f374e8ff9de2813 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 11 Dec 2015 08:09:30 +0100 Subject: Remove unused term::fixed_shape --- src/z-term.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 241e3d76..b1d81450 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -65,9 +65,6 @@ struct term_win * - Flag "total_erase" * This "term" should be fully erased * - * - Flag "fixed_shape" - * This "term" is not allowed to resize - * * - Flag "icky_corner" * This "term" has an "icky" corner grid * @@ -136,7 +133,6 @@ struct term bool_ active_flag; bool_ mapped_flag; bool_ total_erase; - bool_ fixed_shape; bool_ icky_corner; bool_ soft_cursor; bool_ always_text; -- cgit v1.2.3 From 1d477ab119bc87793449307d59eadec096e9aa6f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 11 Dec 2015 08:09:30 +0100 Subject: Remove always-off term::never_bored --- src/z-term.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index b1d81450..f4f52527 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -74,9 +74,6 @@ struct term_win * - Flag "always_text" * Use the "Term_text()" routine for invisible text * - * - Flag "never_bored" - * Never call the "TERM_XTRA_BORED" action - * * * * - Value "attr_blank" @@ -136,7 +133,6 @@ struct term bool_ icky_corner; bool_ soft_cursor; bool_ always_text; - bool_ never_bored; byte attr_blank; char char_blank; -- cgit v1.2.3 From 77057bed68e16af625b2e4f75d2ede9762cc71e7 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 11 Dec 2015 08:09:30 +0100 Subject: Inline effectively constant term::{char,attr}_blank --- src/z-term.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index f4f52527..875f13bb 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -76,12 +76,6 @@ struct term_win * * * - * - Value "attr_blank" - * Use this "attr" value for "blank" grids - * - * - Value "char_blank" - * Use this "char" value for "blank" grids - * * * - Ignore this pointer * @@ -134,9 +128,6 @@ struct term bool_ soft_cursor; bool_ always_text; - byte attr_blank; - char char_blank; - char *key_queue; u16b key_head; u16b key_tail; -- cgit v1.2.3 From 23b62c1da2cf541d3037aa7acc2727b09c47fcc8 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 11 Dec 2015 08:09:30 +0100 Subject: Remove always-FALSE term::always_text --- src/z-term.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 875f13bb..60d2ad94 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -71,9 +71,6 @@ struct term_win * - Flag "soft_cursor" * This "term" uses a "software" cursor * - * - Flag "always_text" - * Use the "Term_text()" routine for invisible text - * * * * @@ -126,7 +123,6 @@ struct term bool_ total_erase; bool_ icky_corner; bool_ soft_cursor; - bool_ always_text; char *key_queue; u16b key_head; -- cgit v1.2.3 From 84908853d4d30b7709f0e70efb59f8c2d094dc1d Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 11 Dec 2015 08:09:30 +0100 Subject: Remove term::wipe_hook After all it's only an optimization and systems these days should be fast enough to ignore it. --- src/z-term.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/z-term.h') diff --git a/src/z-term.h b/src/z-term.h index 60d2ad94..01795629 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -105,8 +105,6 @@ struct term_win * * - Hook for placing the cursor * - * - Hook for drawing some blank spaces - * * - Hook for drawing a string of chars using an attr * * - Hook for drawing a sequence of special attr/char pairs @@ -150,8 +148,6 @@ struct term errr (*curs_hook)(int x, int y); - errr (*wipe_hook)(int x, int y, int n); - errr (*text_hook)(int x, int y, int n, byte a, cptr s); void (*resize_hook)(void); -- cgit v1.2.3