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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.295 by root, Tue Jan 31 00:25:16 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"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
147 150
148 text_t t = l.t[x]; 151 text_t t = l.t[x];
149 152
150 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
151 { 154 {
152 iso14755_51 (l.t[x], l.r[x]); 155 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
154 break; 157 break;
155 } 158 }
156 159
157 x--; 160 x--;
158 } 161 }
159} 162}
160#endif
161 163
162#if ENABLE_OVERLAY
163void 164void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 166{
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
170 171
171 fname = rxvt_utf8towcs (f->name); 172 fname = rxvt_utf8towcs (f->name);
172 173
173#if ENABLE_COMBINING 174# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
175 { 176 {
176 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
179 } 180 }
180 else 181 else
181#endif 182# endif
182 { 183 {
183 ch2 = ch; 184 ch2 = ch;
184 185
185 alloc = 0; 186 alloc = 0;
186 chr = &ch2; 187 chr = &ch2;
… …
189 190
190 char attr[80]; // plenty 191 char attr[80]; // plenty
191 192
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 194 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 195 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 196 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 197 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 198 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 199 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 200 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 203 int width = wcswidth (fname, wcslen (fname));
203 204
204 max_it (width, 8+5); // for char + hey 205 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 206 max_it (width, strlen (attr));
206 207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
207 scr_overlay_new (0, -1, width, len + 2); 214 scr_overlay_new (x, y, width, len + 2);
208 215
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 217
211 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
212 { 219 {
… …
215 ch = *chr++; 222 ch = *chr++;
216 223
217 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
220#if !UNICODE3 227# if !UNICODE3
221 if (ch >= 0x10000) 228 if (ch >= 0x10000)
222 ch = 0xfffd; 229 ch = 0xfffd;
223#endif 230# endif
224 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
225 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
226 } 235 }
227 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
228 scr_overlay_set (0, len , attr); 242 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 243 scr_overlay_set (0, len + 1, fname);
230 244
231 free (fname); 245 free (fname);
232 246
233#if ENABLE_COMBINING 247# if ENABLE_COMBINING
234 if (alloc) 248 if (alloc)
235 delete [] alloc; 249 delete [] alloc;
236#endif 250# endif
237} 251}
238#endif 252#endif
239 253
240void 254void
241rxvt_term::commit_iso14755 () 255rxvt_term::commit_iso14755 ()
… …
258 mb[0] = ch[0]; 272 mb[0] = ch[0];
259 len = 1; 273 len = 1;
260 } 274 }
261 275
262 if (len > 0) 276 if (len > 0)
263 tt_write ((unsigned char *)mb, len); 277 tt_write (mb, len);
264 else 278 else
265 scr_bell (); 279 scr_bell ();
266 } 280 }
267 281
268 iso14755buf = 0; 282 iso14755buf = 0;
… …
292rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
293{ 307{
294 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
295 unsigned int newlen; 309 unsigned int newlen;
296 KeySym keysym; 310 KeySym keysym;
297#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */
299#endif
300 int valid_keysym; 311 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
302 313
303 /* 314 /*
304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
305 * escape sequence to toggle the Keypad. 316 * escape sequence to toggle the Keypad.
306 * 317 *
… …
324 Status status_return; 335 Status status_return;
325 336
326#if 0 337#if 0
327#ifdef X_HAVE_UTF8_STRING 338#ifdef X_HAVE_UTF8_STRING
328 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 339 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 340 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 341 KBUFSZ, &keysym, &status_return);
331 else 342 else
332#endif 343#endif
333#endif 344#endif
334 { 345 {
… …
371 || status_return == XLookupBoth; 382 || status_return == XLookupBoth;
372 } 383 }
373 else 384 else
374#endif 385#endif
375 { 386 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 387 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 388 valid_keysym = keysym != NoSymbol;
378 } 389 }
379 390
380 if (valid_keysym) 391 if (valid_keysym)
381 { 392 {
… …
433 scr_move_to (0, 1); 444 scr_move_to (0, 1);
434 return; 445 return;
435 } 446 }
436 else if (keysym == XK_End) 447 else if (keysym == XK_End)
437 { 448 {
438 scr_move_to (1, 0); 449 scr_move_to (1, 1);
439 return; 450 return;
440 } 451 }
441 } 452 }
442#endif 453#endif
443 } 454 }
… …
454 { 465 {
455 switch (keysym) 466 switch (keysym)
456 { 467 {
457 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
458 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
459 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
460 return; 471 return;
461#if TODO 472#if TODO
462 /* rxvt extras */ 473 /* rxvt extras */
463 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
464 change_font (FONT_UP); 475 change_font (FONT_UP);
… …
845 { 856 {
846#ifdef META8_OPTION 857#ifdef META8_OPTION
847 /* set 8-bit on */ 858 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
849 { 860 {
850 unsigned char *ch; 861 char *ch;
851 862
852 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 864 *ch |= 0x80;
854 865
855 meta = 0; 866 meta = 0;
… …
857#endif 868#endif
858 /* nil */ ; 869 /* nil */ ;
859 } 870 }
860 } 871 }
861 872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
875
862 if (len <= 0) 876 if (len <= 0)
863 return; /* not mapped */ 877 return; /* not mapped */
864 878
865 if (options & Opt_scrollTtyKeypress) 879 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 880 if (view_start)
867 { 881 {
868 view_start = 0; 882 view_start = 0;
869 want_refresh = 1; 883 want_refresh = 1;
870 } 884 }
… …
888#ifdef META8_OPTION 902#ifdef META8_OPTION
889 && meta_char == C0_ESC 903 && meta_char == C0_ESC
890#endif 904#endif
891 ) 905 )
892 { 906 {
893 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
894 tt_write (&ch, 1); 908 tt_write (&ch, 1);
895 } 909 }
896 910
897#if defined(DEBUG_CMD)
898 /* Display keyboard buffer contents */
899 unsigned char *p;
900 int i;
901
902 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
903 for (i = 0, p = kbuf; i < len; i++, p++)
904 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
905 fprintf (stderr, "'\n");
906#endif /* DEBUG_CMD */
907 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
908} 912}
909/*}}} */ 913/*}}} */
910 914
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */
914unsigned int 916unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 918{
917 unsigned int n, s; 919 unsigned int n, s;
918 920
919 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
957 } 959 }
958#endif 960#endif
959 961
960 if (want_refresh) 962 if (want_refresh)
961 { 963 {
964 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
965 {
966 int row = view_start;
967 int end_row = row + nrow;
968
969 while (row > top_row && ROW (row - 1).is_longer ())
970 --row;
971
972 do
973 {
974 int start_row = row;
975 line_t *l;
976
977 do
978 {
979 l = &ROW (row++);
980
981 if (!(l->f & LINE_FILTERED))
982 {
983 // line not filtered, mark it as filtered
984 l->f |= LINE_FILTERED;
985 while (l->is_longer ())
986 {
987 l = &ROW (row++);
988 l->f |= LINE_FILTERED;
989 }
990
991 // and filter it
992 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
993
994 break;
995 }
996 }
997 while (l->is_longer () && row < end_row);
998 }
999 while (row < end_row);
1000 }
1001
962 scr_refresh (refresh_type); 1002 scr_refresh ();
963 scrollbar_show (1); 1003 scrollbar_show (1);
964#ifdef USE_XIM 1004#ifdef USE_XIM
965 IMSendSpot (); 1005 IMSendSpot ();
966#endif 1006#endif
967 } 1007 }
… …
970} 1010}
971 1011
972void 1012void
973rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
974{ 1014{
975 SET_R (this); 1015 make_current ();
976 SET_LOCALE (locale);
977 1016
978 display->flush (); 1017 display->flush ();
979 1018
980 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 1021}
983 1022
984void 1023void
985rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
986{ 1025{
987 SET_R (this); 1026 make_current ();
988 SET_LOCALE (locale);
989 1027
990 refresh_limit = 1; 1028 refresh_limit = 1;
991 refresh_count = 0; 1029 refresh_count = 0;
992 flush (); 1030 flush ();
993} 1031}
… …
997rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
998{ 1036{
999 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
1000 want_refresh = 1; 1038 want_refresh = 1;
1001 1039
1002 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1003} 1041}
1004#endif 1042#endif
1005 1043
1006#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1007void 1045void
… …
1021rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
1022{ 1060{
1023 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1024 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
1025 { 1063 {
1026 refresh_type |= SMOOTH_REFRESH;
1027 want_refresh = 1; 1064 want_refresh = 1;
1028 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1029 } 1066 }
1030} 1067}
1031#endif 1068#endif
… …
1035rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1036{ 1073{
1037 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1038 { 1075 {
1039 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1040 refresh_type |= SMOOTH_REFRESH;
1041 want_refresh = 1; 1077 want_refresh = 1;
1042 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1043 } 1079 }
1044} 1080}
1045#endif 1081#endif
… …
1050{ 1086{
1051 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1053 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1054 { 1090 {
1055 if (view_start == nsaved || 1091 if (view_start == top_row || view_start == 0)
1056 view_start == 0)
1057 mouse_slip_wheel_speed = 0; 1092 mouse_slip_wheel_speed = 0;
1058 1093
1059 refresh_type |= SMOOTH_REFRESH;
1060 want_refresh = 1; 1094 want_refresh = 1;
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1096 }
1063} 1097}
1064#endif 1098#endif
1065 1099
1100#if HAVE_SCHED_YIELD
1101static struct event_handler
1102{
1103 check_watcher cw_yield;
1104
1105 void yield (check_watcher &w)
1106 {
1107 sched_yield ();
1108 w.stop ();
1109 }
1110
1111 event_handler ()
1112 : cw_yield (this, &event_handler::yield)
1113 {
1114 }
1115} event_handler;
1116#endif
1117
1066bool 1118bool
1067rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
1068{ 1120{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1122
1071 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
1072 { 1124 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1125 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1126 n = 0;
1075 } 1127 }
1076 1128
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1080 1132
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1082 1134
1083 if (n > 0) 1135 if (r > 0)
1084 { 1136 {
1085 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
1086 return true; 1138 return true;
1087 } 1139 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 {
1142#if HAVE_SCHED_YIELD
1143 if (display->is_local)
1144 event_handler.cw_yield.start ();
1145#endif
1146 }
1147 else
1089 { 1148 {
1090 pty_ev.stop (); 1149 pty_ev.stop ();
1091 1150
1092 if (!(options & Opt_hold)) 1151 if (!OPTION (Opt_hold))
1093 destroy (); 1152 destroy ();
1094 } 1153 }
1095 1154
1096 return false; 1155 return false;
1097} 1156}
1098 1157
1099void 1158void
1100rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1101{ 1160{
1102 SET_R (this); 1161 make_current ();
1103 SET_LOCALE (locale);
1104 1162
1105 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1106 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1107 while (pty_fill ()) 1165 while (pty_fill ())
1108 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1113} 1171}
1114 1172
1115void 1173void
1116rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1117{ 1175{
1118 XDefineCursor (display->display, vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1119 recolour_cursor (); 1177 recolour_cursor ();
1120 1178
1121#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1180 hidden_pointer = 0;
1123 1181
1124 if (options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1184#endif
1127} 1185}
1128 1186
1129#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1130void 1188void
1131rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1132{ 1190{
1133 if (! (options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1134 return; 1192 return;
1135 1193
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1137 XFlush (display->display); 1195 XFlush (xdisp);
1138 1196
1139 hidden_pointer = 1; 1197 hidden_pointer = 1;
1140} 1198}
1141 1199
1142void 1200void
1143rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1144{ 1202{
1145 SET_R (this); 1203 make_current ();
1146 SET_LOCALE (locale);
1147 1204
1148 pointer_blank (); 1205 pointer_blank ();
1149} 1206}
1150#endif 1207#endif
1151 1208
… …
1216 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1217 (32 + x + 1), 1274 (32 + x + 1),
1218 (32 + y + 1)); 1275 (32 + y + 1));
1219} 1276}
1220 1277
1221#ifdef USING_W11LIB
1222void
1223rxvt_W11_process_x_event (XEvent *ev)
1224{
1225 rxvt_t *r = rxvt_get_r ();
1226
1227 x_cb (*ev);
1228}
1229#endif
1230
1231/*{{{ process an X event */ 1278/*{{{ process an X event */
1232void 1279void
1233rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1234{ 1281{
1235 dDisp; 1282 make_current ();
1236 1283
1237 SET_R (this); 1284 dLocal (Display *, xdisp);
1238 SET_LOCALE (locale);
1239 1285
1240#if defined(CURSOR_BLINK) 1286 if (ev.xany.window == vt
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1242 { 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1243 if (hidden_cursor) 1289 return;
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248 1290
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 // for XQueryPointer
1250 }
1251#endif
1252
1253#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1255 {
1256 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease)
1259 if (hidden_pointer)
1260 pointer_unblank ();
1261
1262 if (ev.type == KeyPress && hidden_pointer == 0)
1263 pointer_blank ();
1264 }
1265#endif
1266
1267 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1294 unsigned int unused_mask;
1270 1295
1271 switch (ev.type) 1296 switch (ev.type)
… …
1278 1303
1279 break; 1304 break;
1280 1305
1281 case KeyRelease: 1306 case KeyRelease:
1282 { 1307 {
1283#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1284 KeySym ks; 1309 KeySym keysym;
1285 1310
1286 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1287#endif 1312#endif
1288 1313
1289#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1290 // ISO 14755 support 1315 // ISO 14755 support
1291 if (iso14755buf) 1316 if (iso14755buf)
… …
1296# endif 1321# endif
1297# if ISO_14755 1322# if ISO_14755
1298 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1299 // first: controls 1324 // first: controls
1300 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1301 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1302 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1303 { 1328 {
1304 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1305 commit_iso14755 (); 1330 commit_iso14755 ();
1306 return; // case-break; 1331 goto skip_switch;
1307 } 1332 }
1308 1333
1309 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1310 if (i[0] == ks) 1335 if (i[0] == keysym)
1311 { 1336 {
1312 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1313 commit_iso14755 (); 1338 commit_iso14755 ();
1314 return; // case-break; 1339 goto skip_switch;
1315 } 1340 }
1316 1341
1317 scr_bell (); 1342 scr_bell ();
1318# endif 1343# endif
1319 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1338 else 1363 else
1339 iso14755buf = 0; 1364 iso14755buf = 0;
1340 } 1365 }
1341#endif 1366#endif
1342 1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1343#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1344 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1345 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1346 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1347 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1348#endif 1377#endif
1349 break; 1378 break;
1350 } 1379 }
1351 1380
… …
1357 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1358 break; 1387 break;
1359 1388
1360 case ClientMessage: 1389 case ClientMessage:
1361 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1363 { 1392 {
1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1394 {
1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1396 {
1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1398 {
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1365 destroy (); 1400 destroy ();
1401 }
1366#if ENABLE_EWMH 1402#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask, 1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev); 1406 &ev);
1407#endif
1408 }
1409 }
1410#if ENABLE_XEMBED
1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1412 {
1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1414 focus_in ();
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out ();
1417 }
1371#endif 1418#endif
1372 } 1419 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1382#ifdef OFFIX_DND
1383 /* OffiX Dnd (drag 'n' drop) protocol */
1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1385 && (ev.xclient.data.l[0] == DndFile
1386 || ev.xclient.data.l[0] == DndDir
1387 || ev.xclient.data.l[0] == DndLink))
1388 {
1389 /* Get Dnd data */
1390 Atom ActualType;
1391 int ActualFormat;
1392 unsigned char *data;
1393 unsigned long Size, RemainingBytes;
1394
1395 XGetWindowProperty (disp, display->root,
1396 xa[XA_DNDSELECTION],
1397 0L, 1000000L,
1398 False, AnyPropertyType,
1399 &ActualType, &ActualFormat,
1400 &Size, &RemainingBytes,
1401 &data);
1402 set_string_property (XA_CUT_BUFFER0, data);
1403 XFree (data);
1404 selection_paste (display->root, XA_CUT_BUFFER0, true);
1405 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1406 }
1407#endif /* OFFIX_DND */
1408 break; 1420 break;
1409 1421
1410 case MappingNotify: 1422 case MappingNotify:
1411 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1412 break; 1424 break;
… …
1445 break; 1457 break;
1446 1458
1447 case ConfigureNotify: 1459 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1449 { 1461 {
1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1463 ;
1452 1464
1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1454 { 1466 {
1455 seen_resize = 1; 1467 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1469 }
1458 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1475 check_our_parents ();
1462#endif 1476#endif
1463 } 1477 }
1464 break; 1478 break;
1465 1479
1466 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1485
1471 break; 1486 break;
1472 1487
1473 case SelectionClear: 1488 case SelectionClear:
1474 selection_clear (); 1489 selection_clear ();
… …
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break; 1495 break;
1481 1496
1482 case SelectionRequest: 1497 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1499 break;
1500
1501 case MapNotify:
1502 mapped = 1;
1503#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1505#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1507 break;
1485 1508
1486 case UnmapNotify: 1509 case UnmapNotify:
1487 mapped = 0; 1510 mapped = 0;
1488#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1490#endif 1513#endif
1491 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492
1493 case MapNotify:
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1497#endif
1498 break; 1515 break;
1499 1516
1500#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1501 case ReparentNotify: 1518 case ReparentNotify:
1502 rootwin_cb (ev); 1519 rootwin_cb (ev);
… …
1508 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1509 { 1526 {
1510 do 1527 do
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1514 1531
1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1516 1533
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1520 1537
1521 scr_refresh (refresh_type); 1538 want_refresh = 1;
1522 } 1539 }
1523 else 1540 else
1524 { 1541 {
1525 XEvent unused_event; 1542 XEvent unused_event;
1526 1543
1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1528 ; 1545 ;
1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1530 ; 1547 ;
1531 1548
1532 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1533 { 1550 {
1534 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1535 scrollbar_show (0); 1552 scrollbar_show (0);
1536 } 1553 }
1537#ifdef MENUBAR
1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1539 menubar_expose ();
1540#endif
1541 1554
1542#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1543 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1544 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1545#endif 1558#endif
1546 } 1559 }
1547 break; 1560 break;
1548 1561
1549 case MotionNotify: 1562 case MotionNotify:
1550#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1564 if (hidden_pointer)
1552 pointer_unblank (); 1565 pointer_unblank ();
1553#endif 1566#endif
1554#if MENUBAR
1555 if (isMenuBarWindow (ev.xany.window))
1556 {
1557 menubar_control (ev.xbutton);
1558 break;
1559 }
1560#endif
1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1568 break;
1563 1569
1564 if (ev.xany.window == vt) 1570 if (ev.xany.window == vt)
1565 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1576 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1569 ; 1578 ;
1570 1579
1571 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1572 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1574 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1575 &ev.xbutton.state); 1584 &ev.xbutton.state);
1576#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1640#endif 1649#endif
1641 } 1650 }
1642 } 1651 }
1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1644 { 1653 {
1645 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1646 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1647 ; 1656 ;
1648 1657
1649 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1650 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1651 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1652 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1653 &unused_mask); 1662 &unused_mask);
1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1655 scrollbar_size ()); 1664 scrollbar_size ());
1656 scr_refresh (refresh_type); 1665 want_refresh = 1;
1657 refresh_limit = 0; 1666 refresh_limit = 0;
1658 scrollbar_show (1); 1667 scrollbar_show (1);
1659 } 1668 }
1660 break; 1669 break;
1661 } 1670 }
1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1662} 1700}
1663 1701
1664void 1702void
1665rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1666{ 1704{
1667 if (!focus) 1705 if (!focus)
1668 { 1706 {
1669 focus = 1; 1707 focus = 1;
1670 want_refresh = 1; 1708
1709 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1710
1671#if USE_XIM 1711#if USE_XIM
1672 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1673 { 1713 {
1674 IMSetStatusPosition (); 1714 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1676 } 1716 }
1677#endif 1717#endif
1678#if CURSOR_BLINK 1718#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1719 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1720 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1681#endif 1721#endif
1682#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1684 { 1724 {
1685 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1726 want_refresh = 1;
1686 scr_recolour (); 1727 scr_recolour ();
1687 } 1728 }
1688#endif 1729#endif
1689 } 1730 }
1690} 1731}
… …
1693rxvt_term::focus_out () 1734rxvt_term::focus_out ()
1694{ 1735{
1695 if (focus) 1736 if (focus)
1696 { 1737 {
1697 focus = 0; 1738 focus = 0;
1698 want_refresh = 1; 1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1699 1741
1700#if ENABLE_FRILLS || ISO_14755 1742#if ENABLE_FRILLS || ISO_14755
1743 if (iso14755buf)
1744 {
1701 iso14755buf = 0; 1745 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1746# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1747 scr_overlay_off ();
1748# endif
1749 }
1705#endif 1750#endif
1706#if USE_XIM 1751#if USE_XIM
1707 if (Input_Context != NULL) 1752 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1753 XUnsetICFocus (Input_Context);
1709#endif 1754#endif
1710#if CURSOR_BLINK 1755#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1756 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1757 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1758 hidden_cursor = 0;
1714#endif 1759#endif
1715#if OFF_FOCUS_FADING 1760#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1761 if (rs[Rs_fade])
1717 { 1762 {
1718 pix_colors = pix_colors_unfocused; 1763 pix_colors = pix_colors_unfocused;
1764 want_refresh = 1;
1719 scr_recolour (); 1765 scr_recolour ();
1720 } 1766 }
1721#endif 1767#endif
1722 } 1768 }
1723} 1769}
1724 1770
1725#if TRANSPARENT 1771#if TRANSPARENT
1726void 1772void
1727rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1728{ 1774{
1729 SET_R (this); 1775 make_current ();
1730 SET_LOCALE (locale);
1731 1776
1732 switch (ev.type) 1777 switch (ev.type)
1733 { 1778 {
1734 case PropertyNotify: 1779 case PropertyNotify:
1735 /* 1780 /*
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1786 return;
1742 1787
1743 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1744 case ReparentNotify: 1789 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1747 break; 1792 break;
1748 } 1793 }
1749} 1794}
1750#endif 1795#endif
… …
1753rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1754{ 1799{
1755 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1756 1801
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1758 if (!bypass_keystate) 1804 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1806
1761 /* 1807 /*
1762 * VT window processing of button press 1808 * VT window processing of button press
1763 */ 1809 */
1764 if (ev.window == vt) 1810 if (ev.window == vt)
1765 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1766#if ISO_14755 1815#if ISO_14755
1767 // 5.4 1816 // 5.4
1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1769 { 1818 {
1770 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1784 { 1833 {
1785 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1786 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1787 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1788 { 1838 {
1789 /* only report double clicks */ 1839 /* only report double clicks */
1790 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1791 mouse_report (ev); 1841 mouse_report (ev);
… …
1823#else 1873#else
1824 selection.rect = false; 1874 selection.rect = false;
1825#endif 1875#endif
1826 1876
1827 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1829 { 1879 {
1830 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1832 else 1882 else
1833 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1998 } 2048 }
1999 2049
2000 break; 2050 break;
2001 } 2051 }
2002 } 2052 }
2053
2003 return; 2054 return;
2004 } 2055 }
2005#if MENUBAR
2006 /*
2007 * Menubar window processing of button press
2008 */
2009 if (isMenuBarWindow (ev.window))
2010 menubar_control (ev);
2011#endif
2012} 2056}
2013 2057
2014void 2058void
2015rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
2016{ 2060{
… …
2022 2066
2023 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
2024 { 2068 {
2025 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2026 scrollbar_show (0); 2070 scrollbar_show (0);
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 refresh_type &= ~SMOOTH_REFRESH;
2029#endif
2030 } 2071 }
2031 2072
2032#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2033 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2034 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2035#endif 2076#endif
2036 2077
2037 if (ev.window == vt) 2078 if (ev.window == vt)
2038 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2039#if ISO_14755 2083#if ISO_14755
2040 // 5.4 2084 // 5.4
2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2042 return; 2086 return;
2043#endif 2087#endif
2088
2044 if (reportmode) 2089 if (reportmode)
2045 { 2090 {
2046 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2047 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2048 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2078 { 2123 {
2079 case Button1: 2124 case Button1:
2080 case Button3: 2125 case Button3:
2081 selection_make (ev.time); 2126 selection_make (ev.time);
2082 break; 2127 break;
2128
2083 case Button2: 2129 case Button2:
2084 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2085 break; 2132 break;
2133
2086#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2087 case Button4: 2135 case Button4:
2088 case Button5: 2136 case Button5:
2089 { 2137 {
2090 int i; 2138 int i;
… …
2092 2140
2093 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2094 2142
2095 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2096 i = 1; 2144 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2146 i = nrow - 1;
2099 else 2147 else
2100 i = 5; 2148 i = 5;
2101 2149
2102# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2112 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2113 } 2161 }
2114 else 2162 else
2115 { 2163 {
2116# endif 2164# endif
2117# ifdef JUMP_MOUSE_WHEEL
2118 scr_page (v, i); 2165 scr_page (v, i);
2119 scr_refresh (SMOOTH_REFRESH);
2120 scrollbar_show (1); 2166 scrollbar_show (1);
2121# else
2122 while (i--)
2123 {
2124 scr_page (v, 1);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1);
2127 }
2128# endif
2129# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2130 } 2168 }
2131#endif 2169# endif
2132 } 2170 }
2133 break; 2171 break;
2134#endif 2172#endif
2135 } 2173 }
2136 } 2174 }
2137#ifdef MENUBAR
2138 else if (isMenuBarWindow (ev.window))
2139 menubar_control (ev);
2140#endif
2141} 2175}
2142 2176
2143#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2144#if TINTING 2178#if TINTING
2145/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2146 2180
2147typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2148 2182
2149void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2150{ 2184{
2151 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2152 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2153 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2154 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2155 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2156 int i; 2190 int i;
2157 2191
2158 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2159 2193
2160 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2161 2195
2162 /* for convenience */ 2196 /* for convenience */
2163 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2384 Atom atype; 2418 Atom atype;
2385 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2386 Window root, oldp, *list; 2420 Window root, oldp, *list;
2387 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2388 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2389 dDisp;
2390 2423
2391 pchanged = 0; 2424 pchanged = 0;
2392 2425
2393 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2395 2428
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2398 2431
2399 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2400 2433
2401 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2402 { 2435 {
2403 if (am_transparent) 2436 if (am_transparent)
2404 { 2437 {
2405 pchanged = 1; 2438 pchanged = 1;
2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2407 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2408 } 2441 }
2409 2442
2410 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2411 } 2444 }
2412 2445
2413 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2414 XSync (disp, False); 2447 XSync (xdisp, False);
2415 2448
2416 /* 2449 /*
2417 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2418 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2419 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2420 */ 2453 */
2421 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2422 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2423 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2424 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2425 2458
2426 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2427 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2431 2464
2432 if (!i || prop == NULL 2465 if (!i || prop == NULL
2433#if TINTING 2466#if TINTING
… …
2452 Window cr; 2485 Window cr;
2453 XImage *image; 2486 XImage *image;
2454 GC gc; 2487 GC gc;
2455 XGCValues gcvalue; 2488 XGCValues gcvalue;
2456 2489
2457 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2458 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2459 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2460 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2461 nx = ny = 0; 2494 nx = ny = 0;
2462 2495
… …
2475 } 2508 }
2476 2509
2477 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2478 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2479 2512
2480 XSync (disp, False); 2513 XSync (xdisp, False);
2481 allowedxerror = -1; 2514 allowedxerror = -1;
2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2483 2516
2484 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2485 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2486 allowedxerror = 0; 2519 allowedxerror = 0;
2487 2520
… …
2490 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2491 { 2524 {
2492 pchanged = 1; 2525 pchanged = 1;
2493 if (pixmap != None) 2526 if (pixmap != None)
2494 { 2527 {
2495 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2496 pixmap = None; 2529 pixmap = None;
2497 } 2530 }
2498 } 2531 }
2499 2532
2500 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2501 } 2534 }
2502 else 2535 else
2503 { 2536 {
2504 if (pixmap != None) 2537 if (pixmap != None)
2505 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2506 2539
2507#if TINTING 2540#if TINTING
2508 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2509 { 2542 {
2510 unsigned short rm, gm, bm;
2511 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2512 2544
2545 rxvt_rgba c;
2513 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2514 2547
2515 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2516 } 2549 }
2517#endif 2550#endif
2518 2551
2519 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2520 szHint.width, szHint.height, image->depth);
2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2522 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2523 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2524 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2525 XDestroyImage (image); 2557 XDestroyImage (image);
2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2527 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2528 2560
2529 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2530 pchanged = 1; 2562 pchanged = 1;
2531 2563
2532 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2533 } 2565 }
2534 } 2566 }
2535 2567
2536 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2538 else 2570 else
2539 { 2571 {
2540 unsigned int n; 2572 unsigned int n;
2541 /* 2573 /*
2542 * InheritPixmap transparency 2574 * InheritPixmap transparency
2543 */ 2575 */
2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2545 { 2577 {
2546 oldp = parent[i]; 2578 oldp = parent[i];
2547 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2548 &parent[i], &list, &n); 2580 &parent[i], &list, &n);
2549 XFree (list); 2581 XFree (list);
2550 2582
2551 if (parent[i] == display->root) 2583 if (parent[i] == display->root)
2552 { 2584 {
… …
2564 2596
2565 if (pchanged) 2597 if (pchanged)
2566 { 2598 {
2567 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2568 { 2600 {
2569 XGetWindowAttributes (disp, parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2571 { 2603 {
2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2573 break; 2605 break;
2574 } 2606 }
2575 } 2607 }
2576 } 2608 }
2577 2609
2578 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2579 { 2611 {
2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2582 am_transparent = 0; 2614 am_transparent = 0;
2583 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2584 } 2616 }
2585 else 2617 else
2586 { 2618 {
2587#if WAIT_FOR_WM
2588 /* wait (an arbitrary period) for the WM to do its thing
2589 * needed for fvwm2.2.2 (and before?) */
2590 sleep (1);
2591#endif
2592 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2593 { 2620 {
2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2595 XClearWindow (disp, parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2596 } 2623 }
2597 2624
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2599 am_transparent = 1; 2626 am_transparent = 1;
2600 } 2627 }
2601 2628
2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2603 parent[i] = None; 2630 parent[i] = None;
2604 } 2631 }
2605 2632
2606 if (scrollBar.win) 2633 if (scrollBar.win)
2607 { 2634 {
2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2609 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2610 scrollbar_show (0); 2637 scrollbar_show (0);
2611 } 2638 }
2612 2639
2613 if (am_transparent) 2640 if (am_transparent)
… …
2625 2652
2626bool 2653bool
2627rxvt_term::cmd_parse () 2654rxvt_term::cmd_parse ()
2628{ 2655{
2629 bool flag = false; 2656 bool flag = false;
2630 unicode_t ch = NOCHAR; 2657 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2658 char *seq_begin; // remember start of esc-sequence here
2632 2659
2633 for (;;) 2660 for (;;)
2634 { 2661 {
2635 if (ch == NOCHAR) 2662 if (ch == NOCHAR)
2636 { 2663 {
2637 seq_begin = cmdbuf_ptr; 2664 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2665 ch = next_char ();
2639 }
2640 2666
2641 if (ch == NOCHAR) // TODO: improve 2667 if (ch == NOCHAR)
2642 break; 2668 break;
2669 }
2643 2670
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2671 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2672 {
2646 if (!seen_input) 2673 if (!seen_input)
2647 { 2674 {
… …
2656 if (seen_resize && cmd_pid) 2683 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2684 kill (-cmd_pid, SIGWINCH);
2658 } 2685 }
2659 2686
2660 /* Read a text string from the input buffer */ 2687 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2688 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2689 bool refreshnow = false;
2663 int nlines = 0; 2690 int nlines = 0;
2664 unicode_t *str = buf; 2691 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2692 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2693
2667 for (;;) 2694 for (;;)
2668 { 2695 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2696 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2697 break;
… …
2676 if (ch == C0_LF) 2703 if (ch == C0_LF)
2677 nlines++; 2704 nlines++;
2678 2705
2679 refresh_count++; 2706 refresh_count++;
2680 2707
2681 if (!(options & Opt_jumpScroll) 2708 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2710 {
2684 refreshnow = true; 2711 refreshnow = true;
2712 refresh_count = 0;
2685 ch = NOCHAR; 2713 ch = NOCHAR;
2686 break; 2714 break;
2687 } 2715 }
2688 2716
2689 // scr_add_lines only works for nlines <= nrow - 1. 2717 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2718 if (nlines >= nrow - 1)
2691 { 2719 {
2720 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2721 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2692 scr_add_lines (buf, nlines, str - buf); 2722 scr_add_lines (buf, str - buf, nlines);
2723
2693 nlines = 0; 2724 nlines = 0;
2694 str = buf; 2725 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2726 eol = str + min (ncol, UBUFSIZ);
2696 } 2727 }
2697 2728
… …
2710 2741
2711 seq_begin = cmdbuf_ptr; 2742 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2743 ch = next_char ();
2713 } 2744 }
2714 2745
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2716 2749
2717 /* 2750 /*
2718 * If there have been a lot of new lines, then update the screen 2751 * If there have been a lot of new lines, then update the screen
2719 * What the heck I'll cheat and only refresh less than every page-full. 2752 * What the heck I'll cheat and only refresh less than every page-full.
2720 * the number of pages between refreshes is refresh_limit, which 2753 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2754 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2755 */
2723 if (refreshnow) 2756 if (refreshnow)
2724 { 2757 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2759 refresh_limit++;
2727 else 2760 else
2728 { 2761 {
2729 flag = true; 2762 flag = true;
2730 scr_refresh (refresh_type); 2763 scr_refresh ();
2764 want_refresh = 1;
2731 } 2765 }
2732 } 2766 }
2733 2767
2734 } 2768 }
2735 else 2769 else
… …
2750 } 2784 }
2751 2785
2752 return flag; 2786 return flag;
2753} 2787}
2754 2788
2755// read the next octet
2756unicode_t
2757rxvt_term::next_octet ()
2758{
2759 return cmdbuf_ptr < cmdbuf_endp
2760 ? *cmdbuf_ptr++
2761 : NOCHAR;
2762}
2763
2764// read the next character 2789// read the next character
2765unicode_t 2790wchar_t
2766rxvt_term::next_char () 2791rxvt_term::next_char () NOTHROW
2767{ 2792{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2793 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2794 {
2770 // assume 7-bit to be ascii ALWAYS 2795 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2797 return *cmdbuf_ptr++;
2773 2798
2774 wchar_t wc; 2799 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2800 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2801
2777 if (len == (size_t)-2) 2802 if (len == (size_t)-2)
2778 { 2803 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2804 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2805 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2806 break;
2782 } 2807 }
2783 2808
2784 if (len == (size_t)-1) 2809 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2810 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2811
2787 // assume wchar == unicode 2812 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2813 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2814 return wc & UNICODE_MASK;
2790 } 2815 }
2791 2816
2792 return NOCHAR; 2817 return NOCHAR;
2793} 2818}
2819
2820// read the next octet
2821uint32_t
2822rxvt_term::next_octet () NOTHROW
2823{
2824 return cmdbuf_ptr < cmdbuf_endp
2825 ? (unsigned char)*cmdbuf_ptr++
2826 : NOCHAR;
2827}
2828
2829static class out_of_input out_of_input;
2794 2830
2795/* rxvt_cmd_getc () - Return next input character */ 2831/* rxvt_cmd_getc () - Return next input character */
2796/* 2832/*
2797 * Return the next input character after first passing any keyboard input 2833 * Return the next input character after first passing any keyboard input
2798 * to the command. 2834 * to the command.
2799 */ 2835 */
2800unicode_t 2836wchar_t
2801rxvt_term::cmd_getc () 2837rxvt_term::cmd_getc () THROW ((class out_of_input))
2802{ 2838{
2803 unicode_t c = next_char (); 2839 wchar_t c = next_char ();
2804 2840
2805 if (c == NOCHAR) 2841 if (c == NOCHAR)
2806 throw out_of_input; 2842 throw out_of_input;
2807 2843
2808 return c; 2844 return c;
2809} 2845}
2810 2846
2811unicode_t 2847uint32_t
2812rxvt_term::cmd_get8 () 2848rxvt_term::cmd_get8 () THROW ((class out_of_input))
2813{ 2849{
2814 unicode_t c = next_octet (); 2850 uint32_t c = next_octet ();
2815 2851
2816 if (c == NOCHAR) 2852 if (c == NOCHAR)
2817 throw out_of_input; 2853 throw out_of_input;
2818 2854
2819 return c; 2855 return c;
… …
2919 case C0_ESC: 2955 case C0_ESC:
2920 process_escape_seq (); 2956 process_escape_seq ();
2921 break; 2957 break;
2922 case C0_ENQ: /* terminal Status */ 2958 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 2959 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2960 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 2961 else
2927 tt_write ((unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 2963 break;
2930 case C0_BEL: /* bell */ 2964 case C0_BEL: /* bell */
2931 scr_bell (); 2965 scr_bell ();
2932 break; 2966 break;
2933 case C0_BS: /* backspace */ 2967 case C0_BS: /* backspace */
… …
3057 scr_charset_set (2, (unsigned int)cmd_getc ()); 3091 scr_charset_set (2, (unsigned int)cmd_getc ());
3058 break; 3092 break;
3059 case '+': 3093 case '+':
3060 scr_charset_set (3, (unsigned int)cmd_getc ()); 3094 scr_charset_set (3, (unsigned int)cmd_getc ());
3061 break; 3095 break;
3062#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3063 case '6': 3097 case '6':
3064 scr_backindex (); 3098 scr_backindex ();
3065 break; 3099 break;
3066#endif 3100#endif
3067 case '7': 3101 case '7':
3068 scr_cursor (SAVE); 3102 scr_cursor (SAVE);
3069 break; 3103 break;
3070 case '8': 3104 case '8':
3071 scr_cursor (RESTORE); 3105 scr_cursor (RESTORE);
3072 break; 3106 break;
3073#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
3074 case '9': 3108 case '9':
3075 scr_forwardindex (); 3109 scr_forwardindex ();
3076 break; 3110 break;
3077#endif 3111#endif
3078 case '=': 3112 case '=':
… …
3088 break; 3122 break;
3089 3123
3090 /* 8.3.87: NEXT LINE */ 3124 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 3125 case C1_NEL: /* ESC E */
3092 { 3126 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 3127 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 3128 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 3129 }
3096 break; 3130 break;
3097 3131
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 3132 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 3133 case C1_ESA: /* ESC G */
… …
3121 process_dcs_seq (); 3155 process_dcs_seq ();
3122 break; 3156 break;
3123 3157
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3159 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3161 break; /* steal obsolete ESC [ c */
3129 3162
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3164 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3165 process_csi_seq ();
… …
3241 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3242 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3243 if (arg[p] == -1) 3276 if (arg[p] == -1)
3244 arg[p] = ndef; 3277 arg[p] = ndef;
3245 3278
3246#ifdef DEBUG_CMD
3247 fprintf (stderr, "CSI ");
3248 for (p = 0; p < nargs; p++)
3249 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3250 fprintf (stderr, "%c\n", ch);
3251#endif
3252
3253 /* 3279 /*
3254 * private mode handling 3280 * private mode handling
3255 */ 3281 */
3256 if (priv) 3282 if (priv)
3257 { 3283 {
3258 switch (priv) 3284 switch (priv)
3259 { 3285 {
3260 case '>': 3286 case '>':
3261 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3263 break; 3298 break;
3264 case '?': 3299 case '?':
3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3266 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3267 break; 3302 break;
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3411 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3412 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3413 break;
3379 3414
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3415 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3416 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3417 break;
3384 3418
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3419 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3420 process_sgr_mode (nargs, arg);
3387 break; 3421 break;
… …
3394 break; 3428 break;
3395 case 6: /* CPR requested */ 3429 case 6: /* CPR requested */
3396 scr_report_position (); 3430 scr_report_position ();
3397 break; 3431 break;
3398 case 7: /* unofficial extension */ 3432 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3433 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3434 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3435 break;
3402 case 8: /* unofficial extension */ 3436 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3438 break;
… …
3471 break; 3505 break;
3472 case CSI_75: 3506 case CSI_75:
3473 scr_cursor (RESTORE); 3507 scr_cursor (RESTORE);
3474 break; 3508 break;
3475 3509
3476#if ENABLE_FRILLS 3510#if !ENABLE_MINIMAL
3477 case CSI_74: 3511 case CSI_74:
3478 process_window_ops (arg, nargs); 3512 process_window_ops (arg, nargs);
3479 break; 3513 break;
3480#endif 3514#endif
3481 3515
… …
3488 break; 3522 break;
3489 } 3523 }
3490} 3524}
3491/*}}} */ 3525/*}}} */
3492 3526
3493#if ENABLE_FRILLS 3527#if !ENABLE_MINIMAL
3494/* ARGSUSED */ 3528/* ARGSUSED */
3495void 3529void
3496rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3497{ 3531{
3498 int x, y; 3532 int x, y;
3499 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3500 Window wdummy; 3534 Window wdummy;
3501 dDisp; 3535
3536 dLocal (Display *, xdisp);
3502 3537
3503 if (nargs == 0) 3538 if (nargs == 0)
3504 return; 3539 return;
3505 3540
3506 switch (args[0]) 3541 switch (args[0])
3507 { 3542 {
3508 /* 3543 /*
3509 * commands 3544 * commands
3510 */ 3545 */
3511 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3512 XMapWindow (disp, parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3513 break; 3548 break;
3514 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3515 XIconifyWindow (disp, parent[0], display->screen); 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3516 break; 3551 break;
3517 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3518 XMoveWindow (disp, parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3519 break; 3554 break;
3520 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3522 break; 3557 break;
3523 case 5: /* raise window */ 3558 case 5: /* raise window */
3524 XRaiseWindow (disp, parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3525 break; 3560 break;
3526 case 6: /* lower window */ 3561 case 6: /* lower window */
3527 XLowerWindow (disp, parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3528 break; 3563 break;
3529 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3530 scr_touch (true); 3565 scr_touch (true);
3531 break; 3566 break;
3532 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
… …
3544 3579
3545 /* 3580 /*
3546 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3547 */ 3582 */
3548 case 11: /* report window state */ 3583 case 11: /* report window state */
3549 XGetWindowAttributes (disp, parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3551 break; 3586 break;
3552 case 13: /* report window position */ 3587 case 13: /* report window position */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3554 XTranslateCoordinates (disp, parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3555 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3556 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3557 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3558 break; 3593 break;
3559 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3560 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3562 break; 3597 break;
3563 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3564 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3565 break; 3600 break;
… …
3567 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3568 break; 3603 break;
3569 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3570 { 3605 {
3571 char *s; 3606 char *s;
3572 XGetIconName (disp, parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3609 XFree (s);
3575 } 3610 }
3576 break; 3611 break;
3577 case 21: /* report window title */ 3612 case 21: /* report window title */
3578 { 3613 {
3579 char *s; 3614 char *s;
3580 XFetchName (disp, parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3617 XFree (s);
3583 } 3618 }
3584 break; 3619 break;
3585 } 3620 }
3586} 3621}
… …
3589/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3590/* 3625/*
3591 * get input up until STRING TERMINATOR (or BEL) 3626 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3627 * ends_how is terminator used. returned input must be free()'d
3593 */ 3628 */
3594unsigned char * 3629char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3630rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3631{
3597 unicode_t ch; 3632 unicode_t ch;
3598 bool seen_esc = false; 3633 bool seen_esc = false;
3599 unsigned int n = 0; 3634 unsigned int n = 0;
… …
3632 3667
3633 string[n++] = '\0'; 3668 string[n++] = '\0';
3634 3669
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3670 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3671
3637 return (unsigned char *)rxvt_wcstombs (string); 3672 return rxvt_wcstombs (string);
3638} 3673}
3639 3674
3640/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
3641/* 3676/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3677 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3678 */
3644void 3679void
3645rxvt_term::process_dcs_seq () 3680rxvt_term::process_dcs_seq ()
3646{ 3681{
3647 unsigned char *s; 3682 char *s;
3648 unicode_t eh; 3683 unicode_t eh;
3649 3684
3650 /* 3685 /*
3651 * Not handled yet 3686 * Not handled yet
3652 */ 3687 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3706 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3707 arg = arg * 10 + (ch - '0');
3673 3708
3674 if (ch == ';') 3709 if (ch == ';')
3675 { 3710 {
3676 unsigned char *s = get_to_st (eh); 3711 char *s = get_to_st (eh);
3677 3712
3678 if (s) 3713 if (s)
3679 { 3714 {
3680 process_xterm_seq (arg, (char *)s, eh); 3715 process_xterm_seq (arg, s, eh);
3681 free (s); 3716 free (s);
3682 } 3717 }
3683 } 3718 }
3684} 3719}
3685 3720
3686void 3721void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3723{
3689 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3690 { 3725 {
3691 unsigned short r, g, b; 3726 rxvt_rgba c;
3692 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3693 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3694 } 3735 }
3695 else 3736 else
3696 set_window_color (color, str); 3737 set_window_color (color, str);
3697} 3738}
3698 3739
3699/* 3740/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3742 */
3702void 3743void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3744rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3745{
3705 int changed = 0;
3706 int color; 3746 int color;
3707 char *buf, *name; 3747 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3709 int saveop = op; 3749 int saveop = op;
3710 dDisp; 3750
3751 dLocal (Display *, xdisp);
3711 3752
3712 assert (str != NULL); 3753 assert (str != NULL);
3713 switch (op) 3754 switch (op)
3714 { 3755 {
3715 case XTerm_name: 3756 case XTerm_name:
… …
3731 unsigned long bytes_after; 3772 unsigned long bytes_after;
3732 unsigned char *value = 0; 3773 unsigned char *value = 0;
3733 const char *str = ""; 3774 const char *str = "";
3734 3775
3735 if (prop 3776 if (prop
3736 && XGetWindowProperty (disp, parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3737 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3738 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3739 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3740 && actual_type != None 3781 && actual_type != None
3741 && actual_format == 8) 3782 && actual_format == 8)
3742 str = (const char *)(value); 3783 str = (const char *)(value);
3743 3784
3744 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3745 3786
3746 XFree (value); 3787 XFree (value);
3747 } 3788 }
3748 else 3789 else
3749 { 3790 {
… …
3753 { 3794 {
3754 *eq = 0; 3795 *eq = 0;
3755 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3756 } 3797 }
3757 else 3798 else
3758 XDeleteProperty (disp, parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3759 display->atom (str)); 3800 display->atom (str));
3760 } 3801 }
3761 break; 3802 break;
3762 3803
3763 case XTerm_Color: 3804 case XTerm_Color:
… …
3765 { 3806 {
3766 if ((name = strchr (buf, ';')) == NULL) 3807 if ((name = strchr (buf, ';')) == NULL)
3767 break; 3808 break;
3768 3809
3769 *name++ = '\0'; 3810 *name++ = '\0';
3770 color = atoi (buf); 3811 color = atoi (buf) + minCOLOR;
3771 3812
3772 if (color < 0 || color >= TOTAL_COLORS) 3813 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3773 break; 3814 break;
3774 3815
3775 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3776 *buf++ = '\0'; 3817 *buf++ = '\0';
3777 3818
3778 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3779 {
3780 unsigned short r, g, b;
3781 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3782 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3783 }
3784 else
3785 set_window_color (color + minCOLOR, name);
3786 } 3820 }
3787 break; 3821 break;
3788 case XTerm_Color00: 3822 case XTerm_Color00:
3789 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3790 break; 3824 break;
3791 case XTerm_Color01: 3825 case XTerm_Color01:
3792 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3793 break; 3827 break;
3794#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3795 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3796 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3797 break; 3831 break;
3798#endif 3832#endif
3799 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3800 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3801 break; 3835 break;
3802 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3803 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3804 break; 3838 break;
3805#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3806 case XTerm_Color_BD:
3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3808 break;
3809 case XTerm_Color_UL:
3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3811 break;
3812 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3842 break;
3843 case Rxvt_Color_BD:
3844 case URxvt_Color_BD:
3845 process_color_seq (op, Color_BD, str, resp);
3846 break;
3847 case Rxvt_Color_UL:
3848 case URxvt_Color_UL:
3849 process_color_seq (op, Color_UL, str, resp);
3814 break; 3850 break;
3815 case URxvt_Color_IT: 3851 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3852 process_color_seq (op, Color_IT, str, resp);
3817 break; 3853 break;
3818#endif 3854#endif
3819#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3820 case URxvt_Color_tint: 3856 case URxvt_Color_tint:
3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3822 check_our_parents (); 3858 check_our_parents ();
3823 if (am_transparent) 3859 if (am_transparent)
3824 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3825 break; 3861 break;
3826#endif 3862#endif
3827 3863
3828 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3829 if (*str != ';') 3866 if (*str != ';')
3830 { 3867 {
3831#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3832 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3833 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3834#endif
3835 scr_touch (true); 3871 scr_touch (true);
3872#endif
3836 } 3873 }
3874
3875 int changed = 0;
3876
3837 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3838 { 3878 {
3839 str++; 3879 str++;
3840#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3841 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3842#endif 3882#endif
3843 } 3883 }
3844 3884
3845 if (changed) 3885 if (changed)
3846 { 3886 {
3847#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3848 resize_pixmap (); 3888 resize_pixmap ();
3849#endif
3850 scr_touch (true); 3889 scr_touch (true);
3890#endif
3851 } 3891 }
3892 }
3852 break; 3893 break;
3853 3894
3854 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3855 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3856 break; 3897 break;
3857 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3858 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3859 break; 3900 break;
3860 3901
3861 case XTerm_logfile: 3902 case XTerm_logfile:
3862 // TODO, when secure mode? 3903 // TODO, when secure mode?
3863 break; 3904 break;
3864 3905
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0 3906#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3907 case Rxvt_dumpscreen: /* no error notices */
3873 { 3908 {
3874 int fd; 3909 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3910 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 { 3911 {
3877 scr_dump (fd); 3912 scr_dump (fd);
… …
3888 case URxvt_italicFont: 3923 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3924 case URxvt_boldItalicFont:
3890#endif 3925#endif
3891 if (query) 3926 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3927 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3929 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3930 resp);
3896 else 3931 else
3897 { 3932 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3933 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3901 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3902 set_fonts (); 3937 set_fonts ();
3903 } 3938 }
3904 break; 3939 break;
3905 3940
3906#if ENABLE_FRILLS 3941 case URxvt_version:
3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3949#if !ENABLE_MINIMAL
3907 case URxvt_locale: 3950 case URxvt_locale:
3908 if (query) 3951 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3953 else
3911 { 3954 {
3912 set_locale (str); 3955 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3957 init_xlocale ();
3915 } 3958 }
3916 break; 3959 break;
3917 3960
3918 case URxvt_view_up: 3961 case URxvt_view_up:
3919 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3920 int lines = atoi (str); 3964 int lines = atoi (str);
3921 3965
3922 if (lines) 3966 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 3968 else
3925 {
3926 scr_erase_savelines (); 3969 scr_erase_savelines ();
3927 } 3970 }
3928 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet
3929 break; 3979 break;
3930#endif 3980#endif
3931 } 3981 }
3932} 3982}
3933/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3964 return state; 4014 return state;
3965} 4015}
3966 4016
3967/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3968void 4018void
3969rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3970{ 4020{
3971 unsigned int i, j; 4021 unsigned int i, j;
3972 int state; 4022 int state;
3973 4023
3974 static const struct 4024 static const struct
… …
3985 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3986 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3987 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
3989 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3990#ifdef menuBar_esc
3991 { menuBar_esc, PrivMode_menuBar },
3992#endif
3993 // 18, 19 printing-related 4040 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
3995#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
3996 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
3997#endif 4044#endif
… …
4042 } 4089 }
4043 4090
4044 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4092 switch (arg[i])
4046 { 4093 {
4094#if ENABLE_STYLES
4095 case 1021:
4096 set_option (Opt_intensityStyles, mode);
4097
4098 scr_touch (true);
4099 break;
4100#endif
4047 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4048 case 1049: 4102 case 1049:
4049 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4104 if (mode == 0)
4051 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
4052 else if (mode == 1) 4106 else if (mode == 1)
4053 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
4054 break; 4108 break;
… …
4069 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4126 break;
4073 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 4128 set_option (Opt_jumpScroll, !state);
4078 break; 4129 break;
4079 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4081 break; 4132 break;
4082 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
… …
4088 /* case 8: - auto repeat, can't do on a per window basis */ 4139 /* case 8: - auto repeat, can't do on a per window basis */
4089 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4090 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4091 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4092 break; 4143 break;
4093#ifdef menuBar_esc
4094 case menuBar_esc:
4095#ifdef MENUBAR
4096 map_menuBar (state);
4097#endif
4098 break;
4099#endif
4100#ifdef scrollBar_esc 4144#ifdef scrollBar_esc
4101 case scrollBar_esc: 4145 case scrollBar_esc:
4102 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4103 { 4147 {
4104 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
… …
4123#if 0 4167#if 0
4124 case 1001: 4168 case 1001:
4125 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4126#endif 4170#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 4172 set_option (Opt_scrollTtyOutput, !state);
4132 break; 4173 break;
4133 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 4175 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 4176 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4178 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4180 scr_erase_screen (2);
4143 scr_change_screen (state); 4181 scr_change_screen (state);
4144 break; 4182 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4183 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4184 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4187 scr_erase_screen (2);
4150 break; 4188 break;
4151 default: 4189 default:
4152 break; 4190 break;
… …
4280 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4281 break; 4319 break;
4282 4320
4283 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4284 4322
4285#ifndef NO_BRIGHTCOLOR 4323#if !ENABLE_MINIMAL
4286 case 90: 4324 case 90:
4287 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4288 case 92: 4326 case 92:
4289 case 93: 4327 case 93:
4290 case 94: 4328 case 94:
… …
4302 case 106: 4340 case 106:
4303 case 107: 4341 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4342 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4343 break;
4306#endif 4344#endif
4307
4308 } 4345 }
4309 } 4346 }
4310} 4347}
4311/*}}} */ 4348/*}}} */
4312 4349
… …
4336 */ 4373 */
4337void 4374void
4338rxvt_term::tt_printf (const char *fmt,...) 4375rxvt_term::tt_printf (const char *fmt,...)
4339{ 4376{
4340 va_list arg_ptr; 4377 va_list arg_ptr;
4341 unsigned char buf[256]; 4378 char buf[256];
4342 4379
4343 va_start (arg_ptr, fmt); 4380 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4381 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4382 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4383 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 4388 * or generated by us in response to a query ESC sequence.
4352 */ 4389 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4391
4355void 4392void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4394{
4395 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4396 return;
4397
4398 if (pty->pty < 0)
4399 return;
4400
4358 if (v_buflen == 0) 4401 if (v_buflen == 0)
4359 { 4402 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4403 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4361 4404
4362 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4363 return; 4406 return;
4364 4407
4365 data += written; 4408 data += written;
4366 len -= written; 4409 len -= written;
4367 } 4410 }
4368 4411
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4413
4371 memcpy (v_buffer + v_buflen, data, len); 4414 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4415 v_buflen += len;
4373 4416
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4375} 4418}
4376 4419
4377void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4378{ 4421{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380 4423
4381 if (written > 0) 4424 if (written > 0)
4382 { 4425 {
4383 v_buflen -= written; 4426 v_buflen -= written;
4384 4427

Diff Legend

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