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.221 by root, Sat Dec 31 18:27:57 2005 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
… …
57#include <csignal> 58#include <csignal>
58 59
59/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
60 61
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 63
66#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
67 65
68#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 140 return;
143 141
144 for (;;) 142 for (;;)
145 { 143 {
146 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
147 145
148 text_t t = l.t[x]; 146 text_t t = l.t[x];
149 147
150 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
151 { 149 {
… …
224# if !UNICODE3 222# if !UNICODE3
225 if (ch >= 0x10000) 223 if (ch >= 0x10000)
226 ch = 0xfffd; 224 ch = 0xfffd;
227# endif 225# endif
228 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
230 } 230 }
231 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// }
232 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
233 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
234 239
235 free (fname); 240 free (fname);
236 241
… …
262 mb[0] = ch[0]; 267 mb[0] = ch[0];
263 len = 1; 268 len = 1;
264 } 269 }
265 270
266 if (len > 0) 271 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
268 else 273 else
269 scr_bell (); 274 scr_bell ();
270 } 275 }
271 276
272 iso14755buf = 0; 277 iso14755buf = 0;
… …
296rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
297{ 302{
298 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
299 unsigned int newlen; 304 unsigned int newlen;
300 KeySym keysym; 305 KeySym keysym;
301#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */
303#endif
304 int valid_keysym; 306 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
306 308
307 /* 309 /*
308 * 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
309 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
310 * 312 *
… …
328 Status status_return; 330 Status status_return;
329 331
330#if 0 332#if 0
331#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
332 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
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
335 else 337 else
336#endif 338#endif
337#endif 339#endif
338 { 340 {
… …
375 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
376 } 378 }
377 else 379 else
378#endif 380#endif
379 { 381 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
382 } 384 }
383 385
384 if (valid_keysym) 386 if (valid_keysym)
385 { 387 {
… …
437 scr_move_to (0, 1); 439 scr_move_to (0, 1);
438 return; 440 return;
439 } 441 }
440 else if (keysym == XK_End) 442 else if (keysym == XK_End)
441 { 443 {
442 scr_move_to (1, 0); 444 scr_move_to (1, 1);
443 return; 445 return;
444 } 446 }
445 } 447 }
446#endif 448#endif
447 } 449 }
… …
458 { 460 {
459 switch (keysym) 461 switch (keysym)
460 { 462 {
461 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
462 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
463 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
464 return; 466 return;
465#if TODO 467#if TODO
466 /* rxvt extras */ 468 /* rxvt extras */
467 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
468 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
849 { 851 {
850#ifdef META8_OPTION 852#ifdef META8_OPTION
851 /* set 8-bit on */ 853 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
853 { 855 {
854 unsigned char *ch; 856 char *ch;
855 857
856 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 859 *ch |= 0x80;
858 860
859 meta = 0; 861 meta = 0;
860 } 862 }
861#endif 863#endif
862 /* nil */ ; 864 /* nil */ ;
863 } 865 }
864 } 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;
865 870
866 if (len <= 0) 871 if (len <= 0)
867 return; /* not mapped */ 872 return; /* not mapped */
868 873
869 if (OPTION (Opt_scrollTtyKeypress)) 874 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 897#ifdef META8_OPTION
893 && meta_char == C0_ESC 898 && meta_char == C0_ESC
894#endif 899#endif
895 ) 900 )
896 { 901 {
897 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
898 tt_write (&ch, 1); 903 tt_write (&ch, 1);
899 } 904 }
900 905
901#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */
903 unsigned char *p;
904 int i;
905
906 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
907 for (i = 0, p = kbuf; i < len; i++, p++)
908 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
909 fprintf (stderr, "'\n");
910#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
912} 907}
913/*}}} */ 908/*}}} */
914 909
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 911unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 913{
921 unsigned int n, s; 914 unsigned int n, s;
922 915
923 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 954 }
962#endif 955#endif
963 956
964 if (want_refresh) 957 if (want_refresh)
965 { 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
966 scr_refresh (refresh_type); 997 scr_refresh ();
967 scrollbar_show (1); 998 scrollbar_show (1);
968#ifdef USE_XIM 999#ifdef USE_XIM
969 IMSendSpot (); 1000 IMSendSpot ();
970#endif 1001#endif
971 } 1002 }
… …
974} 1005}
975 1006
976void 1007void
977rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
978{ 1009{
979 SET_R (this); 1010 make_current ();
980 SET_LOCALE (locale);
981 1011
982 display->flush (); 1012 display->flush ();
983 1013
984 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1016}
987 1017
988void 1018void
989rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
990{ 1020{
991 SET_R (this); 1021 make_current ();
992 SET_LOCALE (locale);
993 1022
994 refresh_limit = 1; 1023 refresh_limit = 1;
995 refresh_count = 0; 1024 refresh_count = 0;
996 flush (); 1025 flush ();
997} 1026}
… …
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1002{ 1031{
1003 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1033 want_refresh = 1;
1005 1034
1006 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1007} 1036}
1008#endif 1037#endif
1009 1038
1010#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1011void 1040void
… …
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1026{ 1055{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1029 { 1058 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1059 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033 } 1061 }
1034} 1062}
1035#endif 1063#endif
… …
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1040{ 1068{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1070 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1072 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1074 }
1048} 1075}
1049#endif 1076#endif
… …
1054{ 1081{
1055 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1056 || 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)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1085 {
1059 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1062 1088
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1089 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1091 }
1067} 1092}
1068#endif 1093#endif
1069 1094
1095#if LINUX_YIELD_HACK
1096static struct event_handler
1097{
1098 check_watcher yield_ev;
1099
1100 void yield_cb (check_watcher &w)
1101 {
1102 usleep (0);
1103 w.stop ();
1104 }
1105
1106 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb)
1108 {
1109 }
1110} event_handler;
1111#endif
1112
1070bool 1113bool
1071rxvt_term::pty_fill () 1114rxvt_term::pty_fill ()
1072{ 1115{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1117
1075 if (CBUFSIZ == n) 1118 if (CBUFSIZ == n)
1076 { 1119 {
1077 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");
1078 n = 0; 1121 n = 0;
1079 } 1122 }
1080 1123
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
1084 1127
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086 1129
1087 if (n > 0) 1130 if (r > 0)
1088 { 1131 {
1089 cmdbuf_endp += n; 1132 cmdbuf_endp += r;
1090 return true; 1133 return true;
1091 } 1134 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1136 {
1137#if LINUX_YIELD_HACK
1138 if (display->is_local)
1139 event_handler.yield_ev.start ();
1140#endif
1141 }
1142 else
1093 { 1143 {
1094 pty_ev.stop (); 1144 pty_ev.stop ();
1095 1145
1096 if (!OPTION (Opt_hold)) 1146 if (!OPTION (Opt_hold))
1097 destroy (); 1147 destroy ();
… …
1101} 1151}
1102 1152
1103void 1153void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
1105{ 1155{
1106 SET_R (this); 1156 make_current ();
1107 SET_LOCALE (locale);
1108 1157
1109 if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
1110 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1160 while (pty_fill ())
1112 if (cmd_parse ()) 1161 if (cmd_parse ())
… …
1117} 1166}
1118 1167
1119void 1168void
1120rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1121{ 1170{
1122 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1123 recolour_cursor (); 1172 recolour_cursor ();
1124 1173
1125#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1126 hidden_pointer = 0; 1175 hidden_pointer = 0;
1127 1176
… …
1132 1181
1133#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
1134void 1183void
1135rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1136{ 1185{
1137 if (! OPTION (Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1138 return; 1187 return;
1139 1188
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1141 XFlush (display->display); 1190 XFlush (xdisp);
1142 1191
1143 hidden_pointer = 1; 1192 hidden_pointer = 1;
1144} 1193}
1145 1194
1146void 1195void
1147rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
1148{ 1197{
1149 SET_R (this); 1198 make_current ();
1150 SET_LOCALE (locale);
1151 1199
1152 pointer_blank (); 1200 pointer_blank ();
1153} 1201}
1154#endif 1202#endif
1155 1203
… …
1220 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1221 (32 + x + 1), 1269 (32 + x + 1),
1222 (32 + y + 1)); 1270 (32 + y + 1));
1223} 1271}
1224 1272
1225#ifdef USING_W11LIB
1226void
1227rxvt_W11_process_x_event (XEvent *ev)
1228{
1229 rxvt_t *r = rxvt_get_r ();
1230
1231 x_cb (*ev);
1232}
1233#endif
1234
1235/*{{{ process an X event */ 1273/*{{{ process an X event */
1236void 1274void
1237rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1238{ 1276{
1239 dDisp; 1277 make_current ();
1240 1278
1241 SET_R (this); 1279 dLocal (Display *, xdisp);
1242 SET_LOCALE (locale);
1243 1280
1244#if defined(CURSOR_BLINK) 1281 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1246 { 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1247 if (hidden_cursor) 1284 return;
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252 1285
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 // for XQueryPointer
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1289 unsigned int unused_mask;
1274 1290
1275 switch (ev.type) 1291 switch (ev.type)
… …
1282 1298
1283 break; 1299 break;
1284 1300
1285 case KeyRelease: 1301 case KeyRelease:
1286 { 1302 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1304 KeySym keysym;
1289 1305
1290 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 :/
1291#endif 1307#endif
1292 1308
1293#if ENABLE_FRILLS || ISO_14755 1309#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1310 // ISO 14755 support
1295 if (iso14755buf) 1311 if (iso14755buf)
… …
1300# endif 1316# endif
1301# if ISO_14755 1317# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1318 // iso14755 part 5.2 handling: release time
1303 // first: controls 1319 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1320 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1323 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1325 commit_iso14755 ();
1310 return; // case-break; 1326 goto skip_switch;
1311 } 1327 }
1312 1328
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1330 if (i[0] == keysym)
1315 { 1331 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1332 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1333 commit_iso14755 ();
1318 return; // case-break; 1334 goto skip_switch;
1319 } 1335 }
1320 1336
1321 scr_bell (); 1337 scr_bell ();
1322# endif 1338# endif
1323 iso14755buf = 0; 1339 iso14755buf = 0;
… …
1342 else 1358 else
1343 iso14755buf = 0; 1359 iso14755buf = 0;
1344 } 1360 }
1345#endif 1361#endif
1346 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
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1352#endif 1372#endif
1353 break; 1373 break;
1354 } 1374 }
1355 1375
… …
1361 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1362 break; 1382 break;
1363 1383
1364 case ClientMessage: 1384 case ClientMessage:
1365 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 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 {
1368 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)))
1369 destroy (); 1395 destroy ();
1396 }
1370#if ENABLE_EWMH 1397#if ENABLE_EWMH
1371 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])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &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 }
1375#endif 1413#endif
1376 } 1414 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1386#ifdef OFFIX_DND
1387 /* OffiX Dnd (drag 'n' drop) protocol */
1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1389 && (ev.xclient.data.l[0] == DndFile
1390 || ev.xclient.data.l[0] == DndDir
1391 || ev.xclient.data.l[0] == DndLink))
1392 {
1393 /* Get Dnd data */
1394 Atom ActualType;
1395 int ActualFormat;
1396 unsigned char *data;
1397 unsigned long Size, RemainingBytes;
1398
1399 XGetWindowProperty (disp, display->root,
1400 xa[XA_DNDSELECTION],
1401 0L, 1000000L,
1402 False, AnyPropertyType,
1403 &ActualType, &ActualFormat,
1404 &Size, &RemainingBytes,
1405 &data);
1406 set_string_property (XA_CUT_BUFFER0, data);
1407 XFree (data);
1408 selection_paste (display->root, XA_CUT_BUFFER0, true);
1409 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1410 }
1411#endif /* OFFIX_DND */
1412 break; 1415 break;
1413 1416
1414 case MappingNotify: 1417 case MappingNotify:
1415 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1416 break; 1419 break;
… …
1449 break; 1452 break;
1450 1453
1451 case ConfigureNotify: 1454 case ConfigureNotify:
1452 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1453 { 1456 {
1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ; 1458 ;
1456 1459
1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1458 { 1461 {
1459 seen_resize = 1; 1462 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1464 }
1462 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1464 if (OPTION (Opt_transparent)) 1469 if (OPTION (Opt_transparent))
1465 check_our_parents (); 1470 check_our_parents ();
1466#endif 1471#endif
1467 } 1472 }
1468 break; 1473 break;
1469 1474
1470 case PropertyNotify: 1475 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1471 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1472 && ev.xproperty.state == PropertyNewValue) 1478 && ev.xproperty.state == PropertyNewValue)
1473 selection_property (ev.xproperty.window, ev.xproperty.atom); 1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1474 1480
1475 break; 1481 break;
1476 1482
1477 case SelectionClear: 1483 case SelectionClear:
1478 selection_clear (); 1484 selection_clear ();
… …
1483 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 break; 1490 break;
1485 1491
1486 case SelectionRequest: 1492 case SelectionRequest:
1487 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));
1488 break; 1502 break;
1489 1503
1490 case UnmapNotify: 1504 case UnmapNotify:
1491 mapped = 0; 1505 mapped = 0;
1492#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1494#endif 1508#endif
1495 break; 1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1510 break;
1503 1511
1504#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1505 case ReparentNotify: 1513 case ReparentNotify:
1506 rootwin_cb (ev); 1514 rootwin_cb (ev);
… …
1512 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1513 { 1521 {
1514 do 1522 do
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1518 1526
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1528
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1524 1532
1525 scr_refresh (refresh_type); 1533 want_refresh = 1;
1526 } 1534 }
1527 else 1535 else
1528 { 1536 {
1529 XEvent unused_event; 1537 XEvent unused_event;
1530 1538
1531 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1532 ; 1540 ;
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1534 ; 1542 ;
1535 1543
1536 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1537 { 1545 {
1538 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1539 scrollbar_show (0); 1547 scrollbar_show (0);
1540 } 1548 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545 1549
1546#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1549#endif 1553#endif
1550 } 1554 }
1551 break; 1555 break;
1552 1556
1553 case MotionNotify: 1557 case MotionNotify:
1554#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1559 if (hidden_pointer)
1556 pointer_unblank (); 1560 pointer_unblank ();
1557#endif 1561#endif
1558#if MENUBAR
1559 if (isMenuBarWindow (ev.xany.window))
1560 {
1561 menubar_control (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1563 break;
1567 1564
1568 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1569 { 1566 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1571 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1573 ; 1573 ;
1574 1574
1575 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1576 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1579 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1644#endif 1644#endif
1645 } 1645 }
1646 } 1646 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1648 {
1649 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1650 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1651 ; 1651 ;
1652 1652
1653 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1654 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1657 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1659 scrollbar_size ());
1660 scr_refresh (refresh_type); 1660 want_refresh = 1;
1661 refresh_limit = 0; 1661 refresh_limit = 0;
1662 scrollbar_show (1); 1662 scrollbar_show (1);
1663 } 1663 }
1664 break; 1664 break;
1665 } 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
1666} 1695}
1667 1696
1668void 1697void
1669rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1670{ 1699{
1671 if (!focus) 1700 if (!focus)
1672 { 1701 {
1673 focus = 1; 1702 focus = 1;
1674 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1675#if USE_XIM 1707#if USE_XIM
1676 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1677 { 1709 {
1678 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1680 } 1712 }
1681#endif 1713#endif
1682#if CURSOR_BLINK 1714#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1715 if (OPTION (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685#endif 1717#endif
1686#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1688 { 1720 {
1689 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
… …
1699 if (focus) 1731 if (focus)
1700 { 1732 {
1701 focus = 0; 1733 focus = 0;
1702 want_refresh = 1; 1734 want_refresh = 1;
1703 1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1704#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1705 iso14755buf = 0; 1741 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1743 scr_overlay_off ();
1744# endif
1745 }
1709#endif 1746#endif
1710#if USE_XIM 1747#if USE_XIM
1711 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1713#endif 1750#endif
… …
1728 1765
1729#if TRANSPARENT 1766#if TRANSPARENT
1730void 1767void
1731rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1769{
1733 SET_R (this); 1770 make_current ();
1734 SET_LOCALE (locale);
1735 1771
1736 switch (ev.type) 1772 switch (ev.type)
1737 { 1773 {
1738 case PropertyNotify: 1774 case PropertyNotify:
1739 /* 1775 /*
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1758{ 1794{
1759 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1760 1796
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1762 if (!bypass_keystate) 1799 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1801
1765 /* 1802 /*
1766 * VT window processing of button press 1803 * VT window processing of button press
1767 */ 1804 */
1768 if (ev.window == vt) 1805 if (ev.window == vt)
1769 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1770#if ISO_14755 1810#if ISO_14755
1771 // 5.4 1811 // 5.4
1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1773 { 1813 {
1774 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1788 { 1828 {
1789 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1790 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1791 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1792 { 1833 {
1793 /* only report double clicks */ 1834 /* only report double clicks */
1794 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1795 mouse_report (ev); 1836 mouse_report (ev);
… …
1827#else 1868#else
1828 selection.rect = false; 1869 selection.rect = false;
1829#endif 1870#endif
1830 1871
1831 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1874 {
1834 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1836 else 1877 else
1837 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
2002 } 2043 }
2003 2044
2004 break; 2045 break;
2005 } 2046 }
2006 } 2047 }
2048
2007 return; 2049 return;
2008 } 2050 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2051}
2017 2052
2018void 2053void
2019rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
2020{ 2055{
… …
2026 2061
2027 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2028 { 2063 {
2029 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2030 scrollbar_show (0); 2065 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2066 }
2035 2067
2036#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2039#endif 2071#endif
2040 2072
2041 if (ev.window == vt) 2073 if (ev.window == vt)
2042 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2043#if ISO_14755 2078#if ISO_14755
2044 // 5.4 2079 // 5.4
2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2046 return; 2081 return;
2047#endif 2082#endif
2083
2048 if (reportmode) 2084 if (reportmode)
2049 { 2085 {
2050 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2051 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2052 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2082 { 2118 {
2083 case Button1: 2119 case Button1:
2084 case Button3: 2120 case Button3:
2085 selection_make (ev.time); 2121 selection_make (ev.time);
2086 break; 2122 break;
2123
2087 case Button2: 2124 case Button2:
2088 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);
2089 break; 2127 break;
2128
2090#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2091 case Button4: 2130 case Button4:
2092 case Button5: 2131 case Button5:
2093 { 2132 {
2094 int i; 2133 int i;
… …
2116 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2117 } 2156 }
2118 else 2157 else
2119 { 2158 {
2120# endif 2159# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2160 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2161 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2134 } 2163 }
2135#endif 2164# endif
2136 } 2165 }
2137 break; 2166 break;
2138#endif 2167#endif
2139 } 2168 }
2140 } 2169 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2170}
2146 2171
2147#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2148#if TINTING 2173#if TINTING
2149/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2150 2175
2151typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2152 2177
2153void 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)
2154{ 2179{
2155 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2156 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2157 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2158 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2159 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2160 int i; 2185 int i;
2161 2186
2162 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2163 2188
2164 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2165 2190
2166 /* for convenience */ 2191 /* for convenience */
2167 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2388 Atom atype; 2413 Atom atype;
2389 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2390 Window root, oldp, *list; 2415 Window root, oldp, *list;
2391 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2392 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2393 dDisp;
2394 2418
2395 pchanged = 0; 2419 pchanged = 0;
2396 2420
2397 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2398 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2399 2423
2400 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2401 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2402 2426
2403 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2404 2428
2405 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2406 { 2430 {
2407 if (am_transparent) 2431 if (am_transparent)
2408 { 2432 {
2409 pchanged = 1; 2433 pchanged = 1;
2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2411 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2412 } 2436 }
2413 2437
2414 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2415 } 2439 }
2416 2440
2417 /* 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. */
2418 XSync (disp, False); 2442 XSync (xdisp, False);
2419 2443
2420 /* 2444 /*
2421 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2422 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2423 * 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.
2424 */ 2448 */
2425 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2426 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2427 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2428 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2429 2453
2430 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2431 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2432 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2435 2459
2436 if (!i || prop == NULL 2460 if (!i || prop == NULL
2437#if TINTING 2461#if TINTING
2438 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2439#endif 2463#endif
2440 ) 2464 )
2441 have_pixmap = 0; 2465 have_pixmap = 0;
2442 else 2466 else
2443 { 2467 {
… …
2456 Window cr; 2480 Window cr;
2457 XImage *image; 2481 XImage *image;
2458 GC gc; 2482 GC gc;
2459 XGCValues gcvalue; 2483 XGCValues gcvalue;
2460 2484
2461 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2462 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2463 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2464 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2465 nx = ny = 0; 2489 nx = ny = 0;
2466 2490
… …
2479 } 2503 }
2480 2504
2481 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2482 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2483 2507
2484 XSync (disp, False); 2508 XSync (xdisp, False);
2485 allowedxerror = -1; 2509 allowedxerror = -1;
2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2487 2511
2488 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2489 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2490 allowedxerror = 0; 2514 allowedxerror = 0;
2491 2515
… …
2494 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2495 { 2519 {
2496 pchanged = 1; 2520 pchanged = 1;
2497 if (pixmap != None) 2521 if (pixmap != None)
2498 { 2522 {
2499 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2500 pixmap = None; 2524 pixmap = None;
2501 } 2525 }
2502 } 2526 }
2503 2527
2504 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2505 } 2529 }
2506 else 2530 else
2507 { 2531 {
2508 if (pixmap != None) 2532 if (pixmap != None)
2509 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2510 2534
2511#if TINTING 2535#if TINTING
2512 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2513 { 2537 {
2514 unsigned short rm, gm, bm;
2515 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2516 2539
2540 rgba c;
2517 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2518 2542
2519 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2520 } 2544 }
2521#endif 2545#endif
2522 2546
2523 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2524 szHint.width, szHint.height, image->depth);
2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2526 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2527 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2528 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2529 XDestroyImage (image); 2552 XDestroyImage (image);
2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2531 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2532 2555
2533 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2534 pchanged = 1; 2557 pchanged = 1;
2535 2558
2536 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2537 } 2560 }
2538 } 2561 }
2539 2562
2540 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2542 else 2565 else
2543 { 2566 {
2544 unsigned int n; 2567 unsigned int n;
2545 /* 2568 /*
2546 * InheritPixmap transparency 2569 * InheritPixmap transparency
2547 */ 2570 */
2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2549 { 2572 {
2550 oldp = parent[i]; 2573 oldp = parent[i];
2551 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2552 &parent[i], &list, &n);
2553 XFree (list); 2575 XFree (list);
2554 2576
2555 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2556 { 2578 {
2557 if (oldp != None) 2579 if (oldp != None)
… …
2565 } 2587 }
2566 2588
2567 n = 0; 2589 n = 0;
2568 2590
2569 if (pchanged) 2591 if (pchanged)
2570 {
2571 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2572 { 2593 {
2573 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2575 { 2597 {
2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2577 break; 2599 break;
2578 } 2600 }
2579 } 2601 }
2580 }
2581 2602
2582 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2583 { 2604 {
2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2586 am_transparent = 0; 2607 am_transparent = 0;
2587 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2588 } 2609 }
2589 else 2610 else
2590 { 2611 {
2591#if WAIT_FOR_WM
2592 /* wait (an arbitrary period) for the WM to do its thing
2593 * needed for fvwm2.2.2 (and before?) */
2594 sleep (1);
2595#endif
2596 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2597 { 2613 {
2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2599 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2600 } 2616 }
2601 2617
2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2603 am_transparent = 1; 2619 am_transparent = 1;
2604 } 2620 }
2605 2621
2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 parent[i] = None; 2623 parent[i] = None;
2608 } 2624 }
2609 2625
2610 if (scrollBar.win) 2626 if (scrollBar.win)
2611 { 2627 {
2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2613 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2614 scrollbar_show (0); 2630 scrollbar_show (0);
2615 } 2631 }
2616 2632
2617 if (am_transparent) 2633 if (am_transparent)
… …
2629 2645
2630bool 2646bool
2631rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2632{ 2648{
2633 bool flag = false; 2649 bool flag = false;
2634 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2636 2652
2637 for (;;) 2653 for (;;)
2638 { 2654 {
2639 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2640 { 2656 {
2641 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2658 ch = next_char ();
2643 }
2644 2659
2645 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2646 break; 2661 break;
2662 }
2647 2663
2648 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)
2649 { 2665 {
2650 if (!seen_input) 2666 if (!seen_input)
2651 { 2667 {
… …
2660 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2662 } 2678 }
2663 2679
2664 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2682 bool refreshnow = false;
2667 int nlines = 0; 2683 int nlines = 0;
2668 unicode_t *str = buf; 2684 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2686
2671 for (;;) 2687 for (;;)
2672 { 2688 {
2673 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))
2674 break; 2690 break;
… …
2684 2700
2685 if (!OPTION (Opt_jumpScroll) 2701 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2703 {
2688 refreshnow = true; 2704 refreshnow = true;
2705 refresh_count = 0;
2689 ch = NOCHAR; 2706 ch = NOCHAR;
2690 break; 2707 break;
2691 } 2708 }
2692 2709
2693 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2695 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2697 nlines = 0; 2717 nlines = 0;
2698 str = buf; 2718 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2700 } 2720 }
2701 2721
… …
2714 2734
2715 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2736 ch = next_char ();
2717 } 2737 }
2718 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2720 2742
2721 /* 2743 /*
2722 * 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
2723 * 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.
2724 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
… …
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++; 2752 refresh_limit++;
2731 else 2753 else
2732 { 2754 {
2733 flag = true; 2755 flag = true;
2734 scr_refresh (refresh_type); 2756 scr_refresh ();
2757 want_refresh = 1;
2735 } 2758 }
2736 } 2759 }
2737 2760
2738 } 2761 }
2739 else 2762 else
… …
2754 } 2777 }
2755 2778
2756 return flag; 2779 return flag;
2757} 2780}
2758 2781
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2782// read the next character
2769unicode_t 2783wchar_t
2770rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2771{ 2785{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2787 {
2774 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2777 2791
2778 wchar_t wc; 2792 wchar_t wc;
2779 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);
2780 2794
2781 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2782 { 2796 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2799 break;
2786 } 2800 }
2787 2801
2788 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2789 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
2790 2804
2791 // assume wchar == unicode 2805 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2794 } 2808 }
2795 2809
2796 return NOCHAR; 2810 return NOCHAR;
2797} 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;
2798 2823
2799/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2800/* 2825/*
2801 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2802 * to the command. 2827 * to the command.
2803 */ 2828 */
2804unicode_t 2829wchar_t
2805rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2806{ 2831{
2807 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2808 2833
2809 if (c == NOCHAR) 2834 if (c == NOCHAR)
2810 throw out_of_input; 2835 throw out_of_input;
2811 2836
2812 return c; 2837 return c;
2813} 2838}
2814 2839
2815unicode_t 2840uint32_t
2816rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2842{
2818 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2819 2844
2820 if (c == NOCHAR) 2845 if (c == NOCHAR)
2821 throw out_of_input; 2846 throw out_of_input;
2822 2847
2823 return c; 2848 return c;
… …
2923 case C0_ESC: 2948 case C0_ESC:
2924 process_escape_seq (); 2949 process_escape_seq ();
2925 break; 2950 break;
2926 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2954 else
2931 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2956 break;
2934 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2935 scr_bell (); 2958 scr_bell ();
2936 break; 2959 break;
2937 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3061 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3062 break; 3085 break;
3063 case '+': 3086 case '+':
3064 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3065 break; 3088 break;
3066#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3067 case '6': 3090 case '6':
3068 scr_backindex (); 3091 scr_backindex ();
3069 break; 3092 break;
3070#endif 3093#endif
3071 case '7': 3094 case '7':
3072 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3073 break; 3096 break;
3074 case '8': 3097 case '8':
3075 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3076 break; 3099 break;
3077#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3078 case '9': 3101 case '9':
3079 scr_forwardindex (); 3102 scr_forwardindex ();
3080 break; 3103 break;
3081#endif 3104#endif
3082 case '=': 3105 case '=':
… …
3092 break; 3115 break;
3093 3116
3094 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3096 { 3119 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3122 }
3100 break; 3123 break;
3101 3124
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 3148 process_dcs_seq ();
3126 break; 3149 break;
3127 3150
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3133 3155
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3158 process_csi_seq ();
… …
3245 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3246 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3247 if (arg[p] == -1) 3269 if (arg[p] == -1)
3248 arg[p] = ndef; 3270 arg[p] = ndef;
3249 3271
3250#ifdef DEBUG_CMD
3251 fprintf (stderr, "CSI ");
3252 for (p = 0; p < nargs; p++)
3253 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3254 fprintf (stderr, "%c\n", ch);
3255#endif
3256
3257 /* 3272 /*
3258 * private mode handling 3273 * private mode handling
3259 */ 3274 */
3260 if (priv) 3275 if (priv)
3261 { 3276 {
3262 switch (priv) 3277 switch (priv)
3263 { 3278 {
3264 case '>': 3279 case '>':
3265 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3266 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 }
3267 break; 3291 break;
3268 case '?': 3292 case '?':
3269 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3270 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3271 break; 3295 break;
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3406 break;
3383 3407
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3410 break;
3388 3411
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3391 break; 3414 break;
… …
3475 break; 3498 break;
3476 case CSI_75: 3499 case CSI_75:
3477 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3478 break; 3501 break;
3479 3502
3480#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3481 case CSI_74: 3504 case CSI_74:
3482 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3483 break; 3506 break;
3484#endif 3507#endif
3485 3508
… …
3492 break; 3515 break;
3493 } 3516 }
3494} 3517}
3495/*}}} */ 3518/*}}} */
3496 3519
3497#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3498/* ARGSUSED */ 3521/* ARGSUSED */
3499void 3522void
3500rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3501{ 3524{
3502 int x, y; 3525 int x, y;
3503 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3504 Window wdummy; 3527 Window wdummy;
3505 dDisp; 3528
3529 dLocal (Display *, xdisp);
3506 3530
3507 if (nargs == 0) 3531 if (nargs == 0)
3508 return; 3532 return;
3509 3533
3510 switch (args[0]) 3534 switch (args[0])
3511 { 3535 {
3512 /* 3536 /*
3513 * commands 3537 * commands
3514 */ 3538 */
3515 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3516 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3517 break; 3541 break;
3518 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3519 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3520 break; 3544 break;
3521 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3522 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3523 break; 3547 break;
3524 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3526 break; 3550 break;
3527 case 5: /* raise window */ 3551 case 5: /* raise window */
3528 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3529 break; 3553 break;
3530 case 6: /* lower window */ 3554 case 6: /* lower window */
3531 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3532 break; 3556 break;
3533 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3534 scr_touch (true); 3558 scr_touch (true);
3535 break; 3559 break;
3536 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3543 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3544 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3545 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3546 break; 3570 break;
3547 3571
3548
3549 /* 3572 /*
3550 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3551 */ 3574 */
3552 case 11: /* report window state */ 3575 case 11: /* report window state */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3555 break; 3578 break;
3556 case 13: /* report window position */ 3579 case 13: /* report window position */
3557 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3558 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3559 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3560 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3561 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3562 break; 3585 break;
3563 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3566 break; 3589 break;
3567 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3568 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3569 break; 3592 break;
… …
3571 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3572 break; 3595 break;
3573 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3574 { 3597 {
3575 char *s; 3598 char *s;
3576 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3577 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 */
3578 XFree (s); 3601 XFree (s);
3579 } 3602 }
3580 break; 3603 break;
3581 case 21: /* report window title */ 3604 case 21: /* report window title */
3582 { 3605 {
3583 char *s; 3606 char *s;
3584 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3585 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 */
3586 XFree (s); 3609 XFree (s);
3587 } 3610 }
3588 break; 3611 break;
3589 } 3612 }
… …
3593/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3594/* 3617/*
3595 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3619 * ends_how is terminator used. returned input must be free()'d
3597 */ 3620 */
3598unsigned char * 3621char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3623{
3601 unicode_t ch; 3624 unicode_t ch;
3602 bool seen_esc = false; 3625 bool seen_esc = false;
3603 unsigned int n = 0; 3626 unsigned int n = 0;
… …
3636 3659
3637 string[n++] = '\0'; 3660 string[n++] = '\0';
3638 3661
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3663
3641 return (unsigned char *)rxvt_wcstombs (string); 3664 return rxvt_wcstombs (string);
3642} 3665}
3643 3666
3644/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
3645/* 3668/*
3646 * 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)'
3647 */ 3670 */
3648void 3671void
3649rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
3650{ 3673{
3651 unsigned char *s; 3674 char *s;
3652 unicode_t eh; 3675 unicode_t eh;
3653 3676
3654 /* 3677 /*
3655 * Not handled yet 3678 * Not handled yet
3656 */ 3679 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
3677 3700
3678 if (ch == ';') 3701 if (ch == ';')
3679 { 3702 {
3680 unsigned char *s = get_to_st (eh); 3703 char *s = get_to_st (eh);
3681 3704
3682 if (s) 3705 if (s)
3683 { 3706 {
3684 process_xterm_seq (arg, (char *)s, eh); 3707 process_xterm_seq (arg, s, eh);
3685 free (s); 3708 free (s);
3686 } 3709 }
3687 } 3710 }
3688} 3711}
3689 3712
3690void 3713void
3691rxvt_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)
3692{ 3715{
3693 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3694 { 3717 {
3695 unsigned short r, g, b; 3718 rgba c;
3696 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
3697 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);
3698 } 3727 }
3699 else 3728 else
3700 set_window_color (color, str); 3729 set_window_color (color, str);
3701} 3730}
3702 3731
3703/* 3732/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3734 */
3706void 3735void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3737{
3709 int changed = 0;
3710 int color; 3738 int color;
3711 char *buf, *name; 3739 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3741 int saveop = op;
3714 dDisp; 3742
3743 dLocal (Display *, xdisp);
3715 3744
3716 assert (str != NULL); 3745 assert (str != NULL);
3717 switch (op) 3746 switch (op)
3718 { 3747 {
3719 case XTerm_name: 3748 case XTerm_name:
… …
3735 unsigned long bytes_after; 3764 unsigned long bytes_after;
3736 unsigned char *value = 0; 3765 unsigned char *value = 0;
3737 const char *str = ""; 3766 const char *str = "";
3738 3767
3739 if (prop 3768 if (prop
3740 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3741 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3742 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3743 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3744 && actual_type != None 3773 && actual_type != None
3745 && actual_format == 8) 3774 && actual_format == 8)
3746 str = (const char *)(value); 3775 str = (const char *)(value);
3747 3776
3748 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3749 3778
3750 XFree (value); 3779 XFree (value);
3751 } 3780 }
3752 else 3781 else
3753 { 3782 {
… …
3757 { 3786 {
3758 *eq = 0; 3787 *eq = 0;
3759 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3760 } 3789 }
3761 else 3790 else
3762 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3763 display->atom (str)); 3792 display->atom (str));
3764 } 3793 }
3765 break; 3794 break;
3766 3795
3767 case XTerm_Color: 3796 case XTerm_Color:
… …
3769 { 3798 {
3770 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3800 break;
3772 3801
3773 *name++ = '\0'; 3802 *name++ = '\0';
3774 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3775 3804
3776 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3806 break;
3778 3807
3779 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3809 *buf++ = '\0';
3781 3810
3782 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3783 {
3784 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 }
3788 else
3789 set_window_color (color + minCOLOR, name);
3790 } 3812 }
3791 break; 3813 break;
3792 case XTerm_Color00: 3814 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3794 break; 3816 break;
3795 case XTerm_Color01: 3817 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3797 break; 3819 break;
3798#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3801 break; 3823 break;
3802#endif 3824#endif
3803 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3804 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3805 break; 3827 break;
3806 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3808 break; 3830 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3817 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);
3818 break; 3842 break;
3819 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3821 break; 3845 break;
3822#endif 3846#endif
3823#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3824 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3826 check_our_parents (); 3851 check_our_parents ();
3852
3827 if (am_transparent) 3853 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3829 break;
3830#endif
3831 3855
3856 break;
3857#endif
3858
3832 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3833 if (*str != ';') 3861 if (*str != ';')
3834 { 3862 {
3835#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3866 scr_touch (true);
3867#endif
3840 } 3868 }
3869
3870 int changed = 0;
3871
3841 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3842 { 3873 {
3843 str++; 3874 str++;
3844#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3846#endif 3877#endif
3847 } 3878 }
3848 3879
3849 if (changed) 3880 if (changed)
3850 { 3881 {
3851#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3883 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3884 scr_touch (true);
3885#endif
3855 } 3886 }
3887 }
3856 break; 3888 break;
3857 3889
3858 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3860 break; 3892 break;
3861 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3863 break; 3895 break;
3864 3896
3865 case XTerm_logfile: 3897 case XTerm_logfile:
3866 // TODO, when secure mode? 3898 // TODO, when secure mode?
3867 break; 3899 break;
3868 3900
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3901#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3877 { 3903 {
3878 int fd; 3904 int fd;
3879 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)
3880 { 3906 {
3881 scr_dump (fd); 3907 scr_dump (fd);
… …
3905 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3906 set_fonts (); 3932 set_fonts ();
3907 } 3933 }
3908 break; 3934 break;
3909 3935
3910#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
3911 case URxvt_locale: 3945 case URxvt_locale:
3912 if (query) 3946 if (query)
3913 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);
3914 else 3948 else
3915 { 3949 {
3916 set_locale (str); 3950 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3952 init_xlocale ();
3919 } 3953 }
3920 break; 3954 break;
3921 3955
3922 case URxvt_view_up: 3956 case URxvt_view_up:
3923 case URxvt_view_down: 3957 case URxvt_view_down:
3958 {
3924 int lines = atoi (str); 3959 int lines = atoi (str);
3925 3960
3926 if (lines) 3961 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3963 else
3929 {
3930 scr_erase_savelines (); 3964 scr_erase_savelines ();
3931 } 3965 }
3932 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
3933 break; 3974 break;
3934#endif 3975#endif
3935 } 3976 }
3936} 3977}
3937/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
… …
3968 return state; 4009 return state;
3969} 4010}
3970 4011
3971/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
3972void 4013void
3973rxvt_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)
3974{ 4015{
3975 unsigned int i, j; 4016 unsigned int i, j;
3976 int state; 4017 int state;
3977 4018
3978 static const struct 4019 static const struct
… …
3989 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 4035 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 4039#endif
… …
4048 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4087 switch (arg[i])
4050 { 4088 {
4051#if ENABLE_STYLES 4089#if ENABLE_STYLES
4052 case 1021: 4090 case 1021:
4053 if (mode) 4091 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 4092
4093 scr_touch (true);
4055 else 4094 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 4095#endif
4058 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
4059 case 1049: 4097 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4098 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4099 if (mode == 0)
… …
4080 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4083 break; 4121 break;
4084 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4085 if (!state) 4123 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 4124 break;
4090 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4092 break; 4127 break;
4093 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4099 /* 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 */
4100 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4103 break; 4138 break;
4104#ifdef menuBar_esc
4105 case menuBar_esc:
4106#ifdef MENUBAR
4107 map_menuBar (state);
4108#endif
4109 break;
4110#endif
4111#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
4112 case scrollBar_esc: 4140 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4114 { 4142 {
4115 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4134#if 0 4162#if 0
4135 case 1001: 4163 case 1001:
4136 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4137#endif 4165#endif
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 4167 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 4168 break;
4144 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4145 if (state) 4170 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 4171 break;
4150 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 4173 if (OPTION (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 4175 scr_erase_screen (2);
… …
4291 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4292 break; 4314 break;
4293 4315
4294 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4295 4317
4296#ifndef NO_BRIGHTCOLOR 4318#if !ENABLE_MINIMAL
4297 case 90: 4319 case 90:
4298 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4299 case 92: 4321 case 92:
4300 case 93: 4322 case 93:
4301 case 94: 4323 case 94:
… …
4346 */ 4368 */
4347void 4369void
4348rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
4349{ 4371{
4350 va_list arg_ptr; 4372 va_list arg_ptr;
4351 unsigned char buf[256]; 4373 char buf[256];
4352 4374
4353 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
4354 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355 va_end (arg_ptr); 4377 va_end (arg_ptr);
4356 tt_write (buf, strlen (buf)); 4378 tt_write (buf, strlen (buf));
… …
4361 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
4362 */ 4384 */
4363const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364 4386
4365void 4387void
4366rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4367{ 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
4368 if (v_buflen == 0) 4396 if (v_buflen == 0)
4369 { 4397 {
4370 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));
4371 4399
4372 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4373 return; 4401 return;
4374 4402
4375 data += written; 4403 data += written;
4376 len -= written; 4404 len -= written;
4377 } 4405 }
4378 4406
4379 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4380 4408
4381 memcpy (v_buffer + v_buflen, data, len); 4409 memcpy (v_buffer + v_buflen, data, len);
4382 v_buflen += len; 4410 v_buflen += len;
4383 4411
4384 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4385} 4413}
4386 4414
4387void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4388{ 4416{
4389 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));
4390 4418
4391 if (written > 0) 4419 if (written > 0)
4392 { 4420 {
4393 v_buflen -= written; 4421 v_buflen -= written;
4394 4422

Diff Legend

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