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.241 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
972 1048
973 if (want_refresh) 1049 if (want_refresh)
974 { 1050 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1052 {
977 int row = -view_start; 1053 int row = view_start;
1054 int end_row = row + nrow;
978 1055
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1057 --row;
981 1058
982 while (row < -view_start + nrow) 1059 do
983 { 1060 {
984 int start_row = row; 1061 int start_row = row;
985 line_t *l; 1062 line_t *l;
986 1063
987 do 1064 do
988 { 1065 {
989 l = &ROW (row); 1066 l = &ROW (row++);
990 1067
991 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
992 { 1069 {
993 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1072 while (l->is_longer ())
996 { 1073 {
997 l = &ROW (++row); 1074 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
999 } 1076 }
1000 1077
1001 // and filter it 1078 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1080
1004 break; 1081 break;
1005 } 1082 }
1006 } 1083 }
1007 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1085 }
1086 while (row < end_row);
1011 1087 }
1012 }
1013 1088
1014 scr_refresh (refresh_type); 1089 scr_refresh ();
1015 scrollbar_show (1); 1090 scrollbar_show (1);
1016#ifdef USE_XIM 1091#ifdef USE_XIM
1017 IMSendSpot (); 1092 IMSendSpot ();
1018#endif 1093#endif
1019 } 1094 }
… …
1022} 1097}
1023 1098
1024void 1099void
1025rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1026{ 1101{
1027 SET_R (this); 1102 make_current ();
1028 SET_LOCALE (locale);
1029 1103
1030 display->flush (); 1104 display->flush ();
1031 1105
1032 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1108}
1035 1109
1036void 1110void
1037rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1038{ 1112{
1039 SET_R (this); 1113 make_current ();
1040 SET_LOCALE (locale);
1041 1114
1042 refresh_limit = 1; 1115 refresh_limit = 1;
1043 refresh_count = 0; 1116 refresh_count = 0;
1044 flush (); 1117 flush ();
1045} 1118}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1123{
1051 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1125 want_refresh = 1;
1053 1126
1054 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1128}
1056#endif 1129#endif
1057 1130
1058#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1059void 1132void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1147{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1150 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1151 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1153 }
1082} 1154}
1083#endif 1155#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1160{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1162 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1164 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1166 }
1096} 1167}
1097#endif 1168#endif
… …
1102{ 1173{
1103 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1177 {
1107 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1110 1180
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1181 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1183 }
1115} 1184}
1116#endif 1185#endif
1117 1186
1118#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1119static struct event_handler 1188static struct event_handler
1120{ 1189{
1121 check_watcher cw_yield; 1190 check_watcher yield_ev;
1122 1191
1123 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1124 { 1193 {
1125 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1126 w.stop (); 1202 w.stop ();
1127 } 1203 }
1128 1204
1129 event_handler () 1205 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1131 { 1207 {
1132 } 1208 }
1133} event_handler; 1209} event_handler;
1134#endif 1210#endif
1135 1211
… …
1146 1222
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1150 1226
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1228
1153 if (r > 0) 1229 if (r > 0)
1154 { 1230 {
1155 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1156 return true; 1232 return true;
1157 } 1233 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1235 {
1160#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1161 if (display->is_local) 1237 if (display->is_local)
1162 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1163#endif 1239#endif
1164 } 1240 }
1165 else 1241 else
1166 { 1242 {
1167 pty_ev.stop (); 1243 pty_ev.stop ();
1168 1244
1169 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1170 destroy (); 1246 destroy ();
1171 } 1247 }
1172 1248
1173 return false; 1249 return false;
1174} 1250}
1175 1251
1176void 1252void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1254{
1179 SET_R (this); 1255 make_current ();
1180 SET_LOCALE (locale);
1181 1256
1182 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1259 while (pty_fill ())
1185 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1190} 1265}
1191 1266
1192void 1267void
1193rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1194{ 1269{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1271 recolour_cursor ();
1197 1272
1198#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1274 hidden_pointer = 0;
1200 1275
1201 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1278#endif
1204} 1279}
1205 1280
1206#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1207void 1282void
1208rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1209{ 1284{
1210 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1211 return; 1286 return;
1212 1287
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1289 XFlush (dpy);
1215 1290
1216 hidden_pointer = 1; 1291 hidden_pointer = 1;
1217} 1292}
1218 1293
1219void 1294void
1220rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1221{ 1296{
1222 SET_R (this); 1297 make_current ();
1223 SET_LOCALE (locale);
1224 1298
1225 pointer_blank (); 1299 pointer_blank ();
1226} 1300}
1227#endif 1301#endif
1228 1302
… …
1293 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1294 (32 + x + 1), 1368 (32 + x + 1),
1295 (32 + y + 1)); 1369 (32 + y + 1));
1296} 1370}
1297 1371
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1372/*{{{ process an X event */
1309void 1373void
1310rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1311{ 1375{
1312 dDisp; 1376 make_current ();
1313 1377
1314 SET_R (this); 1378 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1379
1317#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1383 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1384
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1388 unsigned int unused_mask;
1347 1389
1348 switch (ev.type) 1390 switch (ev.type)
1349 { 1391 {
1350 case KeyPress: 1392 case KeyPress:
1351#if ISO_14755 1393 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1394 break;
1357 1395
1358 case KeyRelease: 1396 case KeyRelease:
1359 { 1397 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1422
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
1427 mouse_slip_wheel_speed = 0;
1428#endif
1429 break; 1398 break;
1430 }
1431 1399
1432 case ButtonPress: 1400 case ButtonPress:
1433 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1434 break; 1402 break;
1435 1403
… …
1437 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1438 break; 1406 break;
1439 1407
1440 case ClientMessage: 1408 case ClientMessage:
1441 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1419 destroy ();
1420 }
1446#if ENABLE_EWMH 1421#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1451#endif 1437#endif
1452 } 1438 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break; 1439 break;
1489 1440
1490 case MappingNotify: 1441 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1443 break;
… …
1515 break; 1466 break;
1516 } 1467 }
1517 break; 1468 break;
1518 1469
1519 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1520 focus_in (); 1474 focus_in ();
1521 break; 1475 break;
1522 1476
1523 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1524 focus_out (); 1481 focus_out ();
1525 break; 1482 break;
1526 1483
1527 case ConfigureNotify: 1484 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1529 { 1486 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1488 ;
1532 1489
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1491 {
1535 seen_resize = 1; 1492 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1494 }
1538 1495
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1540 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1541 check_our_parents (); 1500 check_our_parents ();
1542#endif 1501#endif
1543 } 1502 }
1544 break; 1503 break;
1545 1504
1546 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1510
1551 break; 1511 break;
1552 1512
1553 case SelectionClear: 1513 case SelectionClear:
1554 selection_clear (); 1514 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1520 break;
1561 1521
1562 case SelectionRequest: 1522 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1524 break;
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1532 break;
1565 1533
1566 case UnmapNotify: 1534 case UnmapNotify:
1567 mapped = 0; 1535 mapped = 0;
1568#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1570#endif 1538#endif
1571 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1540 break;
1579 1541
1580#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1581 case ReparentNotify: 1543 case ReparentNotify:
1582 rootwin_cb (ev); 1544 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1589 { 1551 {
1590 do 1552 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1594 1556
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1558
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1600 1562
1601 scr_refresh (refresh_type); 1563 want_refresh = 1;
1602 } 1564 }
1603 else 1565 else
1604 { 1566 {
1605 XEvent unused_event; 1567 XEvent unused_event;
1606 1568
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1608 ; 1570 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1572 ;
1611 1573
1612 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1613 { 1575 {
1614 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1615 scrollbar_show (0); 1577 scrollbar_show (0);
1616 } 1578 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1579
1622#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1625#endif 1583#endif
1626 } 1584 }
1627 break; 1585 break;
1628 1586
1629 case MotionNotify: 1587 case MotionNotify:
1630#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1589 if (hidden_pointer)
1632 pointer_unblank (); 1590 pointer_unblank ();
1633#endif 1591#endif
1634#if MENUBAR
1635 if (isMenuBarWindow (ev.xany.window))
1636 {
1637 menubar_control (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1593 break;
1643 1594
1644 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1645 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1599 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1601 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1651 ; 1603 ;
1652 1604
1653 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1654 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1609 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1722#endif 1674#endif
1723 } 1675 }
1724 } 1676 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1678 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1728 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1729 ; 1681 ;
1730 1682
1731 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1732 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1687 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1689 scrollbar_size ());
1738 scr_refresh (refresh_type); 1690 want_refresh = 1;
1739 refresh_limit = 0; 1691 refresh_limit = 0;
1740 scrollbar_show (1); 1692 scrollbar_show (1);
1741 } 1693 }
1742 break; 1694 break;
1743 } 1695 }
1696
1697#if defined(CURSOR_BLINK)
1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1699 {
1700 if (hidden_cursor)
1701 {
1702 hidden_cursor = 0;
1703 want_refresh = 1;
1704 }
1705
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1707 }
1708#endif
1709
1710#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1712 {
1713 if (ev.type == MotionNotify
1714 || ev.type == ButtonPress
1715 || ev.type == ButtonRelease)
1716 if (hidden_pointer)
1717 pointer_unblank ();
1718
1719 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank ();
1721 }
1722#endif
1744} 1723}
1745 1724
1746void 1725void
1747rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1748{ 1727{
1749 if (!focus) 1728 if (!focus)
1750 { 1729 {
1751 focus = 1; 1730 focus = 1;
1752 want_refresh = 1; 1731 want_refresh = 1;
1753 1732
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1755 1734
1756#if USE_XIM 1735#if USE_XIM
1757 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1758 { 1737 {
1759 IMSetStatusPosition (); 1738 IMSetPosition ();
1760 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1761 } 1740 }
1762#endif 1741#endif
1763#if CURSOR_BLINK 1742#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1745#endif
1767#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1769 { 1748 {
1770 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1771 scr_recolour (); 1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1772 } 1764 }
1773#endif 1765#endif
1774 } 1766 }
1775} 1767}
1776 1768
… …
1796#if USE_XIM 1788#if USE_XIM
1797 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1799#endif 1791#endif
1800#if CURSOR_BLINK 1792#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1802 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1803 hidden_cursor = 0; 1795 hidden_cursor = 0;
1804#endif 1796#endif
1805#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1810 } 1802 }
1811#endif 1803#endif
1812 } 1804 }
1813} 1805}
1814 1806
1815#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1816void 1821void
1817rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1823{
1819 SET_R (this); 1824 make_current ();
1820 SET_LOCALE (locale);
1821 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1822 switch (ev.type) 1831 switch (ev.type)
1823 { 1832 {
1824 case PropertyNotify: 1833 case PropertyNotify:
1825 /* 1834 /*
1826 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1831 return; 1840 return;
1832 1841
1833 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1834 case ReparentNotify: 1843 case ReparentNotify:
1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1836 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1837 break; 1846 break;
1838 } 1847 }
1848# endif
1839} 1849}
1840#endif 1850#endif
1841 1851
1842void 1852void
1843rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
1852 /* 1862 /*
1853 * VT window processing of button press 1863 * VT window processing of button press
1854 */ 1864 */
1855 if (ev.window == vt) 1865 if (ev.window == vt)
1856 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1857#if ISO_14755 1870#if ISO_14755
1858 // 5.4 1871 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1873 {
1861 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1875 { 1888 {
1876 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1877 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1878 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1879 { 1893 {
1880 /* only report double clicks */ 1894 /* only report double clicks */
1881 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1882 mouse_report (ev); 1896 mouse_report (ev);
… …
1902 else 1916 else
1903 { 1917 {
1904 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1906 1920
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1921 switch (ev.button)
1909 { 1922 {
1910 case Button1: 1923 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1924 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1925 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1926#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1927 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1928#else
1916 selection.rect = false; 1929 selection.rect = false;
1917#endif 1930#endif
1918 1931
1919 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1934 {
1922 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1924 else 1937 else
1925 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
1926 } 1939 }
1927 else 1940 else
1928 { 1941 {
1929 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1943 MEvent.clicks++;
1931 else 1944 else
1932 MEvent.clicks = 1; 1945 MEvent.clicks = 1;
1933 1946
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1947 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1948 }
1936 1949
1937 MEvent.button = Button1; 1950 MEvent.button = Button1;
1938 break; 1951 break;
1939 1952
1940 case Button3: 1953 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1943 else 1956 else
1944 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1945 1958
1946 MEvent.button = Button3; 1959 MEvent.button = Button3;
1947 break; 1960 break;
1948 } 1961 }
1949 } 1962 }
1950 1963
1951 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1952 return; 1965 return;
1953 } 1966 }
1954 1967
… …
2090 } 2103 }
2091 2104
2092 break; 2105 break;
2093 } 2106 }
2094 } 2107 }
2108
2095 return; 2109 return;
2096 } 2110 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2111}
2105 2112
2106void 2113void
2107rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
2108{ 2115{
… …
2114 2121
2115 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2116 { 2123 {
2117 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2118 scrollbar_show (0); 2125 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2126 }
2123 2127
2124#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2127#endif 2131#endif
2128 2132
2129 if (ev.window == vt) 2133 if (ev.window == vt)
2130 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2131#if ISO_14755 2138#if ISO_14755
2132 // 5.4 2139 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2141 return;
2135#endif 2142#endif
2143
2136 if (reportmode) 2144 if (reportmode)
2137 { 2145 {
2138 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2164 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2173 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2168 2176
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2177 switch (ev.button)
2173 { 2178 {
2174 case Button1: 2179 case Button1:
2175 case Button3: 2180 case Button3:
2176 selection_make (ev.time); 2181 selection_make (ev.time);
2177 break; 2182 break;
2183
2178 case Button2: 2184 case Button2:
2179 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2180 break; 2187 break;
2188
2181#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2182 case Button4: 2190 case Button4:
2183 case Button5: 2191 case Button5:
2184 { 2192 {
2185 int i; 2193 int i;
… …
2187 2195
2188 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2189 2197
2190 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2191 i = 1; 2199 i = 1;
2192 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2193 i = nrow - 1; 2201 i = nrow - 1;
2194 else 2202 else
2195 i = 5; 2203 i = 5;
2196 2204
2197# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2207 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2208 } 2216 }
2209 else 2217 else
2210 { 2218 {
2211# endif 2219# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2220 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2221 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
2225 } 2223 }
2226#endif 2224# endif
2227 } 2225 }
2228 break; 2226 break;
2229#endif 2227#endif
2230 } 2228 }
2231 } 2229 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2230}
2237 2231
2238#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2239#if TINTING 2233#if TINTING
2240/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2241 2235
2242typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2243 2237
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{ 2239{
2246 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i; 2245 int i;
2252 2246
2253 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2254 2248
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256 2250
2257 /* for convenience */ 2251 /* for convenience */
2258 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2479 Atom atype; 2473 Atom atype;
2480 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2481 Window root, oldp, *list; 2475 Window root, oldp, *list;
2482 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485 2478
2486 pchanged = 0; 2479 pchanged = 0;
2487 2480
2488 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2489 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2490 2483
2491 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2493 2486
2494 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2495 2488
2496 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2497 { 2490 {
2498 if (am_transparent) 2491 if (am_transparent)
2499 { 2492 {
2500 pchanged = 1; 2493 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2503 } 2496 }
2504 2497
2505 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2506 } 2499 }
2507 2500
2508 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False); 2502 XSync (dpy, False);
2510 2503
2511 /* 2504 /*
2512 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2515 */ 2508 */
2516 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2520 2513
2521 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2526 2519
2527 if (!i || prop == NULL 2520 if (!i || prop == NULL
2528#if TINTING 2521#if TINTING
2529 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2530#endif 2523#endif
2531 ) 2524 )
2532 have_pixmap = 0; 2525 have_pixmap = 0;
2533 else 2526 else
2534 { 2527 {
… …
2547 Window cr; 2540 Window cr;
2548 XImage *image; 2541 XImage *image;
2549 GC gc; 2542 GC gc;
2550 XGCValues gcvalue; 2543 XGCValues gcvalue;
2551 2544
2552 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2556 nx = ny = 0; 2549 nx = ny = 0;
2557 2550
… …
2570 } 2563 }
2571 2564
2572 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574 2567
2575 XSync (disp, False); 2568 XSync (dpy, False);
2576 allowedxerror = -1; 2569 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578 2571
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2581 allowedxerror = 0; 2574 allowedxerror = 0;
2582 2575
… …
2585 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2586 { 2579 {
2587 pchanged = 1; 2580 pchanged = 1;
2588 if (pixmap != None) 2581 if (pixmap != None)
2589 { 2582 {
2590 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2591 pixmap = None; 2584 pixmap = None;
2592 } 2585 }
2593 } 2586 }
2594 2587
2595 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2596 } 2589 }
2597 else 2590 else
2598 { 2591 {
2599 if (pixmap != None) 2592 if (pixmap != None)
2600 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2601 2594
2602#if TINTING 2595#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2604 { 2597 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607 2599
2600 rgba c;
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2609 2602
2610 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2611 } 2604 }
2612#endif 2605#endif
2613 2606
2614 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2620 XDestroyImage (image); 2612 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2623 2615
2624 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1; 2617 pchanged = 1;
2626 2618
2627 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2628 } 2620 }
2629 } 2621 }
2630 2622
2631 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 else 2625 else
2634 { 2626 {
2635 unsigned int n; 2627 unsigned int n;
2636 /* 2628 /*
2637 * InheritPixmap transparency 2629 * InheritPixmap transparency
2638 */ 2630 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 { 2632 {
2641 oldp = parent[i]; 2633 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2643 &parent[i], &list, &n);
2644 XFree (list); 2635 XFree (list);
2645 2636
2646 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2647 { 2638 {
2648 if (oldp != None) 2639 if (oldp != None)
… …
2656 } 2647 }
2657 2648
2658 n = 0; 2649 n = 0;
2659 2650
2660 if (pchanged) 2651 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2663 { 2653 {
2664 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 { 2657 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break; 2659 break;
2669 } 2660 }
2670 } 2661 }
2671 }
2672 2662
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2674 { 2664 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0; 2667 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2679 } 2669 }
2680 else 2670 else
2681 { 2671 {
2682#if WAIT_FOR_WM
2683 /* wait (an arbitrary period) for the WM to do its thing
2684 * needed for fvwm2.2.2 (and before?) */
2685 sleep (1);
2686#endif
2687 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2688 { 2673 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2691 } 2676 }
2692 2677
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2694 am_transparent = 1; 2679 am_transparent = 1;
2695 } 2680 }
2696 2681
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None; 2683 parent[i] = None;
2699 } 2684 }
2700 2685
2701 if (scrollBar.win) 2686 if (scrollBar.win)
2702 { 2687 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2705 scrollbar_show (0); 2690 scrollbar_show (0);
2706 } 2691 }
2707 2692
2708 if (am_transparent) 2693 if (am_transparent)
… …
2720 2705
2721bool 2706bool
2722rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2723{ 2708{
2724 bool flag = false; 2709 bool flag = false;
2725 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2727 2712
2728 for (;;) 2713 for (;;)
2729 { 2714 {
2730 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2736 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2737 kill (-cmd_pid, SIGWINCH);
2753 } 2738 }
2754 2739
2755 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2742 bool refreshnow = false;
2758 int nlines = 0; 2743 int nlines = 0;
2759 unicode_t *str = buf; 2744 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2746
2762 for (;;) 2747 for (;;)
2763 { 2748 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2749 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2750 break;
… …
2771 if (ch == C0_LF) 2756 if (ch == C0_LF)
2772 nlines++; 2757 nlines++;
2773 2758
2774 refresh_count++; 2759 refresh_count++;
2775 2760
2776 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2777 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2778 { 2763 {
2779 refreshnow = true; 2764 refreshnow = true;
2780 refresh_count = 0; 2765 refresh_count = 0;
2781 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2783 } 2768 }
2784 2769
2785 // scr_add_lines only works for nlines <= nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2771 if (nlines >= nrow - 1)
2787 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2790 2776
2791 nlines = 0; 2777 nlines = 0;
2792 str = buf; 2778 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2779 eol = str + min (ncol, UBUFSIZ);
2794 } 2780 }
… …
2808 2794
2809 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2796 ch = next_char ();
2811 } 2797 }
2812 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2815 2802
2816 /* 2803 /*
2817 * If there have been a lot of new lines, then update the screen 2804 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2820 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2821 */ 2808 */
2822 if (refreshnow) 2809 if (refreshnow)
2823 { 2810 {
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2812 refresh_limit++;
2826 else 2813 else
2827 { 2814 {
2828 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2829 scr_refresh (refresh_type); 2817 scr_refresh ();
2830 flush_ev.stop (); 2818 want_refresh = 1;
2831 } 2819 }
2832 } 2820 }
2833 2821
2834 } 2822 }
2835 else 2823 else
… …
2850 } 2838 }
2851 2839
2852 return flag; 2840 return flag;
2853} 2841}
2854 2842
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2843// read the next character
2865unicode_t 2844wchar_t
2866rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2867{ 2846{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2848 {
2870 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2860 break;
2882 } 2861 }
2883 2862
2884 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2865
2887 // assume wchar == unicode 2866 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2868 return wc & UNICODE_MASK;
2890 } 2869 }
2891 2870
2892 return NOCHAR; 2871 return NOCHAR;
2893} 2872}
2873
2874// read the next octet
2875uint32_t
2876rxvt_term::next_octet () NOTHROW
2877{
2878 return cmdbuf_ptr < cmdbuf_endp
2879 ? (unsigned char)*cmdbuf_ptr++
2880 : NOCHAR;
2881}
2882
2883static class out_of_input out_of_input;
2894 2884
2895/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2896/* 2886/*
2897 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2898 * to the command. 2888 * to the command.
2899 */ 2889 */
2900unicode_t 2890wchar_t
2901rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2892{
2903 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2904 2894
2905 if (c == NOCHAR) 2895 if (c == NOCHAR)
2906 throw out_of_input; 2896 throw out_of_input;
2907 2897
2908 return c; 2898 return c;
2909} 2899}
2910 2900
2911unicode_t 2901uint32_t
2912rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2903{
2914 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2915 2905
2916 if (c == NOCHAR) 2906 if (c == NOCHAR)
2917 throw out_of_input; 2907 throw out_of_input;
2918 2908
2919 return c; 2909 return c;
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 3146 break;
3157 case '+': 3147 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 3149 break;
3160#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3161 case '6': 3151 case '6':
3162 scr_backindex (); 3152 scr_backindex ();
3163 break; 3153 break;
3164#endif 3154#endif
3165 case '7': 3155 case '7':
3166 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3167 break; 3157 break;
3168 case '8': 3158 case '8':
3169 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3170 break; 3160 break;
3171#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3172 case '9': 3162 case '9':
3173 scr_forwardindex (); 3163 scr_forwardindex ();
3174 break; 3164 break;
3175#endif 3165#endif
3176 case '=': 3166 case '=':
… …
3186 break; 3176 break;
3187 3177
3188 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
3190 { 3180 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3183 }
3194 break; 3184 break;
3195 3185
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3330 if (arg[p] == -1)
3341 arg[p] = ndef; 3331 arg[p] = ndef;
3342 3332
3343#ifdef DEBUG_CMD
3344 fprintf (stderr, "CSI ");
3345 for (p = 0; p < nargs; p++)
3346 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3347 fprintf (stderr, "%c\n", ch);
3348#endif
3349
3350 /* 3333 /*
3351 * private mode handling 3334 * private mode handling
3352 */ 3335 */
3353 if (priv) 3336 if (priv)
3354 { 3337 {
3355 switch (priv) 3338 switch (priv)
3356 { 3339 {
3357 case '>': 3340 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3360 break; 3352 break;
3361 case '?': 3353 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3356 break;
… …
3490 break; 3482 break;
3491 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3492 scr_report_position (); 3484 scr_report_position ();
3493 break; 3485 break;
3494 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3495 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3496 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3497 break; 3489 break;
3498 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3499 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3500 break; 3492 break;
… …
3567 break; 3559 break;
3568 case CSI_75: 3560 case CSI_75:
3569 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3570 break; 3562 break;
3571 3563
3572#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3573 case CSI_74: 3565 case CSI_74:
3574 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3575 break; 3567 break;
3576#endif 3568#endif
3577 3569
… …
3584 break; 3576 break;
3585 } 3577 }
3586} 3578}
3587/*}}} */ 3579/*}}} */
3588 3580
3589#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3582/* ARGSUSED */
3591void 3583void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3585{
3594 int x, y; 3586 int x, y;
3595 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3596 Window wdummy; 3588 Window wdummy;
3597 dDisp; 3589
3590 dLocal (Display *, dpy);
3598 3591
3599 if (nargs == 0) 3592 if (nargs == 0)
3600 return; 3593 return;
3601 3594
3602 switch (args[0]) 3595 switch (args[0])
3603 { 3596 {
3604 /* 3597 /*
3605 * commands 3598 * commands
3606 */ 3599 */
3607 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3609 break; 3602 break;
3610 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3612 break; 3605 break;
3613 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3615 break; 3608 break;
3616 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3611 break;
3619 case 5: /* raise window */ 3612 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3621 break; 3614 break;
3622 case 6: /* lower window */ 3615 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3624 break; 3617 break;
3625 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3626 scr_touch (true); 3619 scr_touch (true);
3627 break; 3620 break;
3628 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3638 break; 3631 break;
3639 3632
3640
3641 /* 3633 /*
3642 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3643 */ 3635 */
3644 case 11: /* report window state */ 3636 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3639 break;
3648 case 13: /* report window position */ 3640 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3646 break;
3655 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3650 break;
3659 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3653 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3656 break;
3665 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3666 { 3658 {
3667 char *s; 3659 char *s;
3668 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s); 3662 XFree (s);
3671 } 3663 }
3672 break; 3664 break;
3673 case 21: /* report window title */ 3665 case 21: /* report window title */
3674 { 3666 {
3675 char *s; 3667 char *s;
3676 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3670 XFree (s);
3679 } 3671 }
3680 break; 3672 break;
3681 } 3673 }
3682} 3674}
… …
3709 seen_esc = true; 3701 seen_esc = true;
3710 continue; 3702 continue;
3711 } 3703 }
3712 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3713 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3714 else if (ch < 0x20) 3708 else if (ch < 0x20)
3715 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3716 3710
3717 seen_esc = false; 3711 seen_esc = false;
3718 3712
3719 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3720 // stop at some sane length 3714 // stop at some sane length
3721 return NULL; 3715 return NULL;
3722 3716
3723 if (ch == C0_SYN)
3724 string[n++] = cmd_get8 ();
3725 else
3726 string[n++] = ch; 3717 string[n++] = ch;
3727 } 3718 }
3728 3719
3729 string[n++] = '\0'; 3720 string[n++] = '\0';
3730 3721
3731 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3782void 3773void
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{ 3775{
3785 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3786 { 3777 {
3787 unsigned short r, g, b; 3778 rgba c;
3788 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3790 } 3787 }
3791 else 3788 else
3792 set_window_color (color, str); 3789 set_window_color (color, str);
3793} 3790}
3794 3791
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3794 */
3798void 3795void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3797{
3801 int changed = 0;
3802 int color; 3798 int color;
3803 char *buf, *name; 3799 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3801 int saveop = op;
3806 dDisp; 3802
3803 dLocal (Display *, dpy);
3807 3804
3808 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3809 switch (op) 3810 switch (op)
3810 { 3811 {
3811 case XTerm_name: 3812 case XTerm_name:
3812 set_title (str); 3813 set_title (str);
3813 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3827 unsigned long bytes_after; 3828 unsigned long bytes_after;
3828 unsigned char *value = 0; 3829 unsigned char *value = 0;
3829 const char *str = ""; 3830 const char *str = "";
3830 3831
3831 if (prop 3832 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3837 && actual_type != None
3837 && actual_format == 8) 3838 && actual_format == 8)
3838 str = (const char *)(value); 3839 str = (const char *)(value);
3839 3840
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3842
3842 XFree (value); 3843 XFree (value);
3843 } 3844 }
3844 else 3845 else
3845 { 3846 {
… …
3849 { 3850 {
3850 *eq = 0; 3851 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3852 } 3853 }
3853 else 3854 else
3854 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3855 display->atom (str)); 3856 display->atom (str));
3856 } 3857 }
3857 break; 3858 break;
3858 3859
3859 case XTerm_Color: 3860 case XTerm_Color:
… …
3861 { 3862 {
3862 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3864 break;
3864 3865
3865 *name++ = '\0'; 3866 *name++ = '\0';
3866 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3867 3868
3868 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3870 break;
3870 3871
3871 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3873 *buf++ = '\0';
3873 3874
3874 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3875 {
3876 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 }
3880 else
3881 set_window_color (color + minCOLOR, name);
3882 } 3876 }
3883 break; 3877 break;
3884 case XTerm_Color00: 3878 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3886 break; 3880 break;
3887 case XTerm_Color01: 3881 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3889 break; 3883 break;
3890#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3887 break;
3894#endif 3888#endif
3895 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3891 break;
3898 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3894 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3910 break; 3906 break;
3911 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3913 break; 3909 break;
3914#endif 3910#endif
3915#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3918 check_our_parents (); 3915 check_our_parents ();
3916
3919 if (am_transparent) 3917 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 3919
3920 break;
3921#endif
3922
3924 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3925 if (*str != ';') 3925 if (*str != ';')
3926 { 3926 {
3927#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3930 scr_touch (true);
3931#endif
3932 } 3932 }
3933
3934 int changed = 0;
3935
3933 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3934 { 3937 {
3935 str++; 3938 str++;
3936#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3938#endif 3941#endif
3939 } 3942 }
3940 3943
3941 if (changed) 3944 if (changed)
3942 { 3945 {
3943#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3947 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3948 scr_touch (true);
3949#endif
3947 } 3950 }
3951 }
3948 break; 3952 break;
3949 3953
3950 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3952 break; 3956 break;
3953 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3955 break; 3959 break;
3956 3960
3957 case XTerm_logfile: 3961 case XTerm_logfile:
3958 // TODO, when secure mode? 3962 // TODO, when secure mode?
3959 break; 3963 break;
3960 3964
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3965#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3969 { 3967 {
3970 int fd; 3968 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3970 {
3973 scr_dump (fd); 3971 scr_dump (fd);
… …
3984 case URxvt_italicFont: 3982 case URxvt_italicFont:
3985 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3986#endif 3984#endif
3987 if (query) 3985 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp); 3989 resp);
3992 else 3990 else
3993 { 3991 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3997 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3998 set_fonts (); 3996 set_fonts ();
3999 } 3997 }
4000 break; 3998 break;
4001 3999
4002#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
4003 case URxvt_locale: 4009 case URxvt_locale:
4004 if (query) 4010 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4006 else 4012 else
4007 { 4013 {
4008 set_locale (str); 4014 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 4016 init_xlocale ();
4011 } 4017 }
4012 break; 4018 break;
4013 4019
4014 case URxvt_view_up: 4020 case URxvt_view_up:
… …
4025 break; 4031 break;
4026#endif 4032#endif
4027 4033
4028#if ENABLE_PERL 4034#if ENABLE_PERL
4029 case URxvt_perl: 4035 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4031 ; // no responses yet 4037 ; // no responses yet
4032 break; 4038 break;
4033#endif 4039#endif
4034 } 4040 }
4035} 4041}
… …
4067 return state; 4073 return state;
4068} 4074}
4069 4075
4070/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
4071void 4077void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4079{
4074 unsigned int i, j; 4080 unsigned int i, j;
4075 int state; 4081 int state;
4076 4082
4077 static const struct 4083 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4099 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4103#endif
… …
4147 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4151 switch (arg[i])
4149 { 4152 {
4150#if ENABLE_STYLES 4153#if ENABLE_STYLES
4151 case 1021: 4154 case 1021:
4152 if (mode) 4155 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4156
4157 scr_touch (true); 4157 scr_touch (true);
4158 break; 4158 break;
4159#endif 4159#endif
4160 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4161 case 1049: 4161 case 1049:
4162 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4163 if (mode == 0) 4163 if (mode == 0)
4164 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4165 else if (mode == 1) 4165 else if (mode == 1)
4166 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4167 break; 4167 break;
… …
4182 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4185 break;
4186 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
4187 if (!state) 4187 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4188 break;
4192 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4194 break; 4191 break;
4195 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4202 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4214 case scrollBar_esc: 4204 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4216 { 4206 {
4217 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4236#if 0 4226#if 0
4237 case 1001: 4227 case 1001:
4238 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
4239#endif 4229#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4231 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4232 break;
4246 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4247 if (state) 4234 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4235 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4239 scr_erase_screen (2);
4256 scr_change_screen (state); 4240 scr_change_screen (state);
4257 break; 4241 break;
4258 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4259 scr_change_screen (state); 4243 scr_change_screen (state);
4260 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4261 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4262 scr_erase_screen (2); 4246 scr_erase_screen (2);
4263 break; 4247 break;
4264 default: 4248 default:
4265 break; 4249 break;
… …
4393 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4394 break; 4378 break;
4395 4379
4396 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4397 4381
4398#if ENABLE_FRILLS 4382#if !ENABLE_MINIMAL
4399 case 90: 4383 case 90:
4400 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4401 case 92: 4385 case 92:
4402 case 93: 4386 case 93:
4403 case 94: 4387 case 94:
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4450
4467void 4451void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4453{
4470 if (pty.pty < 0) 4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4455 return;
4472 4456
4457 if (pty->pty < 0)
4458 return;
4459
4473 if (v_buflen == 0) 4460 if (v_buflen == 0)
4474 { 4461 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4463
4477 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4478 return; 4465 return;
4479 4466
4480 data += written; 4467 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4477}
4491 4478
4492void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4493{ 4480{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4482
4496 if (written > 0) 4483 if (written > 0)
4497 { 4484 {
4498 v_buflen -= written; 4485 v_buflen -= written;
4499 4486

Diff Legend

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