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.233 by root, Wed Jan 4 01:16:34 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 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.
… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
… …
230# if !UNICODE3 227# if !UNICODE3
231 if (ch >= 0x10000) 228 if (ch >= 0x10000)
232 ch = 0xfffd; 229 ch = 0xfffd;
233# endif 230# endif
234 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
236 } 235 }
237 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// }
238 scr_overlay_set (0, len , attr); 242 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 243 scr_overlay_set (0, len + 1, fname);
240 244
241 free (fname); 245 free (fname);
242 246
… …
268 mb[0] = ch[0]; 272 mb[0] = ch[0];
269 len = 1; 273 len = 1;
270 } 274 }
271 275
272 if (len > 0) 276 if (len > 0)
273 tt_write ((unsigned char *)mb, len); 277 tt_write (mb, len);
274 else 278 else
275 scr_bell (); 279 scr_bell ();
276 } 280 }
277 281
278 iso14755buf = 0; 282 iso14755buf = 0;
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
303{ 307{
304 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
305 unsigned int newlen; 309 unsigned int newlen;
306 KeySym keysym; 310 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 311 int valid_keysym;
311 unsigned char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
312 313
313 /* 314 /*
314 * 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
315 * escape sequence to toggle the Keypad. 316 * escape sequence to toggle the Keypad.
316 * 317 *
… …
334 Status status_return; 335 Status status_return;
335 336
336#if 0 337#if 0
337#ifdef X_HAVE_UTF8_STRING 338#ifdef X_HAVE_UTF8_STRING
338 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
339 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 340 len = Xutf8LookupString (Input_Context, &ev, kbuf,
340 KBUFSZ, &keysym, &status_return); 341 KBUFSZ, &keysym, &status_return);
341 else 342 else
342#endif 343#endif
343#endif 344#endif
344 { 345 {
… …
381 || status_return == XLookupBoth; 382 || status_return == XLookupBoth;
382 } 383 }
383 else 384 else
384#endif 385#endif
385 { 386 {
386 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 387 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 388 valid_keysym = keysym != NoSymbol;
388 } 389 }
389 390
390 if (valid_keysym) 391 if (valid_keysym)
391 { 392 {
… …
443 scr_move_to (0, 1); 444 scr_move_to (0, 1);
444 return; 445 return;
445 } 446 }
446 else if (keysym == XK_End) 447 else if (keysym == XK_End)
447 { 448 {
448 scr_move_to (1, 0); 449 scr_move_to (1, 1);
449 return; 450 return;
450 } 451 }
451 } 452 }
452#endif 453#endif
453 } 454 }
… …
464 { 465 {
465 switch (keysym) 466 switch (keysym)
466 { 467 {
467 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
470 return; 471 return;
471#if TODO 472#if TODO
472 /* rxvt extras */ 473 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 475 change_font (FONT_UP);
… …
855 { 856 {
856#ifdef META8_OPTION 857#ifdef META8_OPTION
857 /* set 8-bit on */ 858 /* set 8-bit on */
858 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
859 { 860 {
860 unsigned char *ch; 861 char *ch;
861 862
862 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
863 *ch |= 0x80; 864 *ch |= 0x80;
864 865
865 meta = 0; 866 meta = 0;
866 } 867 }
867#endif 868#endif
868 /* nil */ ; 869 /* nil */ ;
869 } 870 }
870 } 871 }
872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
871 875
872 if (len <= 0) 876 if (len <= 0)
873 return; /* not mapped */ 877 return; /* not mapped */
874 878
875 if (OPTION (Opt_scrollTtyKeypress)) 879 if (OPTION (Opt_scrollTtyKeypress))
… …
898#ifdef META8_OPTION 902#ifdef META8_OPTION
899 && meta_char == C0_ESC 903 && meta_char == C0_ESC
900#endif 904#endif
901 ) 905 )
902 { 906 {
903 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
904 tt_write (&ch, 1); 908 tt_write (&ch, 1);
905 } 909 }
906 910
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
918} 912}
919/*}}} */ 913/*}}} */
920 914
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 916unsigned int
925rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 918{
927 unsigned int n, s; 919 unsigned int n, s;
928 920
929 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
967 } 959 }
968#endif 960#endif
969 961
970 if (want_refresh) 962 if (want_refresh)
971 { 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
972 scr_refresh (refresh_type); 1002 scr_refresh ();
973 scrollbar_show (1); 1003 scrollbar_show (1);
974#ifdef USE_XIM 1004#ifdef USE_XIM
975 IMSendSpot (); 1005 IMSendSpot ();
976#endif 1006#endif
977 } 1007 }
… …
980} 1010}
981 1011
982void 1012void
983rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
984{ 1014{
985 SET_R (this); 1015 make_current ();
986 SET_LOCALE (locale);
987 1016
988 display->flush (); 1017 display->flush ();
989 1018
990 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1021}
993 1022
994void 1023void
995rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
996{ 1025{
997 SET_R (this); 1026 make_current ();
998 SET_LOCALE (locale);
999 1027
1000 refresh_limit = 1; 1028 refresh_limit = 1;
1001 refresh_count = 0; 1029 refresh_count = 0;
1002 flush (); 1030 flush ();
1003} 1031}
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1036{
1009 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1038 want_refresh = 1;
1011 1039
1012 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1041}
1014#endif 1042#endif
1015 1043
1016#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1017void 1045void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1060{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1063 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1064 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1066 }
1040} 1067}
1041#endif 1068#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1073{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1075 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1077 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1079 }
1054} 1080}
1055#endif 1081#endif
… …
1060{ 1086{
1061 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1062 || 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)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1090 {
1065 if (view_start == nsaved || 1091 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1092 mouse_slip_wheel_speed = 0;
1068 1093
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1094 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1096 }
1073} 1097}
1074#endif 1098#endif
… …
1104 1128
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1108 1132
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1134
1111 if (r > 0) 1135 if (r > 0)
1112 { 1136 {
1113 cmdbuf_endp += r; 1137 cmdbuf_endp += r;
1114 return true; 1138 return true;
… …
1132} 1156}
1133 1157
1134void 1158void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1160{
1137 SET_R (this); 1161 make_current ();
1138 SET_LOCALE (locale);
1139 1162
1140 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1165 while (pty_fill ())
1143 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1148} 1171}
1149 1172
1150void 1173void
1151rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1152{ 1175{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1154 recolour_cursor (); 1177 recolour_cursor ();
1155 1178
1156#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1180 hidden_pointer = 0;
1158 1181
… …
1163 1186
1164#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1165void 1188void
1166rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1167{ 1190{
1168 if (! OPTION (Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1169 return; 1192 return;
1170 1193
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1172 XFlush (display->display); 1195 XFlush (xdisp);
1173 1196
1174 hidden_pointer = 1; 1197 hidden_pointer = 1;
1175} 1198}
1176 1199
1177void 1200void
1178rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1179{ 1202{
1180 SET_R (this); 1203 make_current ();
1181 SET_LOCALE (locale);
1182 1204
1183 pointer_blank (); 1205 pointer_blank ();
1184} 1206}
1185#endif 1207#endif
1186 1208
… …
1251 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1252 (32 + x + 1), 1274 (32 + x + 1),
1253 (32 + y + 1)); 1275 (32 + y + 1));
1254} 1276}
1255 1277
1256#ifdef USING_W11LIB
1257void
1258rxvt_W11_process_x_event (XEvent *ev)
1259{
1260 rxvt_t *r = rxvt_get_r ();
1261
1262 x_cb (*ev);
1263}
1264#endif
1265
1266/*{{{ process an X event */ 1278/*{{{ process an X event */
1267void 1279void
1268rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1269{ 1281{
1270 dDisp; 1282 make_current ();
1271 1283
1272 SET_R (this); 1284 dLocal (Display *, xdisp);
1273 SET_LOCALE (locale);
1274 1285
1275#if defined(CURSOR_BLINK) 1286 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1289 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1290
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1294 unsigned int unused_mask;
1305 1295
1306 switch (ev.type) 1296 switch (ev.type)
… …
1313 1303
1314 break; 1304 break;
1315 1305
1316 case KeyRelease: 1306 case KeyRelease:
1317 { 1307 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1309 KeySym keysym;
1320 1310
1321 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 :/
1322#endif 1312#endif
1323 1313
1324#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1315 // ISO 14755 support
1326 if (iso14755buf) 1316 if (iso14755buf)
… …
1331# endif 1321# endif
1332# if ISO_14755 1322# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1334 // first: controls 1324 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1328 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1330 commit_iso14755 ();
1341 return; // case-break; 1331 goto skip_switch;
1342 } 1332 }
1343 1333
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1335 if (i[0] == keysym)
1346 { 1336 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1338 commit_iso14755 ();
1349 return; // case-break; 1339 goto skip_switch;
1350 } 1340 }
1351 1341
1352 scr_bell (); 1342 scr_bell ();
1353# endif 1343# endif
1354 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1373 else 1363 else
1374 iso14755buf = 0; 1364 iso14755buf = 0;
1375 } 1365 }
1376#endif 1366#endif
1377 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
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1383#endif 1377#endif
1384 break; 1378 break;
1385 } 1379 }
1386 1380
… …
1392 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1393 break; 1387 break;
1394 1388
1395 case ClientMessage: 1389 case ClientMessage:
1396 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 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 {
1399 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)))
1400 destroy (); 1400 destroy ();
1401 }
1401#if ENABLE_EWMH 1402#if ENABLE_EWMH
1402 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])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &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 }
1406#endif 1418#endif
1407 } 1419 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1417#ifdef OFFIX_DND
1418 /* OffiX Dnd (drag 'n' drop) protocol */
1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1420 && (ev.xclient.data.l[0] == DndFile
1421 || ev.xclient.data.l[0] == DndDir
1422 || ev.xclient.data.l[0] == DndLink))
1423 {
1424 /* Get Dnd data */
1425 Atom ActualType;
1426 int ActualFormat;
1427 unsigned char *data;
1428 unsigned long Size, RemainingBytes;
1429
1430 XGetWindowProperty (disp, display->root,
1431 xa[XA_DNDSELECTION],
1432 0L, 1000000L,
1433 False, AnyPropertyType,
1434 &ActualType, &ActualFormat,
1435 &Size, &RemainingBytes,
1436 &data);
1437 set_string_property (XA_CUT_BUFFER0, data);
1438 XFree (data);
1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1441 }
1442#endif /* OFFIX_DND */
1443 break; 1420 break;
1444 1421
1445 case MappingNotify: 1422 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1424 break;
… …
1480 break; 1457 break;
1481 1458
1482 case ConfigureNotify: 1459 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1484 { 1461 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1463 ;
1487 1464
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1466 {
1490 seen_resize = 1; 1467 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1469 }
1493 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1495 if (OPTION (Opt_transparent)) 1474 if (OPTION (Opt_transparent))
1496 check_our_parents (); 1475 check_our_parents ();
1497#endif 1476#endif
1498 } 1477 }
1499 break; 1478 break;
1500 1479
1501 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1485
1506 break; 1486 break;
1507 1487
1508 case SelectionClear: 1488 case SelectionClear:
1509 selection_clear (); 1489 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1495 break;
1516 1496
1517 case SelectionRequest: 1497 case SelectionRequest:
1518 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));
1519 break; 1507 break;
1520 1508
1521 case UnmapNotify: 1509 case UnmapNotify:
1522 mapped = 0; 1510 mapped = 0;
1523#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1525#endif 1513#endif
1526 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1515 break;
1534 1516
1535#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1536 case ReparentNotify: 1518 case ReparentNotify:
1537 rootwin_cb (ev); 1519 rootwin_cb (ev);
… …
1543 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1544 { 1526 {
1545 do 1527 do
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1549 1531
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1533
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1555 1537
1556 scr_refresh (refresh_type); 1538 want_refresh = 1;
1557 } 1539 }
1558 else 1540 else
1559 { 1541 {
1560 XEvent unused_event; 1542 XEvent unused_event;
1561 1543
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1563 ; 1545 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1547 ;
1566 1548
1567 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1568 { 1550 {
1569 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1570 scrollbar_show (0); 1552 scrollbar_show (0);
1571 } 1553 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1554
1577#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1580#endif 1558#endif
1581 } 1559 }
1582 break; 1560 break;
1583 1561
1584 case MotionNotify: 1562 case MotionNotify:
1585#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1564 if (hidden_pointer)
1587 pointer_unblank (); 1565 pointer_unblank ();
1588#endif 1566#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1568 break;
1598 1569
1599 if (ev.xany.window == vt) 1570 if (ev.xany.window == vt)
1600 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1576 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1604 ; 1578 ;
1605 1579
1606 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1607 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1584 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1675#endif 1649#endif
1676 } 1650 }
1677 } 1651 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1653 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1681 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1682 ; 1656 ;
1683 1657
1684 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1685 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1662 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1664 scrollbar_size ());
1691 scr_refresh (refresh_type); 1665 want_refresh = 1;
1692 refresh_limit = 0; 1666 refresh_limit = 0;
1693 scrollbar_show (1); 1667 scrollbar_show (1);
1694 } 1668 }
1695 break; 1669 break;
1696 } 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
1697} 1700}
1698 1701
1699void 1702void
1700rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1701{ 1704{
1702 if (!focus) 1705 if (!focus)
1703 { 1706 {
1704 focus = 1; 1707 focus = 1;
1705 want_refresh = 1; 1708 want_refresh = 1;
1706 1709
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1711
1709#if USE_XIM 1712#if USE_XIM
1710 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1711 { 1714 {
1712 IMSetStatusPosition (); 1715 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1714 } 1717 }
1715#endif 1718#endif
1716#if CURSOR_BLINK 1719#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1720 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1722#endif
1720#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1722 { 1725 {
1723 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
… …
1733 if (focus) 1736 if (focus)
1734 { 1737 {
1735 focus = 0; 1738 focus = 0;
1736 want_refresh = 1; 1739 want_refresh = 1;
1737 1740
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1742
1740#if ENABLE_FRILLS || ISO_14755 1743#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1744 if (iso14755buf)
1742 { 1745 {
1743 iso14755buf = 0; 1746 iso14755buf = 0;
… …
1767 1770
1768#if TRANSPARENT 1771#if TRANSPARENT
1769void 1772void
1770rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1774{
1772 SET_R (this); 1775 make_current ();
1773 SET_LOCALE (locale);
1774 1776
1775 switch (ev.type) 1777 switch (ev.type)
1776 { 1778 {
1777 case PropertyNotify: 1779 case PropertyNotify:
1778 /* 1780 /*
… …
1805 /* 1807 /*
1806 * VT window processing of button press 1808 * VT window processing of button press
1807 */ 1809 */
1808 if (ev.window == vt) 1810 if (ev.window == vt)
1809 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1810#if ISO_14755 1815#if ISO_14755
1811 // 5.4 1816 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1818 {
1814 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1828 { 1833 {
1829 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1830 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1831 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1832 { 1838 {
1833 /* only report double clicks */ 1839 /* only report double clicks */
1834 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1835 mouse_report (ev); 1841 mouse_report (ev);
… …
1855 else 1861 else
1856 { 1862 {
1857 if (ev.button != MEvent.button) 1863 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1864 MEvent.clicks = 0;
1859 1865
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1866 switch (ev.button)
1862 { 1867 {
1863 case Button1: 1868 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1869 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1870 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1871#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1872 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1873#else
1869 selection.rect = false; 1874 selection.rect = false;
1870#endif 1875#endif
1871 1876
1872 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1879 {
1875 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1877 else 1882 else
1878 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
1879 } 1884 }
1880 else 1885 else
1881 { 1886 {
1882 if (MEvent.button == Button1 && clickintime) 1887 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1888 MEvent.clicks++;
1884 else 1889 else
1885 MEvent.clicks = 1; 1890 MEvent.clicks = 1;
1886 1891
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1892 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1893 }
1889 1894
1890 MEvent.button = Button1; 1895 MEvent.button = Button1;
1891 break; 1896 break;
1892 1897
1893 case Button3: 1898 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1899 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1900 selection_rotate (ev.x, ev.y);
1896 else 1901 else
1897 selection_extend (ev.x, ev.y, 1); 1902 selection_extend (ev.x, ev.y, 1);
1898 1903
1899 MEvent.button = Button3; 1904 MEvent.button = Button3;
1900 break; 1905 break;
1901 } 1906 }
1902 } 1907 }
1903 1908
1904 MEvent.time = ev.time; 1909 MEvent.time = ev.time;
1905 return; 1910 return;
1906 } 1911 }
1907 1912
… …
2043 } 2048 }
2044 2049
2045 break; 2050 break;
2046 } 2051 }
2047 } 2052 }
2053
2048 return; 2054 return;
2049 } 2055 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2056}
2058 2057
2059void 2058void
2060rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
2061{ 2060{
… …
2067 2066
2068 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
2069 { 2068 {
2070 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2071 scrollbar_show (0); 2070 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2071 }
2076 2072
2077#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2080#endif 2076#endif
2081 2077
2082 if (ev.window == vt) 2078 if (ev.window == vt)
2083 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2084#if ISO_14755 2083#if ISO_14755
2085 // 5.4 2084 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2086 return;
2088#endif 2087#endif
2088
2089 if (reportmode) 2089 if (reportmode)
2090 { 2090 {
2091 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2123 { 2123 {
2124 case Button1: 2124 case Button1:
2125 case Button3: 2125 case Button3:
2126 selection_make (ev.time); 2126 selection_make (ev.time);
2127 break; 2127 break;
2128
2128 case Button2: 2129 case Button2:
2129 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);
2130 break; 2132 break;
2133
2131#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2132 case Button4: 2135 case Button4:
2133 case Button5: 2136 case Button5:
2134 { 2137 {
2135 int i; 2138 int i;
… …
2157 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2158 } 2161 }
2159 else 2162 else
2160 { 2163 {
2161# endif 2164# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2165 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2166 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2175 } 2168 }
2176#endif 2169# endif
2177 } 2170 }
2178 break; 2171 break;
2179#endif 2172#endif
2180 } 2173 }
2181 } 2174 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2175}
2187 2176
2188#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2189#if TINTING 2178#if TINTING
2190/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2191 2180
2192typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2193 2182
2194void 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)
2195{ 2184{
2196 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i; 2190 int i;
2202 2191
2203 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2204 2193
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206 2195
2207 /* for convenience */ 2196 /* for convenience */
2208 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2429 Atom atype; 2418 Atom atype;
2430 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2431 Window root, oldp, *list; 2420 Window root, oldp, *list;
2432 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2435 2423
2436 pchanged = 0; 2424 pchanged = 0;
2437 2425
2438 if (!OPTION (Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2439 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2440 2428
2441 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2443 2431
2444 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2445 2433
2446 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2447 { 2435 {
2448 if (am_transparent) 2436 if (am_transparent)
2449 { 2437 {
2450 pchanged = 1; 2438 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2453 } 2441 }
2454 2442
2455 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2456 } 2444 }
2457 2445
2458 /* 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. */
2459 XSync (disp, False); 2447 XSync (xdisp, False);
2460 2448
2461 /* 2449 /*
2462 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2464 * 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.
2465 */ 2453 */
2466 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2470 2458
2471 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2476 2464
2477 if (!i || prop == NULL 2465 if (!i || prop == NULL
2478#if TINTING 2466#if TINTING
2479 || !rs[Rs_color + Color_tint] 2467 || !ISSET_PIXCOLOR (Color_tint)
2480#endif 2468#endif
2481 ) 2469 )
2482 have_pixmap = 0; 2470 have_pixmap = 0;
2483 else 2471 else
2484 { 2472 {
… …
2497 Window cr; 2485 Window cr;
2498 XImage *image; 2486 XImage *image;
2499 GC gc; 2487 GC gc;
2500 XGCValues gcvalue; 2488 XGCValues gcvalue;
2501 2489
2502 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2506 nx = ny = 0; 2494 nx = ny = 0;
2507 2495
… …
2520 } 2508 }
2521 2509
2522 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524 2512
2525 XSync (disp, False); 2513 XSync (xdisp, False);
2526 allowedxerror = -1; 2514 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528 2516
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2531 allowedxerror = 0; 2519 allowedxerror = 0;
2532 2520
… …
2535 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2536 { 2524 {
2537 pchanged = 1; 2525 pchanged = 1;
2538 if (pixmap != None) 2526 if (pixmap != None)
2539 { 2527 {
2540 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2541 pixmap = None; 2529 pixmap = None;
2542 } 2530 }
2543 } 2531 }
2544 2532
2545 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2546 } 2534 }
2547 else 2535 else
2548 { 2536 {
2549 if (pixmap != None) 2537 if (pixmap != None)
2550 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2551 2539
2552#if TINTING 2540#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2554 { 2542 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557 2544
2545 rgba c;
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2559 2547
2560 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2561 } 2549 }
2562#endif 2550#endif
2563 2551
2564 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2570 XDestroyImage (image); 2557 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2573 2560
2574 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1; 2562 pchanged = 1;
2576 2563
2577 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2578 } 2565 }
2579 } 2566 }
2580 2567
2581 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2583 else 2570 else
2584 { 2571 {
2585 unsigned int n; 2572 unsigned int n;
2586 /* 2573 /*
2587 * InheritPixmap transparency 2574 * InheritPixmap transparency
2588 */ 2575 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 { 2577 {
2591 oldp = parent[i]; 2578 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2593 &parent[i], &list, &n);
2594 XFree (list); 2580 XFree (list);
2595 2581
2596 if (parent[i] == display->root) 2582 if (parent[i] == display->root)
2597 { 2583 {
2598 if (oldp != None) 2584 if (oldp != None)
… …
2606 } 2592 }
2607 2593
2608 n = 0; 2594 n = 0;
2609 2595
2610 if (pchanged) 2596 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++) 2597 for (; n < (unsigned int)i; n++)
2613 { 2598 {
2614 XGetWindowAttributes (disp, parent[n], &wattr); 2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 { 2602 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break; 2604 break;
2619 } 2605 }
2620 } 2606 }
2621 }
2622 2607
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2624 { 2609 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0; 2612 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */ 2613 /* XXX: also turn off Opt_transparent? */
2629 } 2614 }
2630 else 2615 else
2631 { 2616 {
2632#if WAIT_FOR_WM
2633 /* wait (an arbitrary period) for the WM to do its thing
2634 * needed for fvwm2.2.2 (and before?) */
2635 sleep (1);
2636#endif
2637 for (n = 0; n < (unsigned int)i; n++) 2617 for (n = 0; n < (unsigned int)i; n++)
2638 { 2618 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2620 XClearWindow (xdisp, parent[n]);
2641 } 2621 }
2642 2622
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2644 am_transparent = 1; 2624 am_transparent = 1;
2645 } 2625 }
2646 2626
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2628 parent[i] = None;
2649 } 2629 }
2650 2630
2651 if (scrollBar.win) 2631 if (scrollBar.win)
2652 { 2632 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2634 scrollBar.setIdle ();
2655 scrollbar_show (0); 2635 scrollbar_show (0);
2656 } 2636 }
2657 2637
2658 if (am_transparent) 2638 if (am_transparent)
… …
2670 2650
2671bool 2651bool
2672rxvt_term::cmd_parse () 2652rxvt_term::cmd_parse ()
2673{ 2653{
2674 bool flag = false; 2654 bool flag = false;
2675 unicode_t ch = NOCHAR; 2655 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2656 char *seq_begin; // remember start of esc-sequence here
2677 2657
2678 for (;;) 2658 for (;;)
2679 { 2659 {
2680 if (ch == NOCHAR) 2660 if (ch == NOCHAR)
2681 { 2661 {
2682 seq_begin = cmdbuf_ptr; 2662 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2663 ch = next_char ();
2684 }
2685 2664
2686 if (ch == NOCHAR) // TODO: improve 2665 if (ch == NOCHAR)
2687 break; 2666 break;
2667 }
2688 2668
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2669 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2670 {
2691 if (!seen_input) 2671 if (!seen_input)
2692 { 2672 {
… …
2701 if (seen_resize && cmd_pid) 2681 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2682 kill (-cmd_pid, SIGWINCH);
2703 } 2683 }
2704 2684
2705 /* Read a text string from the input buffer */ 2685 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2686 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2687 bool refreshnow = false;
2708 int nlines = 0; 2688 int nlines = 0;
2709 unicode_t *str = buf; 2689 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2690 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2691
2712 for (;;) 2692 for (;;)
2713 { 2693 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2694 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2695 break;
… …
2733 } 2713 }
2734 2714
2735 // scr_add_lines only works for nlines <= nrow - 1. 2715 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2716 if (nlines >= nrow - 1)
2737 { 2717 {
2718 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2719 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2720 scr_add_lines (buf, str - buf, nlines);
2721
2739 nlines = 0; 2722 nlines = 0;
2740 str = buf; 2723 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2724 eol = str + min (ncol, UBUFSIZ);
2742 } 2725 }
2743 2726
… …
2756 2739
2757 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2741 ch = next_char ();
2759 } 2742 }
2760 2743
2744 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2745 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2746 scr_add_lines (buf, str - buf, nlines);
2762 2747
2763 /* 2748 /*
2764 * If there have been a lot of new lines, then update the screen 2749 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2750 * What the heck I'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2751 * the number of pages between refreshes is refresh_limit, which
… …
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++; 2757 refresh_limit++;
2773 else 2758 else
2774 { 2759 {
2775 flag = true; 2760 flag = true;
2776 scr_refresh (refresh_type); 2761 scr_refresh ();
2777 flush_ev.stop (); 2762 want_refresh = 1;
2778 } 2763 }
2779 } 2764 }
2780 2765
2781 } 2766 }
2782 else 2767 else
… …
2797 } 2782 }
2798 2783
2799 return flag; 2784 return flag;
2800} 2785}
2801 2786
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2787// read the next character
2812unicode_t 2788wchar_t
2813rxvt_term::next_char () 2789rxvt_term::next_char () NOTHROW
2814{ 2790{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2791 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2792 {
2817 // assume 7-bit to be ascii ALWAYS 2793 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2794 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2795 return *cmdbuf_ptr++;
2820 2796
2821 wchar_t wc; 2797 wchar_t wc;
2822 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2798 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2823 2799
2824 if (len == (size_t)-2) 2800 if (len == (size_t)-2)
2825 { 2801 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2802 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2803 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2804 break;
2829 } 2805 }
2830 2806
2831 if (len == (size_t)-1) 2807 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2808 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2809
2834 // assume wchar == unicode 2810 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2811 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2812 return wc & UNICODE_MASK;
2837 } 2813 }
2838 2814
2839 return NOCHAR; 2815 return NOCHAR;
2840} 2816}
2817
2818// read the next octet
2819uint32_t
2820rxvt_term::next_octet () NOTHROW
2821{
2822 return cmdbuf_ptr < cmdbuf_endp
2823 ? (unsigned char)*cmdbuf_ptr++
2824 : NOCHAR;
2825}
2826
2827static class out_of_input out_of_input;
2841 2828
2842/* rxvt_cmd_getc () - Return next input character */ 2829/* rxvt_cmd_getc () - Return next input character */
2843/* 2830/*
2844 * Return the next input character after first passing any keyboard input 2831 * Return the next input character after first passing any keyboard input
2845 * to the command. 2832 * to the command.
2846 */ 2833 */
2847unicode_t 2834wchar_t
2848rxvt_term::cmd_getc () 2835rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 2836{
2850 unicode_t c = next_char (); 2837 wchar_t c = next_char ();
2851 2838
2852 if (c == NOCHAR) 2839 if (c == NOCHAR)
2853 throw out_of_input; 2840 throw out_of_input;
2854 2841
2855 return c; 2842 return c;
2856} 2843}
2857 2844
2858unicode_t 2845uint32_t
2859rxvt_term::cmd_get8 () 2846rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 2847{
2861 unicode_t c = next_octet (); 2848 uint32_t c = next_octet ();
2862 2849
2863 if (c == NOCHAR) 2850 if (c == NOCHAR)
2864 throw out_of_input; 2851 throw out_of_input;
2865 2852
2866 return c; 2853 return c;
… …
2966 case C0_ESC: 2953 case C0_ESC:
2967 process_escape_seq (); 2954 process_escape_seq ();
2968 break; 2955 break;
2969 case C0_ENQ: /* terminal Status */ 2956 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 2957 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2958 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 2959 else
2974 tt_write ((unsigned char *)VT100_ANS, 2960 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 2961 break;
2977 case C0_BEL: /* bell */ 2962 case C0_BEL: /* bell */
2978 scr_bell (); 2963 scr_bell ();
2979 break; 2964 break;
2980 case C0_BS: /* backspace */ 2965 case C0_BS: /* backspace */
… …
3104 scr_charset_set (2, (unsigned int)cmd_getc ()); 3089 scr_charset_set (2, (unsigned int)cmd_getc ());
3105 break; 3090 break;
3106 case '+': 3091 case '+':
3107 scr_charset_set (3, (unsigned int)cmd_getc ()); 3092 scr_charset_set (3, (unsigned int)cmd_getc ());
3108 break; 3093 break;
3109#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3110 case '6': 3095 case '6':
3111 scr_backindex (); 3096 scr_backindex ();
3112 break; 3097 break;
3113#endif 3098#endif
3114 case '7': 3099 case '7':
3115 scr_cursor (SAVE); 3100 scr_cursor (SAVE);
3116 break; 3101 break;
3117 case '8': 3102 case '8':
3118 scr_cursor (RESTORE); 3103 scr_cursor (RESTORE);
3119 break; 3104 break;
3120#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
3121 case '9': 3106 case '9':
3122 scr_forwardindex (); 3107 scr_forwardindex ();
3123 break; 3108 break;
3124#endif 3109#endif
3125 case '=': 3110 case '=':
… …
3135 break; 3120 break;
3136 3121
3137 /* 8.3.87: NEXT LINE */ 3122 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3123 case C1_NEL: /* ESC E */
3139 { 3124 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3125 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3126 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3127 }
3143 break; 3128 break;
3144 3129
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3130 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3131 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3153 process_dcs_seq ();
3169 break; 3154 break;
3170 3155
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3156 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3157 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3158 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3159 break; /* steal obsolete ESC [ c */
3176 3160
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3161 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3162 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3163 process_csi_seq ();
… …
3288 ndef = get_byte_array_bit (csi_defaults, i); 3272 ndef = get_byte_array_bit (csi_defaults, i);
3289 for (p = 0; p < nargs; p++) 3273 for (p = 0; p < nargs; p++)
3290 if (arg[p] == -1) 3274 if (arg[p] == -1)
3291 arg[p] = ndef; 3275 arg[p] = ndef;
3292 3276
3293#ifdef DEBUG_CMD
3294 fprintf (stderr, "CSI ");
3295 for (p = 0; p < nargs; p++)
3296 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3297 fprintf (stderr, "%c\n", ch);
3298#endif
3299
3300 /* 3277 /*
3301 * private mode handling 3278 * private mode handling
3302 */ 3279 */
3303 if (priv) 3280 if (priv)
3304 { 3281 {
3305 switch (priv) 3282 switch (priv)
3306 { 3283 {
3307 case '>': 3284 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 3285 if (ch == CSI_DA) /* secondary device attributes */
3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3286 {
3287 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3288 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3289 //
3290 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3291 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3292 // that we do not support xterm mouse reporting (should be 95 when we do).
3293 //
3294 tt_printf ("\033[>%d;94;0c", 'U');
3295 }
3310 break; 3296 break;
3311 case '?': 3297 case '?':
3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3313 process_terminal_mode (ch, priv, nargs, arg); 3299 process_terminal_mode (ch, priv, nargs, arg);
3314 break; 3300 break;
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3409 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3410 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3411 break;
3426 3412
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3413 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3414 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3415 break;
3431 3416
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3417 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3418 process_sgr_mode (nargs, arg);
3434 break; 3419 break;
… …
3518 break; 3503 break;
3519 case CSI_75: 3504 case CSI_75:
3520 scr_cursor (RESTORE); 3505 scr_cursor (RESTORE);
3521 break; 3506 break;
3522 3507
3523#if ENABLE_FRILLS 3508#if !ENABLE_MINIMAL
3524 case CSI_74: 3509 case CSI_74:
3525 process_window_ops (arg, nargs); 3510 process_window_ops (arg, nargs);
3526 break; 3511 break;
3527#endif 3512#endif
3528 3513
… …
3535 break; 3520 break;
3536 } 3521 }
3537} 3522}
3538/*}}} */ 3523/*}}} */
3539 3524
3540#if ENABLE_FRILLS 3525#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3526/* ARGSUSED */
3542void 3527void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3528rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3529{
3545 int x, y; 3530 int x, y;
3546 XWindowAttributes wattr; 3531 XWindowAttributes wattr;
3547 Window wdummy; 3532 Window wdummy;
3548 dDisp; 3533
3534 dLocal (Display *, xdisp);
3549 3535
3550 if (nargs == 0) 3536 if (nargs == 0)
3551 return; 3537 return;
3552 3538
3553 switch (args[0]) 3539 switch (args[0])
3554 { 3540 {
3555 /* 3541 /*
3556 * commands 3542 * commands
3557 */ 3543 */
3558 case 1: /* deiconify window */ 3544 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3545 XMapWindow (xdisp, parent[0]);
3560 break; 3546 break;
3561 case 2: /* iconify window */ 3547 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3548 XIconifyWindow (xdisp, parent[0], display->screen);
3563 break; 3549 break;
3564 case 3: /* set position (pixels) */ 3550 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3551 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3566 break; 3552 break;
3567 case 4: /* set size (pixels) */ 3553 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3555 break;
3570 case 5: /* raise window */ 3556 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3557 XRaiseWindow (xdisp, parent[0]);
3572 break; 3558 break;
3573 case 6: /* lower window */ 3559 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3560 XLowerWindow (xdisp, parent[0]);
3575 break; 3561 break;
3576 case 7: /* refresh window */ 3562 case 7: /* refresh window */
3577 scr_touch (true); 3563 scr_touch (true);
3578 break; 3564 break;
3579 case 8: /* set size (chars) */ 3565 case 8: /* set size (chars) */
… …
3591 3577
3592 /* 3578 /*
3593 * reports - some output format copied from XTerm 3579 * reports - some output format copied from XTerm
3594 */ 3580 */
3595 case 11: /* report window state */ 3581 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3582 XGetWindowAttributes (xdisp, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3583 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3584 break;
3599 case 13: /* report window position */ 3585 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3587 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3588 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3589 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3590 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3591 break;
3606 case 14: /* report window size (pixels) */ 3592 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3593 XGetWindowAttributes (xdisp, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3594 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3595 break;
3610 case 18: /* report text area size (chars) */ 3596 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3597 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3598 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3600 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3601 break;
3616 case 20: /* report icon label */ 3602 case 20: /* report icon label */
3617 { 3603 {
3618 char *s; 3604 char *s;
3619 XGetIconName (disp, parent[0], &s); 3605 XGetIconName (xdisp, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3606 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3607 XFree (s);
3622 } 3608 }
3623 break; 3609 break;
3624 case 21: /* report window title */ 3610 case 21: /* report window title */
3625 { 3611 {
3626 char *s; 3612 char *s;
3627 XFetchName (disp, parent[0], &s); 3613 XFetchName (xdisp, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3615 XFree (s);
3630 } 3616 }
3631 break; 3617 break;
3632 } 3618 }
… …
3636/*----------------------------------------------------------------------*/ 3622/*----------------------------------------------------------------------*/
3637/* 3623/*
3638 * get input up until STRING TERMINATOR (or BEL) 3624 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3625 * ends_how is terminator used. returned input must be free()'d
3640 */ 3626 */
3641unsigned char * 3627char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3628rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3629{
3644 unicode_t ch; 3630 unicode_t ch;
3645 bool seen_esc = false; 3631 bool seen_esc = false;
3646 unsigned int n = 0; 3632 unsigned int n = 0;
… …
3679 3665
3680 string[n++] = '\0'; 3666 string[n++] = '\0';
3681 3667
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3668 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3669
3684 return (unsigned char *)rxvt_wcstombs (string); 3670 return rxvt_wcstombs (string);
3685} 3671}
3686 3672
3687/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
3688/* 3674/*
3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3675 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3690 */ 3676 */
3691void 3677void
3692rxvt_term::process_dcs_seq () 3678rxvt_term::process_dcs_seq ()
3693{ 3679{
3694 unsigned char *s; 3680 char *s;
3695 unicode_t eh; 3681 unicode_t eh;
3696 3682
3697 /* 3683 /*
3698 * Not handled yet 3684 * Not handled yet
3699 */ 3685 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3704 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3705 arg = arg * 10 + (ch - '0');
3720 3706
3721 if (ch == ';') 3707 if (ch == ';')
3722 { 3708 {
3723 unsigned char *s = get_to_st (eh); 3709 char *s = get_to_st (eh);
3724 3710
3725 if (s) 3711 if (s)
3726 { 3712 {
3727 process_xterm_seq (arg, (char *)s, eh); 3713 process_xterm_seq (arg, s, eh);
3728 free (s); 3714 free (s);
3729 } 3715 }
3730 } 3716 }
3731} 3717}
3732 3718
3733void 3719void
3734rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3720rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3721{
3736 if (str[0] == '?' && !str[1]) 3722 if (str[0] == '?' && !str[1])
3737 { 3723 {
3738 unsigned short r, g, b; 3724 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3725 pix_colors_focused[color].get (this, c);
3726
3727#if XFT
3728 if (c.a != rgba::MAX_CC)
3729 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3730 else
3731#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3733 }
3742 else 3734 else
3743 set_window_color (color, str); 3735 set_window_color (color, str);
3744} 3736}
3745 3737
3746/* 3738/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3740 */
3749void 3741void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3743{
3752 int changed = 0;
3753 int color; 3744 int color;
3754 char *buf, *name; 3745 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3746 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3747 int saveop = op;
3757 dDisp; 3748
3749 dLocal (Display *, xdisp);
3758 3750
3759 assert (str != NULL); 3751 assert (str != NULL);
3760 switch (op) 3752 switch (op)
3761 { 3753 {
3762 case XTerm_name: 3754 case XTerm_name:
… …
3778 unsigned long bytes_after; 3770 unsigned long bytes_after;
3779 unsigned char *value = 0; 3771 unsigned char *value = 0;
3780 const char *str = ""; 3772 const char *str = "";
3781 3773
3782 if (prop 3774 if (prop
3783 && XGetWindowProperty (disp, parent[0], 3775 && XGetWindowProperty (xdisp, parent[0],
3784 prop, 0, 1<<16, 0, AnyPropertyType, 3776 prop, 0, 1<<16, 0, AnyPropertyType,
3785 &actual_type, &actual_format, 3777 &actual_type, &actual_format,
3786 &nitems, &bytes_after, &value) == Success 3778 &nitems, &bytes_after, &value) == Success
3787 && actual_type != None 3779 && actual_type != None
3788 && actual_format == 8) 3780 && actual_format == 8)
3789 str = (const char *)(value); 3781 str = (const char *)(value);
3790 3782
3791 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3783 tt_printf ("\033]%d;%s%c", op, str, resp);
3792 3784
3793 XFree (value); 3785 XFree (value);
3794 } 3786 }
3795 else 3787 else
3796 { 3788 {
… …
3800 { 3792 {
3801 *eq = 0; 3793 *eq = 0;
3802 set_utf8_property (display->atom (str), eq + 1); 3794 set_utf8_property (display->atom (str), eq + 1);
3803 } 3795 }
3804 else 3796 else
3805 XDeleteProperty (disp, parent[0], 3797 XDeleteProperty (xdisp, parent[0],
3806 display->atom (str)); 3798 display->atom (str));
3807 } 3799 }
3808 break; 3800 break;
3809 3801
3810 case XTerm_Color: 3802 case XTerm_Color:
… …
3812 { 3804 {
3813 if ((name = strchr (buf, ';')) == NULL) 3805 if ((name = strchr (buf, ';')) == NULL)
3814 break; 3806 break;
3815 3807
3816 *name++ = '\0'; 3808 *name++ = '\0';
3817 color = atoi (buf); 3809 color = atoi (buf) + minCOLOR;
3818 3810
3819 if (color < 0 || color >= TOTAL_COLORS) 3811 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 3812 break;
3821 3813
3822 if ((buf = strchr (name, ';')) != NULL) 3814 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 3815 *buf++ = '\0';
3824 3816
3825 if (name[0] == '?' && !name[1]) 3817 process_color_seq (op, color, name, resp);
3826 {
3827 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3829 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3830 }
3831 else
3832 set_window_color (color + minCOLOR, name);
3833 } 3818 }
3834 break; 3819 break;
3835 case XTerm_Color00: 3820 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3821 process_color_seq (op, Color_fg, str, resp);
3837 break; 3822 break;
3838 case XTerm_Color01: 3823 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3824 process_color_seq (op, Color_bg, str, resp);
3840 break; 3825 break;
3841#ifndef NO_CURSORCOLOR 3826#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 3827 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3828 process_color_seq (op, Color_cursor, str, resp);
3844 break; 3829 break;
3845#endif 3830#endif
3846 case XTerm_Color_pointer_fg: 3831 case XTerm_Color_pointer_fg:
3847 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3832 process_color_seq (op, Color_pointer_fg, str, resp);
3848 break; 3833 break;
3849 case XTerm_Color_pointer_bg: 3834 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3835 process_color_seq (op, Color_pointer_bg, str, resp);
3851 break; 3836 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 3837#ifndef NO_BOLD_UNDERLINE_REVERSE
3853 case XTerm_Color_BD:
3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3855 break;
3856 case XTerm_Color_UL:
3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3858 break;
3859 case XTerm_Color_RV: 3838 case XTerm_Color_RV:
3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3839 process_color_seq (op, Color_RV, str, resp);
3840 break;
3841 case Rxvt_Color_BD:
3842 case URxvt_Color_BD:
3843 process_color_seq (op, Color_BD, str, resp);
3844 break;
3845 case Rxvt_Color_UL:
3846 case URxvt_Color_UL:
3847 process_color_seq (op, Color_UL, str, resp);
3861 break; 3848 break;
3862 case URxvt_Color_IT: 3849 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3850 process_color_seq (op, Color_IT, str, resp);
3864 break; 3851 break;
3865#endif 3852#endif
3866#if TRANSPARENT && TINTING 3853#if TRANSPARENT && TINTING
3867 case URxvt_Color_tint: 3854 case URxvt_Color_tint:
3868 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3855 process_color_seq (op, Color_tint, str, resp);
3856
3869 check_our_parents (); 3857 check_our_parents ();
3858
3870 if (am_transparent) 3859 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3872 break;
3873#endif
3874 3861
3862 break;
3863#endif
3864
3875 case XTerm_Pixmap: 3865 case Rxvt_Pixmap:
3866 {
3876 if (*str != ';') 3867 if (*str != ';')
3877 { 3868 {
3878#if XPM_BACKGROUND 3869#if XPM_BACKGROUND
3879 scale_pixmap (""); /* reset to default scaling */ 3870 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 3871 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 3872 scr_touch (true);
3873#endif
3883 } 3874 }
3875
3876 int changed = 0;
3877
3884 while ((str = strchr (str, ';')) != NULL) 3878 while ((str = strchr (str, ';')) != NULL)
3885 { 3879 {
3886 str++; 3880 str++;
3887#if XPM_BACKGROUND 3881#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 3882 changed += scale_pixmap (str);
3889#endif 3883#endif
3890 } 3884 }
3891 3885
3892 if (changed) 3886 if (changed)
3893 { 3887 {
3894#ifdef XPM_BACKGROUND 3888#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 3889 resize_pixmap ();
3896#endif
3897 scr_touch (true); 3890 scr_touch (true);
3891#endif
3898 } 3892 }
3893 }
3899 break; 3894 break;
3900 3895
3901 case XTerm_restoreFG: 3896 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3897 set_window_color (Color_fg, str);
3903 break; 3898 break;
3904 case XTerm_restoreBG: 3899 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 3900 set_window_color (Color_bg, str);
3906 break; 3901 break;
3907 3902
3908 case XTerm_logfile: 3903 case XTerm_logfile:
3909 // TODO, when secure mode? 3904 // TODO, when secure mode?
3910 break; 3905 break;
3911 3906
3912#ifdef MENUBAR
3913 case URxvt_Menu:
3914 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break;
3917#endif
3918#if 0 3907#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 3908 case Rxvt_dumpscreen: /* no error notices */
3920 { 3909 {
3921 int fd; 3910 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3911 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 { 3912 {
3924 scr_dump (fd); 3913 scr_dump (fd);
… …
3948 allocated.push_back ((void *)res); 3937 allocated.push_back ((void *)res);
3949 set_fonts (); 3938 set_fonts ();
3950 } 3939 }
3951 break; 3940 break;
3952 3941
3953#if ENABLE_FRILLS 3942 case URxvt_version:
3943 if (query)
3944 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3945 op,
3946 rs[Rs_name], VERSION[0], VERSION[2],
3947 resp);
3948 break;
3949
3950#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3951 case URxvt_locale:
3955 if (query) 3952 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3953 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3957 else 3954 else
3958 { 3955 {
3959 set_locale (str); 3956 set_locale (str);
3960 pty.set_utf8_mode (enc_utf8); 3957 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3958 init_xlocale ();
3962 } 3959 }
3963 break; 3960 break;
3964 3961
3965 case URxvt_view_up: 3962 case URxvt_view_up:
… …
3976 break; 3973 break;
3977#endif 3974#endif
3978 3975
3979#if ENABLE_PERL 3976#if ENABLE_PERL
3980 case URxvt_perl: 3977 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3978 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet 3979 ; // no responses yet
3983 break; 3980 break;
3984#endif 3981#endif
3985 } 3982 }
3986} 3983}
… …
4018 return state; 4015 return state;
4019} 4016}
4020 4017
4021/* we're not using priv _yet_ */ 4018/* we're not using priv _yet_ */
4022void 4019void
4023rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4020rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4024{ 4021{
4025 unsigned int i, j; 4022 unsigned int i, j;
4026 int state; 4023 int state;
4027 4024
4028 static const struct 4025 static const struct
… …
4039 { 5, PrivMode_rVideo }, 4036 { 5, PrivMode_rVideo },
4040 { 6, PrivMode_relOrigin }, 4037 { 6, PrivMode_relOrigin },
4041 { 7, PrivMode_Autowrap }, 4038 { 7, PrivMode_Autowrap },
4042 // 8, bi-directional support mode 4039 // 8, bi-directional support mode
4043 { 9, PrivMode_MouseX10 }, 4040 { 9, PrivMode_MouseX10 },
4044#ifdef menuBar_esc
4045 { menuBar_esc, PrivMode_menuBar },
4046#endif
4047 // 18, 19 printing-related 4041 // 18, 19 printing-related
4048 { 25, PrivMode_VisibleCursor }, 4042 { 25, PrivMode_VisibleCursor },
4049#ifdef scrollBar_esc 4043#ifdef scrollBar_esc
4050 { scrollBar_esc, PrivMode_scrollBar }, 4044 { scrollBar_esc, PrivMode_scrollBar },
4051#endif 4045#endif
… …
4098 /* extra handling for values with state unkept */ 4092 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4093 switch (arg[i])
4100 { 4094 {
4101#if ENABLE_STYLES 4095#if ENABLE_STYLES
4102 case 1021: 4096 case 1021:
4103 if (mode) 4097 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4098
4108 scr_touch (true); 4099 scr_touch (true);
4109 break; 4100 break;
4110#endif 4101#endif
4111 case 1048: /* alternative cursor save */ 4102 case 1048: /* alternative cursor save */
… …
4133 case 3: /* 80/132 */ 4124 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4125 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4126 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4127 break;
4137 case 4: /* smooth scrolling */ 4128 case 4: /* smooth scrolling */
4138 if (!state) 4129 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4130 break;
4143 case 5: /* reverse video */ 4131 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4132 scr_rvideo_mode (state);
4145 break; 4133 break;
4146 case 6: /* relative/absolute origins */ 4134 case 6: /* relative/absolute origins */
… …
4152 /* case 8: - auto repeat, can't do on a per window basis */ 4140 /* case 8: - auto repeat, can't do on a per window basis */
4153 case 9: /* X10 mouse reporting */ 4141 case 9: /* X10 mouse reporting */
4154 if (state) /* orthogonal */ 4142 if (state) /* orthogonal */
4155 priv_modes &= ~PrivMode_MouseX11; 4143 priv_modes &= ~PrivMode_MouseX11;
4156 break; 4144 break;
4157#ifdef menuBar_esc
4158 case menuBar_esc:
4159#ifdef MENUBAR
4160 map_menuBar (state);
4161#endif
4162 break;
4163#endif
4164#ifdef scrollBar_esc 4145#ifdef scrollBar_esc
4165 case scrollBar_esc: 4146 case scrollBar_esc:
4166 if (scrollbar_mapping (state)) 4147 if (scrollbar_mapping (state))
4167 { 4148 {
4168 resize_all_windows (0, 0, 0); 4149 resize_all_windows (0, 0, 0);
… …
4187#if 0 4168#if 0
4188 case 1001: 4169 case 1001:
4189 break; /* X11 mouse highlighting */ 4170 break; /* X11 mouse highlighting */
4190#endif 4171#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4172 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4173 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4174 break;
4197 case 1011: /* scroll to bottom on key press */ 4175 case 1011: /* scroll to bottom on key press */
4198 if (state) 4176 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4177 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4178 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4179 if (OPTION (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4180 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4181 scr_erase_screen (2);
… …
4344 scr_color (Color_bg, Color_bg); 4319 scr_color (Color_bg, Color_bg);
4345 break; 4320 break;
4346 4321
4347 //case 50: // not variable spacing 4322 //case 50: // not variable spacing
4348 4323
4349#ifndef NO_BRIGHTCOLOR 4324#if !ENABLE_MINIMAL
4350 case 90: 4325 case 90:
4351 case 91: /* set bright fg color */ 4326 case 91: /* set bright fg color */
4352 case 92: 4327 case 92:
4353 case 93: 4328 case 93:
4354 case 94: 4329 case 94:
… …
4399 */ 4374 */
4400void 4375void
4401rxvt_term::tt_printf (const char *fmt,...) 4376rxvt_term::tt_printf (const char *fmt,...)
4402{ 4377{
4403 va_list arg_ptr; 4378 va_list arg_ptr;
4404 unsigned char buf[256]; 4379 char buf[256];
4405 4380
4406 va_start (arg_ptr, fmt); 4381 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4382 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4383 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4384 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4389 * or generated by us in response to a query ESC sequence.
4415 */ 4390 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4391const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4392
4418void 4393void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4394rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 4395{
4396 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4397 return;
4398
4399 if (pty->pty < 0)
4400 return;
4401
4421 if (v_buflen == 0) 4402 if (v_buflen == 0)
4422 { 4403 {
4423 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4404 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4424 4405
4425 if ((unsigned int)written == len) 4406 if ((unsigned int)written == len)
4426 return; 4407 return;
4427 4408
4428 data += written; 4409 data += written;
4429 len -= written; 4410 len -= written;
4430 } 4411 }
4431 4412
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4413 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4414
4434 memcpy (v_buffer + v_buflen, data, len); 4415 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4416 v_buflen += len;
4436 4417
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4418 pty_ev.set (EVENT_READ | EVENT_WRITE);
4438} 4419}
4439 4420
4440void rxvt_term::pty_write () 4421void rxvt_term::pty_write ()
4441{ 4422{
4442 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4423 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4443 4424
4444 if (written > 0) 4425 if (written > 0)
4445 { 4426 {
4446 v_buflen -= written; 4427 v_buflen -= written;
4447 4428

Diff Legend

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