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

Diff Legend

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