ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
136{ 142{
137 x = Pixel2Col (x); 143 x = Pixel2Col (x);
138 y = Pixel2Row (y); 144 y = Pixel2Row (y);
139 145
140 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y + view_start);
153
154 text_t t = l.t[x];
147 155
148 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
149 { 157 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
153 break; 160 break;
154 } 161 }
155 162
156 x--; 163 x--;
157 } 164 }
158
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
187 len = 1; 191 len = 1;
188 } 192 }
189 193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
190 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
191 207
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
193 218
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 220
196 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
197 { 222 {
… …
200 ch = *chr++; 225 ch = *chr++;
201 226
202 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
205#if !UNICODE3 230# if !UNICODE3
206 if (ch >= 0x10000) 231 if (ch >= 0x10000)
207 ch = 0xfffd; 232 ch = 0xfffd;
208#endif 233# endif
209 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
211 } 236 }
212 237
238 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 239 scr_overlay_set (0, len + 1, fname);
214 240
215 free (fname); 241 free (fname);
216 242
217#if ENABLE_COMBINING 243# if ENABLE_COMBINING
218 if (alloc) 244 if (alloc)
219 delete [] alloc; 245 delete [] alloc;
220#endif 246# endif
221} 247}
222#endif 248#endif
223 249
224void 250void
225rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 268 mb[0] = ch[0];
243 len = 1; 269 len = 1;
244 } 270 }
245 271
246 if (len > 0) 272 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
248 else 274 else
249 scr_bell (); 275 scr_bell ();
250 } 276 }
251 277
252 iso14755buf = 0; 278 iso14755buf = 0;
… …
280 KeySym keysym; 306 KeySym keysym;
281#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
283#endif 309#endif
284 int valid_keysym; 310 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
286 312
287 /* 313 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
290 * 316 *
… …
308 Status status_return; 334 Status status_return;
309 335
310#if 0 336#if 0
311#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
315 else 341 else
316#endif 342#endif
317#endif 343#endif
318 { 344 {
… …
355 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
356 } 382 }
357 else 383 else
358#endif 384#endif
359 { 385 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
362 } 388 }
363 389
364 if (valid_keysym) 390 if (valid_keysym)
365 { 391 {
366#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 394 return;
369#endif 395#endif
370 396
371 if (TermWin.saveLines) 397 if (saveLines)
372 { 398 {
373#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 400 if (!ctrl && !meta)
375#else 401#else
376 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
377#endif 403#endif
378 { 404 {
379 int lnsppg; 405 int lnsppg;
380 406
381#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 409#else
384 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
385#endif 411#endif
386 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
387 { 413 {
388 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
389 return; 415 return;
… …
417 scr_move_to (0, 1); 443 scr_move_to (0, 1);
418 return; 444 return;
419 } 445 }
420 else if (keysym == XK_End) 446 else if (keysym == XK_End)
421 { 447 {
422 scr_move_to (1, 0); 448 scr_move_to (1, 1);
423 return; 449 return;
424 } 450 }
425 } 451 }
426#endif 452#endif
427 } 453 }
… …
829 { 855 {
830#ifdef META8_OPTION 856#ifdef META8_OPTION
831 /* set 8-bit on */ 857 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
833 { 859 {
834 unsigned char *ch; 860 char *ch;
835 861
836 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 863 *ch |= 0x80;
838 864
839 meta = 0; 865 meta = 0;
… …
841#endif 867#endif
842 /* nil */ ; 868 /* nil */ ;
843 } 869 }
844 } 870 }
845 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
846 if (len <= 0) 875 if (len <= 0)
847 return; /* not mapped */ 876 return; /* not mapped */
848 877
849 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 879 if (view_start)
851 { 880 {
852 TermWin.view_start = 0; 881 view_start = 0;
853 want_refresh = 1; 882 want_refresh = 1;
854 } 883 }
855 884
856 /* 885 /*
857 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 901#ifdef META8_OPTION
873 && meta_char == C0_ESC 902 && meta_char == C0_ESC
874#endif 903#endif
875 ) 904 )
876 { 905 {
877 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
878 tt_write (&ch, 1); 907 tt_write (&ch, 1);
879 } 908 }
880 909
881#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
894 923
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
898unsigned int 927unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 929{
901 unsigned int n, s; 930 unsigned int n, s;
902 931
903 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 970 }
942#endif 971#endif
943 972
944 if (want_refresh) 973 if (want_refresh)
945 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = view_start;
978 int end_row = row + nrow;
979
980 while (row > top_row && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
946 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
947 scrollbar_show (1); 1014 scrollbar_show (1);
948#ifdef USE_XIM 1015#ifdef USE_XIM
949 IMSendSpot (); 1016 IMSendSpot ();
950#endif 1017#endif
… …
954} 1021}
955 1022
956void 1023void
957rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
958{ 1025{
959 SET_R (this); 1026 make_current ();
960 SET_LOCALE (locale);
961 1027
962 display->flush (); 1028 display->flush ();
963 1029
964 if (want_refresh && !flush_ev.active) 1030 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1032}
967 1033
968void 1034void
969rxvt_term::flush_cb (time_watcher &w) 1035rxvt_term::flush_cb (time_watcher &w)
970{ 1036{
971 SET_R (this); 1037 make_current ();
972 SET_LOCALE (locale);
973 1038
974 refresh_limit = 1; 1039 refresh_limit = 1;
975 refresh_count = 0; 1040 refresh_count = 0;
976 flush (); 1041 flush ();
977} 1042}
… …
1034{ 1099{
1035 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1103 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1104 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1105 mouse_slip_wheel_speed = 0;
1042 1106
1043 refresh_type |= SMOOTH_REFRESH; 1107 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1108 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1110 }
1047} 1111}
1048#endif 1112#endif
1049 1113
1114#if HAVE_SCHED_YIELD
1115static struct event_handler
1116{
1117 check_watcher cw_yield;
1118
1119 void yield (check_watcher &w)
1120 {
1121 sched_yield ();
1122 w.stop ();
1123 }
1124
1125 event_handler ()
1126 : cw_yield (this, &event_handler::yield)
1127 {
1128 }
1129} event_handler;
1130#endif
1131
1050bool 1132bool
1051rxvt_term::pty_fill () 1133rxvt_term::pty_fill ()
1052{ 1134{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1136
1055 if (CBUFSIZ == n) 1137 if (CBUFSIZ == n)
1056 { 1138 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1140 n = 0;
1059 } 1141 }
1060 1142
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1144 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1145 cmdbuf_endp = cmdbuf_ptr + n;
1064 1146
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1148
1067 if (n > 0) 1149 if (r > 0)
1068 { 1150 {
1069 cmdbuf_endp += n; 1151 cmdbuf_endp += r;
1070 return true; 1152 return true;
1071 } 1153 }
1072 else if (n < 0 && errno != EAGAIN) 1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 {
1156#if HAVE_SCHED_YIELD
1157 if (display->is_local)
1158 event_handler.cw_yield.start ();
1159#endif
1160 }
1161 else
1162 {
1163 pty_ev.stop ();
1164
1165 if (!OPTION (Opt_hold))
1073 destroy (); 1166 destroy ();
1167 }
1074 1168
1075 return false; 1169 return false;
1076} 1170}
1077 1171
1078void 1172void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1174{
1081 SET_R (this); 1175 make_current ();
1082 SET_LOCALE (locale);
1083 1176
1084 if (revents & EVENT_READ) 1177 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1178 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1179 while (pty_fill ())
1087 if (cmd_parse ()) 1180 if (cmd_parse ())
… …
1092} 1185}
1093 1186
1094void 1187void
1095rxvt_term::pointer_unblank () 1188rxvt_term::pointer_unblank ()
1096{ 1189{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1190 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1191 recolour_cursor ();
1099 1192
1100#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1194 hidden_pointer = 0;
1102 1195
1103 if (options & Opt_pointerBlank) 1196 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1197 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1198#endif
1106} 1199}
1107 1200
1108#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
1109void 1202void
1110rxvt_term::pointer_blank () 1203rxvt_term::pointer_blank ()
1111{ 1204{
1112 if (! (options & Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
1113 return; 1206 return;
1114 1207
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1209 XFlush (display->display);
1117 1210
1118 hidden_pointer = 1; 1211 hidden_pointer = 1;
1119} 1212}
1120 1213
1121void 1214void
1122rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1123{ 1216{
1124 SET_R (this); 1217 make_current ();
1125 SET_LOCALE (locale);
1126 1218
1127 pointer_blank (); 1219 pointer_blank ();
1128} 1220}
1129#endif 1221#endif
1130 1222
… …
1209 1301
1210/*{{{ process an X event */ 1302/*{{{ process an X event */
1211void 1303void
1212rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1213{ 1305{
1306 make_current ();
1307
1214 dDisp; 1308 dDisp;
1215 1309
1216 SET_R (this); 1310 if (ev.xany.window == vt
1217 SET_LOCALE (locale); 1311 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return;
1218 1314
1219#if defined(CURSOR_BLINK) 1315 // for XQueryPointer
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1221 {
1222 if (hidden_cursor)
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1318 unsigned int unused_mask;
1249 1319
1250 switch (ev.type) 1320 switch (ev.type)
… …
1257 1327
1258 break; 1328 break;
1259 1329
1260 case KeyRelease: 1330 case KeyRelease:
1261 { 1331 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1333 KeySym keysym;
1264 1334
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1336#endif
1267 1337
1268#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1339 // ISO 14755 support
1270 if (iso14755buf) 1340 if (iso14755buf)
… …
1275# endif 1345# endif
1276# if ISO_14755 1346# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1278 // first: controls 1348 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1352 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1354 commit_iso14755 ();
1285 return; // case-break; 1355 goto skip_switch;
1286 } 1356 }
1287 1357
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1359 if (i[0] == keysym)
1290 { 1360 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1362 commit_iso14755 ();
1293 return; // case-break; 1363 goto skip_switch;
1294 } 1364 }
1295 1365
1296 scr_bell (); 1366 scr_bell ();
1297# endif 1367# endif
1298 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1317 else 1387 else
1318 iso14755buf = 0; 1388 iso14755buf = 0;
1319 } 1389 }
1320#endif 1390#endif
1321 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1327#endif 1401#endif
1328 break; 1402 break;
1329 } 1403 }
1330 1404
… …
1422 case FocusOut: 1496 case FocusOut:
1423 focus_out (); 1497 focus_out ();
1424 break; 1498 break;
1425 1499
1426 case ConfigureNotify: 1500 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1501 if (ev.xconfigure.window == parent[0])
1428 { 1502 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ;
1438 1505
1439 if (szHint.width != width || szHint.height != height) 1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1507 {
1441 seen_resize = 1; 1508 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1510 }
1444 1511
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1513 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1514 check_our_parents ();
1448#endif 1515#endif
1449 } 1516 }
1450 break; 1517 break;
1451 1518
… …
1467 1534
1468 case SelectionRequest: 1535 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1470 break; 1537 break;
1471 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1472 case UnmapNotify: 1547 case UnmapNotify:
1473 TermWin.mapped = 0; 1548 mapped = 0;
1474#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1476#endif 1551#endif
1477 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479 case MapNotify:
1480 TermWin.mapped = 1;
1481#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif
1484 break; 1553 break;
1485 1554
1486#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1487 case ReparentNotify: 1556 case ReparentNotify:
1488 rootwin_cb (ev); 1557 rootwin_cb (ev);
1489 break; 1558 break;
1490#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1491 1560
1492 case GraphicsExpose: 1561 case GraphicsExpose:
1493 case Expose: 1562 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1495 { 1564 {
1496 do 1565 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1569
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1571
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1506 1575
1507 scr_refresh (refresh_type); 1576 want_refresh = 1;
1508 } 1577 }
1509 else 1578 else
1510 { 1579 {
1511 XEvent unused_event; 1580 XEvent unused_event;
1512 1581
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1594 menubar_expose ();
1526#endif 1595#endif
1527 1596
1528#ifdef TRANSPARENT 1597#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1598 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1599 XClearWindow (disp, ev.xany.window);
1531#endif 1600#endif
1532 } 1601 }
1533 break; 1602 break;
1534 1603
… …
1545 } 1614 }
1546#endif 1615#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1617 break;
1549 1618
1550 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1551 { 1620 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1625 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1627 ;
1556 1628
1557 XQueryPointer (disp, TermWin.vt, 1629 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1633 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
… …
1574#endif 1646#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1649
1578#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1653 {
1582 int dist; 1654 int dist;
1583 1655
1584 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1668
1597 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1599 { 1671 {
1600 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1602 } 1674 }
1603 else 1675 else
1604 { 1676 {
1605 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1678 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1679 }
1608 1680
1609 scroll_selection_lines = Pixel2Height (dist) 1681 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1683 + 1;
1612 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1614 } 1686 }
1615 else 1687 else
1616 { 1688 {
1617 /* we are within the text window, so we 1689 /* we are within the text window, so we
… …
1637 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1710 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1711 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1713 scrollbar_size ());
1642 scr_refresh (refresh_type); 1714 want_refresh = 1;
1643 refresh_limit = 0; 1715 refresh_limit = 0;
1644 scrollbar_show (1); 1716 scrollbar_show (1);
1645 } 1717 }
1646 break; 1718 break;
1647 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1648} 1749}
1649 1750
1650void 1751void
1651rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1652{ 1753{
1653 if (!TermWin.focus) 1754 if (!focus)
1654 { 1755 {
1655 TermWin.focus = 1; 1756 focus = 1;
1656 want_refresh = 1; 1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1657#ifdef USE_XIM 1761#if USE_XIM
1658 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1659 { 1763 {
1660 IMSetStatusPosition (); 1764 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
1662 } 1766 }
1663#endif 1767#endif
1664#ifdef CURSOR_BLINK 1768#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1769 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1771#endif
1668#ifdef OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1670 { 1774 {
1671 pix_colors = pix_colors_focused; 1775 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1776 scr_recolour ();
1673 } 1777 }
… …
1676} 1780}
1677 1781
1678void 1782void
1679rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1680{ 1784{
1681 if (TermWin.focus) 1785 if (focus)
1682 { 1786 {
1683 TermWin.focus = 0; 1787 focus = 0;
1684 want_refresh = 1; 1788 want_refresh = 1;
1685 1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1686#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1687 iso14755buf = 0; 1795 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1796# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1797 scr_overlay_off ();
1691#endif 1798# endif
1799 }
1800#endif
1692#ifdef USE_XIM 1801#if USE_XIM
1693 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1695#endif 1804#endif
1696#ifdef CURSOR_BLINK 1805#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1806 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1808 hidden_cursor = 0;
1700#endif 1809#endif
1701#ifdef OFF_FOCUS_FADING 1810#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1811 if (rs[Rs_fade])
1703 { 1812 {
1704 pix_colors = pix_colors_unfocused; 1813 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1814 scr_recolour ();
1706 } 1815 }
… …
1710 1819
1711#if TRANSPARENT 1820#if TRANSPARENT
1712void 1821void
1713rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1823{
1715 SET_R (this); 1824 make_current ();
1716 SET_LOCALE (locale);
1717 1825
1718 switch (ev.type) 1826 switch (ev.type)
1719 { 1827 {
1720 case PropertyNotify: 1828 case PropertyNotify:
1721 /* 1829 /*
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1835 return;
1728 1836
1729 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1730 case ReparentNotify: 1838 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1733 break; 1841 break;
1734 } 1842 }
1735} 1843}
1736#endif 1844#endif
… …
1739rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1740{ 1848{
1741 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1742 1850
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1744 if (!bypass_keystate) 1853 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1855
1747 /* 1856 /*
1748 * VT window processing of button press 1857 * VT window processing of button press
1749 */ 1858 */
1750 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1751 { 1860 {
1752#if ISO_14755 1861#if ISO_14755
1753 // 5.4 1862 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1864 {
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1770 { 1879 {
1771 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1772 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1773 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1774 { 1884 {
1775 /* only report double clicks */ 1885 /* only report double clicks */
1776 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1777 mouse_report (ev); 1887 mouse_report (ev);
… …
1797 else 1907 else
1798 { 1908 {
1799 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1800 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1801 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1802 switch (ev.button) 1913 switch (ev.button)
1803 { 1914 {
1804 case Button1: 1915 case Button1:
1805 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1806 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1807#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1808 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1809#else 1920#else
1810 selection.rect = false; 1921 selection.rect = false;
1811#endif 1922#endif
1812 1923
1813 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1926 {
1816 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1818 else 1929 else
1819 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1820 } 1931 }
1821 else 1932 else
1822 { 1933 {
1823 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1824 MEvent.clicks++; 1935 MEvent.clicks++;
1825 else 1936 else
1826 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1827 1938
1828 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1829 } 1940 }
1830 1941
1831 MEvent.button = Button1; 1942 MEvent.button = Button1;
1832 break; 1943 break;
1833 1944
1834 case Button3: 1945 case Button3:
1835 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1836 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1837 else 1948 else
1838 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1839 1950
1840 MEvent.button = Button3; 1951 MEvent.button = Button3;
1841 break; 1952 break;
1842 } 1953 }
1843 } 1954 }
1844 1955
1845 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1846 return; 1957 return;
1847 } 1958 }
1848 1959
… …
1960 case Button3: 2071 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1962 { 2073 {
1963 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1966# else 2077# else
1967 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1968# endif 2079# endif
1969 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1972# else 2083# else
1973 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1974# endif 2085# endif
1975 else 2086 else
1976 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1977 } 2088 }
1978 else 2089 else
1979 { 2090 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2092 (nrow
1982 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2094 / scrollbar_size ()));
1984 } 2095 }
1985 2096
1986 break; 2097 break;
1987 } 2098 }
1988 } 2099 }
2100
1989 return; 2101 return;
1990 } 2102 }
2103
1991#if MENUBAR 2104#if MENUBAR
1992 /* 2105 /*
1993 * Menubar window processing of button press 2106 * Menubar window processing of button press
1994 */ 2107 */
1995 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2018#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2132 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2133 sel_scroll_ev.stop();
2021#endif 2134#endif
2022 2135
2023 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
2024 { 2137 {
2025#if ISO_14755 2138#if ISO_14755
2026 // 5.4 2139 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2141 return;
… …
2058 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2059 && bypass_keystate 2172 && bypass_keystate
2060 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2061 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2062 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2063 switch (ev.button) 2179 switch (ev.button)
2064 { 2180 {
2065 case Button1: 2181 case Button1:
2066 case Button3: 2182 case Button3:
2067 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2078 2194
2079 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2080 2196
2081 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
2082 i = 1; 2198 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2200 i = nrow - 1;
2085 else 2201 else
2086 i = 5; 2202 i = 5;
2087 2203
2088# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
2090 { 2206 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2210
2095 if (slip_wheel_ev.at < NOW) 2211 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2213
2098 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2099 } 2215 }
2100 else 2216 else
2101 { 2217 {
2102# endif 2218# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2219 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2220 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2116 } 2222 }
2117#endif 2223# endif
2118 } 2224 }
2119 break; 2225 break;
2120#endif 2226#endif
2121 } 2227 }
2122 } 2228 }
… …
2374 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2481 dDisp;
2376 2482
2377 pchanged = 0; 2483 pchanged = 0;
2378 2484
2379 if (!(options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
2381 2487
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
2384 2490
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2491 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2492
2387 if (rootdepth != wattr.depth) 2493 if (rootdepth != wattr.depth)
2388 { 2494 {
2389 if (am_transparent) 2495 if (am_transparent)
2390 { 2496 {
2391 pchanged = 1; 2497 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2499 am_transparent = am_pixmap_trans = 0;
2394 } 2500 }
2395 2501
2396 return pchanged; /* Don't try any more */ 2502 return pchanged; /* Don't try any more */
2397 } 2503 }
… …
2438 Window cr; 2544 Window cr;
2439 XImage *image; 2545 XImage *image;
2440 GC gc; 2546 GC gc;
2441 XGCValues gcvalue; 2547 XGCValues gcvalue;
2442 2548
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2549 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2550 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2551 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2552 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2553 nx = ny = 0;
2448 2554
… …
2458 nh += sy; 2564 nh += sy;
2459 ny = -sy; 2565 ny = -sy;
2460 sy = 0; 2566 sy = 0;
2461 } 2567 }
2462 2568
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2571
2466 XSync (disp, False); 2572 XSync (disp, False);
2467 allowedxerror = -1; 2573 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2575
… …
2474 if (image == NULL) 2580 if (image == NULL)
2475 { 2581 {
2476 if (am_transparent && am_pixmap_trans) 2582 if (am_transparent && am_pixmap_trans)
2477 { 2583 {
2478 pchanged = 1; 2584 pchanged = 1;
2479 if (TermWin.pixmap != None) 2585 if (pixmap != None)
2480 { 2586 {
2481 XFreePixmap (disp, TermWin.pixmap); 2587 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2588 pixmap = None;
2483 } 2589 }
2484 } 2590 }
2485 2591
2486 am_pixmap_trans = 0; 2592 am_pixmap_trans = 0;
2487 } 2593 }
2488 else 2594 else
2489 { 2595 {
2490 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2492 2598
2493#if TINTING 2599#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2600 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2601 {
2496 unsigned short rm, gm, bm; 2602 unsigned short rm, gm, bm;
… …
2500 2606
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2607 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2608 }
2503#endif 2609#endif
2504 2610
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2611 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2612 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2615 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2616 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2617 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2619 XClearWindow (disp, parent[0]);
2514 2620
2515 if (!am_transparent || !am_pixmap_trans) 2621 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2622 pchanged = 1;
2517 2623
2518 am_transparent = am_pixmap_trans = 1; 2624 am_transparent = am_pixmap_trans = 1;
2519 } 2625 }
2520 } 2626 }
2521 2627
2522 if (am_pixmap_trans) 2628 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2630 else
2525 { 2631 {
2526 unsigned int n; 2632 unsigned int n;
2527 /* 2633 /*
2528 * InheritPixmap transparency 2634 * InheritPixmap transparency
2529 */ 2635 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2637 {
2532 oldp = TermWin.parent[i]; 2638 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2639 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2640 &parent[i], &list, &n);
2535 XFree (list); 2641 XFree (list);
2536 2642
2537 if (TermWin.parent[i] == display->root) 2643 if (parent[i] == display->root)
2538 { 2644 {
2539 if (oldp != None) 2645 if (oldp != None)
2540 pchanged = 1; 2646 pchanged = 1;
2541 2647
2542 break; 2648 break;
2543 } 2649 }
2544 2650
2545 if (oldp != TermWin.parent[i]) 2651 if (oldp != parent[i])
2546 pchanged = 1; 2652 pchanged = 1;
2547 } 2653 }
2548 2654
2549 n = 0; 2655 n = 0;
2550 2656
2551 if (pchanged) 2657 if (pchanged)
2552 { 2658 {
2553 for (; n < (unsigned int)i; n++) 2659 for (; n < (unsigned int)i; n++)
2554 { 2660 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2661 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2663 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2665 break;
2560 } 2666 }
2561 } 2667 }
2562 } 2668 }
2563 2669
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2671 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2674 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2675 /* XXX: also turn off Opt_transparent? */
2570 } 2676 }
2571 else 2677 else
2572 { 2678 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2681 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2682 sleep (1);
2577#endif 2683#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2684 for (n = 0; n < (unsigned int)i; n++)
2579 { 2685 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2687 XClearWindow (disp, parent[n]);
2582 } 2688 }
2583 2689
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2691 am_transparent = 1;
2586 } 2692 }
2587 2693
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2695 parent[i] = None;
2590 } 2696 }
2591 2697
2592 if (scrollBar.win) 2698 if (scrollBar.win)
2593 { 2699 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2611 2717
2612bool 2718bool
2613rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2614{ 2720{
2615 bool flag = false; 2721 bool flag = false;
2616 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2618 2724
2619 for (;;) 2725 for (;;)
2620 { 2726 {
2621 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2622 { 2728 {
2623 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2730 ch = next_char ();
2625 }
2626 2731
2627 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2628 break; 2733 break;
2734 }
2629 2735
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2737 {
2632 if (!seen_input) 2738 if (!seen_input)
2633 { 2739 {
… …
2642 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2644 } 2750 }
2645 2751
2646 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2754 bool refreshnow = false;
2649 int nlines = 0; 2755 int nlines = 0;
2650 unicode_t *str = buf; 2756 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2758
2653 for (;;) 2759 for (;;)
2654 { 2760 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2762 break;
2657 2763
2658 *str++ = ch; 2764 *str++ = ch;
2659 2765
2660 if (ch == C0_LF || str >= eol) 2766 if (ch == C0_LF || str >= eol)
2661 { 2767 {
2768 if (ch == C0_LF)
2662 nlines++; 2769 nlines++;
2770
2663 refresh_count++; 2771 refresh_count++;
2664 2772
2665 if (!(options & Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2775 {
2668 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2669 ch = NOCHAR; 2778 ch = NOCHAR;
2670 break; 2779 break;
2671 } 2780 }
2672 2781
2673 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= TermWin.nrow - 1) 2783 if (nlines >= nrow - 1)
2675 { 2784 {
2785 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2786 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2676 scr_add_lines (buf, nlines, str - buf); 2787 scr_add_lines (buf, str - buf, nlines);
2788
2677 nlines = 0; 2789 nlines = 0;
2678 str = buf; 2790 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ); 2791 eol = str + min (ncol, UBUFSIZ);
2680 } 2792 }
2681 2793
2682 if (str >= eol) 2794 if (str >= eol)
2683 { 2795 {
2684 if (eol >= buf + UBUFSIZ) 2796 if (eol >= buf + UBUFSIZ)
2685 { 2797 {
2686 ch = NOCHAR; 2798 ch = NOCHAR;
2687 break; 2799 break;
2688 } 2800 }
2689 else 2801 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2802 eol = min (eol + ncol, buf + UBUFSIZ);
2691 } 2803 }
2692 2804
2693 } 2805 }
2694 2806
2695 seq_begin = cmdbuf_ptr; 2807 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2808 ch = next_char ();
2697 } 2809 }
2698 2810
2811 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2699 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
2700 2814
2701 /* 2815 /*
2702 * If there have been a lot of new lines, then update the screen 2816 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2817 * What the heck I'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2818 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2819 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2820 */
2707 if (refreshnow) 2821 if (refreshnow)
2708 { 2822 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2824 refresh_limit++;
2711 else 2825 else
2712 { 2826 {
2713 flag = true; 2827 flag = true;
2714 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2829 want_refresh = 1;
2715 } 2830 }
2716 } 2831 }
2717 2832
2718 } 2833 }
2719 else 2834 else
… …
2734 } 2849 }
2735 2850
2736 return flag; 2851 return flag;
2737} 2852}
2738 2853
2739// read the next octet
2740unicode_t
2741rxvt_term::next_octet ()
2742{
2743 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++
2745 : NOCHAR;
2746}
2747
2748// read the next character 2854// read the next character
2749unicode_t 2855wchar_t
2750rxvt_term::next_char () 2856rxvt_term::next_char ()
2751{ 2857{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2859 {
2754 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2757 2863
2758 wchar_t wc; 2864 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2866
2761 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2762 { 2868 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2765 break; 2871 break;
2766 } 2872 }
2767 2873
2768 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2770 2876
2771 // assume wchar == unicode 2877 // assume wchar == unicode
2772 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK; 2879 return wc & UNICODE_MASK;
2774 } 2880 }
2775 2881
2776 return NOCHAR; 2882 return NOCHAR;
2883}
2884
2885// read the next octet
2886uint32_t
2887rxvt_term::next_octet ()
2888{
2889 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR;
2777} 2892}
2778 2893
2779/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2780/* 2895/*
2781 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2782 * to the command. 2897 * to the command.
2783 */ 2898 */
2784unicode_t 2899wchar_t
2785rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2786{ 2901{
2787 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2788 2903
2789 if (c == NOCHAR) 2904 if (c == NOCHAR)
2790 throw out_of_input; 2905 throw out_of_input;
2791 2906
2792 return c; 2907 return c;
2793} 2908}
2794 2909
2795unicode_t 2910uint32_t
2796rxvt_term::cmd_get8 () 2911rxvt_term::cmd_get8 ()
2797{ 2912{
2798 unicode_t c = next_octet (); 2913 uint32_t c = next_octet ();
2799 2914
2800 if (c == NOCHAR) 2915 if (c == NOCHAR)
2801 throw out_of_input; 2916 throw out_of_input;
2802 2917
2803 return c; 2918 return c;
… …
2903 case C0_ESC: 3018 case C0_ESC:
2904 process_escape_seq (); 3019 process_escape_seq ();
2905 break; 3020 break;
2906 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3023 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 3024 else
2911 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 3026 break;
2914 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2915 scr_bell (); 3028 scr_bell ();
2916 break; 3029 break;
2917 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
3072 break; 3185 break;
3073 3186
3074 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
3076 { 3189 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 3192 }
3080 break; 3193 break;
3081 3194
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 3218 process_dcs_seq ();
3106 break; 3219 break;
3107 3220
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
3113 3225
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 3228 process_csi_seq ();
… …
3356 3468
3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3469 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3358 arg[0] = -arg[0]; 3470 arg[0] = -arg[0];
3359 /* FALLTHROUGH */ 3471 /* FALLTHROUGH */
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3474 break;
3363 3475
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 3478 break;
3368 3479
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
3371 break; 3482 break;
… …
3378 break; 3489 break;
3379 case 6: /* CPR requested */ 3490 case 6: /* CPR requested */
3380 scr_report_position (); 3491 scr_report_position ();
3381 break; 3492 break;
3382 case 7: /* unofficial extension */ 3493 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3494 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3495 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3496 break;
3386 case 8: /* unofficial extension */ 3497 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3499 break;
… …
3491 { 3602 {
3492 /* 3603 /*
3493 * commands 3604 * commands
3494 */ 3605 */
3495 case 1: /* deiconify window */ 3606 case 1: /* deiconify window */
3496 XMapWindow (disp, TermWin.parent[0]); 3607 XMapWindow (disp, parent[0]);
3497 break; 3608 break;
3498 case 2: /* iconify window */ 3609 case 2: /* iconify window */
3499 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3610 XIconifyWindow (disp, parent[0], display->screen);
3500 break; 3611 break;
3501 case 3: /* set position (pixels) */ 3612 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3613 XMoveWindow (disp, parent[0], args[1], args[2]);
3503 break; 3614 break;
3504 case 4: /* set size (pixels) */ 3615 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3617 break;
3507 case 5: /* raise window */ 3618 case 5: /* raise window */
3508 XRaiseWindow (disp, TermWin.parent[0]); 3619 XRaiseWindow (disp, parent[0]);
3509 break; 3620 break;
3510 case 6: /* lower window */ 3621 case 6: /* lower window */
3511 XLowerWindow (disp, TermWin.parent[0]); 3622 XLowerWindow (disp, parent[0]);
3512 break; 3623 break;
3513 case 7: /* refresh window */ 3624 case 7: /* refresh window */
3514 scr_touch (true); 3625 scr_touch (true);
3515 break; 3626 break;
3516 case 8: /* set size (chars) */ 3627 case 8: /* set size (chars) */
3517 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3628 set_widthheight ((unsigned int) (args[2] * fwidth),
3518 (unsigned int) (args[1] * TermWin.fheight)); 3629 (unsigned int) (args[1] * fheight));
3519 break; 3630 break;
3520 3631
3521 //case 9: NYI, TODO, restore maximized window or maximize window 3632 //case 9: NYI, TODO, restore maximized window or maximize window
3522 default: 3633 default:
3523 if (args[0] >= 24) /* set height (chars) */ 3634 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)TermWin.width, 3635 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3526 break; 3637 break;
3527 3638
3528 3639
3529 /* 3640 /*
3530 * reports - some output format copied from XTerm 3641 * reports - some output format copied from XTerm
3531 */ 3642 */
3532 case 11: /* report window state */ 3643 case 11: /* report window state */
3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3644 XGetWindowAttributes (disp, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3646 break;
3536 case 13: /* report window position */ 3647 case 13: /* report window position */
3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (disp, parent[0], &wattr);
3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3649 XTranslateCoordinates (disp, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3650 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3651 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3652 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3653 break;
3543 case 14: /* report window size (pixels) */ 3654 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3657 break;
3547 case 18: /* report text area size (chars) */ 3658 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3659 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3660 break;
3550 case 19: /* report window size (chars) */ 3661 case 19: /* report window size (chars) */
3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3662 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3663 break;
3553 case 20: /* report icon label */ 3664 case 20: /* report icon label */
3554 { 3665 {
3555 char *s; 3666 char *s;
3556 XGetIconName (disp, TermWin.parent[0], &s); 3667 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3668 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3669 XFree (s);
3559 } 3670 }
3560 break; 3671 break;
3561 case 21: /* report window title */ 3672 case 21: /* report window title */
3562 { 3673 {
3563 char *s; 3674 char *s;
3564 XFetchName (disp, TermWin.parent[0], &s); 3675 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3676 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3677 XFree (s);
3567 } 3678 }
3568 break; 3679 break;
3569 } 3680 }
3570} 3681}
… …
3573/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3574/* 3685/*
3575 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3687 * ends_how is terminator used. returned input must be free()'d
3577 */ 3688 */
3578unsigned char * 3689char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3691{
3581 unicode_t ch; 3692 unicode_t ch;
3582 bool seen_esc = false; 3693 bool seen_esc = false;
3583 unsigned int n = 0; 3694 unsigned int n = 0;
… …
3616 3727
3617 string[n++] = '\0'; 3728 string[n++] = '\0';
3618 3729
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3731
3621 return (unsigned char *)rxvt_wcstombs (string); 3732 return rxvt_wcstombs (string);
3622} 3733}
3623 3734
3624/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
3625/* 3736/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3738 */
3628void 3739void
3629rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
3630{ 3741{
3631 unsigned char *s; 3742 char *s;
3632 unicode_t eh; 3743 unicode_t eh;
3633 3744
3634 /* 3745 /*
3635 * Not handled yet 3746 * Not handled yet
3636 */ 3747 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
3657 3768
3658 if (ch == ';') 3769 if (ch == ';')
3659 { 3770 {
3660 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
3661 3772
3662 if (s) 3773 if (s)
3663 { 3774 {
3664 process_xterm_seq (arg, (char *)s, eh); 3775 process_xterm_seq (arg, s, eh);
3665 free (s); 3776 free (s);
3666 } 3777 }
3667 } 3778 }
3668} 3779}
3669 3780
3670void 3781void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3783{
3673 if (str[0] == '?' && !str[1]) 3784 if (str[0] == '?' && !str[1])
3674 { 3785 {
3675 unsigned short r, g, b; 3786 unsigned short r, g, b;
3676 pix_colors_focused[color].get (display, r, g, b); 3787 pix_colors_focused[color].get (display, r, g, b);
… …
3682 3793
3683/* 3794/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3796 */
3686void 3797void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3799{
3689 int changed = 0; 3800 int changed = 0;
3690 int color; 3801 int color;
3691 char *buf, *name; 3802 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3803 bool query = str[0] == '?' && !str[1];
… …
3715 unsigned long bytes_after; 3826 unsigned long bytes_after;
3716 unsigned char *value = 0; 3827 unsigned char *value = 0;
3717 const char *str = ""; 3828 const char *str = "";
3718 3829
3719 if (prop 3830 if (prop
3720 && XGetWindowProperty (disp, TermWin.parent[0], 3831 && XGetWindowProperty (disp, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3832 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3833 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3834 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3835 && actual_type != None
3725 && actual_format == 8) 3836 && actual_format == 8)
… …
3737 { 3848 {
3738 *eq = 0; 3849 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3850 set_utf8_property (display->atom (str), eq + 1);
3740 } 3851 }
3741 else 3852 else
3742 XDeleteProperty (disp, TermWin.parent[0], 3853 XDeleteProperty (disp, parent[0],
3743 display->atom (str)); 3854 display->atom (str));
3744 } 3855 }
3745 break; 3856 break;
3746 3857
3747 case XTerm_Color: 3858 case XTerm_Color:
… …
3749 { 3860 {
3750 if ((name = strchr (buf, ';')) == NULL) 3861 if ((name = strchr (buf, ';')) == NULL)
3751 break; 3862 break;
3752 3863
3753 *name++ = '\0'; 3864 *name++ = '\0';
3754 color = atoi (buf); 3865 color = atoi (buf) + minCOLOR;
3755 3866
3756 if (color < 0 || color >= TOTAL_COLORS) 3867 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3757 break; 3868 break;
3758 3869
3759 if ((buf = strchr (name, ';')) != NULL) 3870 if ((buf = strchr (name, ';')) != NULL)
3760 *buf++ = '\0'; 3871 *buf++ = '\0';
3761 3872
3762 if (name[0] == '?' && !name[1]) 3873 if (name[0] == '?' && !name[1])
3763 { 3874 {
3764 unsigned short r, g, b; 3875 unsigned short r, g, b;
3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3876 pix_colors_focused[color].get (display, r, g, b);
3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3767 } 3878 }
3768 else 3879 else
3769 set_window_color (color + minCOLOR, name); 3880 set_window_color (color, name);
3770 } 3881 }
3771 break; 3882 break;
3772 case XTerm_Color00: 3883 case XTerm_Color00:
3773 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3884 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3774 break; 3885 break;
3775 case XTerm_Color01: 3886 case XTerm_Color01:
3776 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3887 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3777 break; 3888 break;
3778#ifndef NO_CURSORCOLOR 3889#ifndef NO_CURSORCOLOR
3779 case XTerm_Color_cursor: 3890 case XTerm_Color_cursor:
3780 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3781 break; 3892 break;
… …
3785 break; 3896 break;
3786 case XTerm_Color_pointer_bg: 3897 case XTerm_Color_pointer_bg:
3787 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3788 break; 3899 break;
3789#ifndef NO_BOLD_UNDERLINE_REVERSE 3900#ifndef NO_BOLD_UNDERLINE_REVERSE
3790 case XTerm_Color_BD:
3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3792 break;
3793 case XTerm_Color_UL:
3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3795 break;
3796 case XTerm_Color_RV: 3901 case XTerm_Color_RV:
3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3902 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3903 break;
3904 case Rxvt_Color_BD:
3905 case URxvt_Color_BD:
3906 process_color_seq (op, Color_BD, str, resp);
3907 break;
3908 case Rxvt_Color_UL:
3909 case URxvt_Color_UL:
3910 process_color_seq (op, Color_UL, str, resp);
3798 break; 3911 break;
3799 case URxvt_Color_IT: 3912 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3913 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break; 3914 break;
3802#endif 3915#endif
… …
3807 if (am_transparent) 3920 if (am_transparent)
3808 want_full_refresh = want_refresh = 1; 3921 want_full_refresh = want_refresh = 1;
3809 break; 3922 break;
3810#endif 3923#endif
3811 3924
3812 case XTerm_Pixmap: 3925 case Rxvt_Pixmap:
3813 if (*str != ';') 3926 if (*str != ';')
3814 { 3927 {
3815#if XPM_BACKGROUND 3928#if XPM_BACKGROUND
3816 scale_pixmap (""); /* reset to default scaling */ 3929 scale_pixmap (""); /* reset to default scaling */
3817 set_bgPixmap (str); /* change pixmap */ 3930 set_bgPixmap (str); /* change pixmap */
3818#endif
3819 scr_touch (true); 3931 scr_touch (true);
3932#endif
3820 } 3933 }
3934
3821 while ((str = strchr (str, ';')) != NULL) 3935 while ((str = strchr (str, ';')) != NULL)
3822 { 3936 {
3823 str++; 3937 str++;
3824#if XPM_BACKGROUND 3938#if XPM_BACKGROUND
3825 changed += scale_pixmap (str); 3939 changed += scale_pixmap (str);
… …
3828 3942
3829 if (changed) 3943 if (changed)
3830 { 3944 {
3831#ifdef XPM_BACKGROUND 3945#ifdef XPM_BACKGROUND
3832 resize_pixmap (); 3946 resize_pixmap ();
3833#endif
3834 scr_touch (true); 3947 scr_touch (true);
3948#endif
3835 } 3949 }
3836 break; 3950 break;
3837 3951
3838 case XTerm_restoreFG: 3952 case Rxvt_restoreFG:
3839 set_window_color (Color_fg, str); 3953 set_window_color (Color_fg, str);
3840 break; 3954 break;
3841 case XTerm_restoreBG: 3955 case Rxvt_restoreBG:
3842 set_window_color (Color_bg, str); 3956 set_window_color (Color_bg, str);
3843 break; 3957 break;
3844 3958
3845 case XTerm_logfile: 3959 case XTerm_logfile:
3846 // TODO, when secure mode? 3960 // TODO, when secure mode?
3847 break; 3961 break;
3848 3962
3849#ifdef MENUBAR 3963#ifdef MENUBAR
3850 case URxvt_Menu: 3964 case URxvt_Menu:
3851 if (options & Opt_insecure) 3965 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3967 break;
3854#endif 3968#endif
3855#if 0 3969#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3970 case Rxvt_dumpscreen: /* no error notices */
3857 { 3971 {
3858 int fd; 3972 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3973 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3974 {
3861 scr_dump (fd); 3975 scr_dump (fd);
… …
3872 case URxvt_italicFont: 3986 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3987 case URxvt_boldItalicFont:
3874#endif 3988#endif
3875 if (query) 3989 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3990 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3991 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3992 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3993 resp);
3880 else 3994 else
3881 { 3995 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3996 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883 3997
… …
3888 break; 4002 break;
3889 4003
3890#if ENABLE_FRILLS 4004#if ENABLE_FRILLS
3891 case URxvt_locale: 4005 case URxvt_locale:
3892 if (query) 4006 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4007 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 4008 else
3895 { 4009 {
3896 set_locale (str); 4010 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 4011 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 4012 init_xlocale ();
3899 } 4013 }
3900 break; 4014 break;
3901 4015
3902 case URxvt_view_up: 4016 case URxvt_view_up:
3903 case URxvt_view_down: 4017 case URxvt_view_down:
4018 {
3904 int lines = atoi (str); 4019 int lines = atoi (str);
3905 4020
3906 if (lines) 4021 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 4022 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 4023 else
3909 {
3910 scr_erase_savelines (); 4024 scr_erase_savelines ();
3911 } 4025 }
3912 4026
4027 break;
4028#endif
4029
4030#if ENABLE_PERL
4031 case URxvt_perl:
4032 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4033 ; // no responses yet
3913 break; 4034 break;
3914#endif 4035#endif
3915 } 4036 }
3916} 4037}
3917/*----------------------------------------------------------------------*/ 4038/*----------------------------------------------------------------------*/
… …
4026 } 4147 }
4027 4148
4028 /* extra handling for values with state unkept */ 4149 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4150 switch (arg[i])
4030 { 4151 {
4152#if ENABLE_STYLES
4153 case 1021:
4154 set_option (Opt_intensityStyles, mode);
4155
4156 scr_touch (true);
4157 break;
4158#endif
4031 case 1048: /* alternative cursor save */ 4159 case 1048: /* alternative cursor save */
4032 case 1049: 4160 case 1049:
4033 if (options & Opt_secondaryScreen) 4161 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4162 if (mode == 0)
4035 scr_cursor (RESTORE); 4163 scr_cursor (RESTORE);
4036 else if (mode == 1) 4164 else if (mode == 1)
4037 scr_cursor (SAVE); 4165 scr_cursor (SAVE);
4038 break; 4166 break;
… …
4050 */ 4178 */
4051 PrivMode (1, PrivMode_vt52); 4179 PrivMode (1, PrivMode_vt52);
4052 break; 4180 break;
4053 case 3: /* 80/132 */ 4181 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4182 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4183 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4184 break;
4057 case 4: /* smooth scrolling */ 4185 case 4: /* smooth scrolling */
4058 if (state)
4059 options &= ~Opt_jumpScroll;
4060 else
4061 options |= Opt_jumpScroll; 4186 set_option (Opt_jumpScroll, !state);
4062 break; 4187 break;
4063 case 5: /* reverse video */ 4188 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4189 scr_rvideo_mode (state);
4065 break; 4190 break;
4066 case 6: /* relative/absolute origins */ 4191 case 6: /* relative/absolute origins */
… …
4107#if 0 4232#if 0
4108 case 1001: 4233 case 1001:
4109 break; /* X11 mouse highlighting */ 4234 break; /* X11 mouse highlighting */
4110#endif 4235#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4236 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state)
4113 options &= ~Opt_scrollTtyOutput;
4114 else
4115 options |= Opt_scrollTtyOutput; 4237 set_option (Opt_scrollTtyOutput, !state);
4116 break; 4238 break;
4117 case 1011: /* scroll to bottom on key press */ 4239 case 1011: /* scroll to bottom on key press */
4118 if (state)
4119 options |= Opt_scrollTtyKeypress; 4240 set_option (Opt_scrollTtyKeypress, state);
4120 else
4121 options &= ~Opt_scrollTtyKeypress;
4122 break; 4241 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4242 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4243 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4244 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4245 scr_erase_screen (2);
4127 scr_change_screen (state); 4246 scr_change_screen (state);
4128 break; 4247 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4248 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4249 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4250 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4252 scr_erase_screen (2);
4134 break; 4253 break;
4135 default: 4254 default:
4136 break; 4255 break;
… …
4264 scr_color (Color_bg, Color_bg); 4383 scr_color (Color_bg, Color_bg);
4265 break; 4384 break;
4266 4385
4267 //case 50: // not variable spacing 4386 //case 50: // not variable spacing
4268 4387
4269#ifndef NO_BRIGHTCOLOR 4388#if ENABLE_FRILLS
4270 case 90: 4389 case 90:
4271 case 91: /* set bright fg color */ 4390 case 91: /* set bright fg color */
4272 case 92: 4391 case 92:
4273 case 93: 4392 case 93:
4274 case 94: 4393 case 94:
… …
4286 case 106: 4405 case 106:
4287 case 107: 4406 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4407 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4408 break;
4290#endif 4409#endif
4291
4292 } 4410 }
4293 } 4411 }
4294} 4412}
4295/*}}} */ 4413/*}}} */
4296 4414
… …
4320 */ 4438 */
4321void 4439void
4322rxvt_term::tt_printf (const char *fmt,...) 4440rxvt_term::tt_printf (const char *fmt,...)
4323{ 4441{
4324 va_list arg_ptr; 4442 va_list arg_ptr;
4325 unsigned char buf[256]; 4443 char buf[256];
4326 4444
4327 va_start (arg_ptr, fmt); 4445 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4446 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 4447 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 4448 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 4453 * or generated by us in response to a query ESC sequence.
4336 */ 4454 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4455const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 4456
4339void 4457void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4458rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 4459{
4460 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461 return;
4462
4463 if (pty.pty < 0)
4464 return;
4465
4342 if (v_buflen == 0) 4466 if (v_buflen == 0)
4343 { 4467 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4468 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4345 4469
4346 if ((unsigned int)written == len) 4470 if ((unsigned int)written == len)
… …
4348 4472
4349 data += written; 4473 data += written;
4350 len -= written; 4474 len -= written;
4351 } 4475 }
4352 4476
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4477 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 4478
4355 memcpy (v_buffer + v_buflen, data, len); 4479 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 4480 v_buflen += len;
4357 4481
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 4482 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4377 } 4501 }
4378 4502
4379 memmove (v_buffer, v_buffer + written, v_buflen); 4503 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 4504 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4505 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 // original code just ignores this... 4506 pty_ev.set (EVENT_READ);
4383 destroy ();
4384} 4507}
4385 4508
4386/*----------------------- end-of-file (C source) -----------------------*/ 4509/*----------------------- end-of-file (C source) -----------------------*/
4387 4510

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines