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.237 by root, Fri Jan 6 01:16:58 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
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */
920 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
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 1003unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 1005{
927 unsigned int n, s; 1006 unsigned int n, s;
928 1007
… …
969 1048
970 if (want_refresh) 1049 if (want_refresh)
971 { 1050 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 { 1052 {
974 int row = -view_start; 1053 int row = view_start;
1054 int end_row = row + nrow;
975 1055
976 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
977 --row; 1057 --row;
978 1058
979 while (row < -view_start + nrow) 1059 do
980 { 1060 {
981 int start_row = row; 1061 int start_row = row;
982 line_t *l; 1062 line_t *l;
983 1063
984 do 1064 do
985 { 1065 {
986 l = &ROW (row); 1066 l = &ROW (row++);
987 1067
988 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
989 { 1069 {
990 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
992 while (l->is_longer ()) 1072 while (l->is_longer ())
993 { 1073 {
994 l = &ROW (++row); 1074 l = &ROW (row++);
995 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
996 } 1076 }
997 1077
998 // and filter it 1078 // and filter it
999 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));
1000 1080
1001 break; 1081 break;
1002 } 1082 }
1003 } 1083 }
1004 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1005
1006 row++;
1007 } 1085 }
1086 while (row < end_row);
1008 1087 }
1009 }
1010 1088
1011 scr_refresh (refresh_type); 1089 scr_refresh ();
1012 scrollbar_show (1); 1090 scrollbar_show (1);
1013#ifdef USE_XIM 1091#ifdef USE_XIM
1014 IMSendSpot (); 1092 IMSendSpot ();
1015#endif 1093#endif
1016 } 1094 }
… …
1019} 1097}
1020 1098
1021void 1099void
1022rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1023{ 1101{
1024 SET_R (this); 1102 make_current ();
1025 SET_LOCALE (locale);
1026 1103
1027 display->flush (); 1104 display->flush ();
1028 1105
1029 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1030 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
1031} 1108}
1032 1109
1033void 1110void
1034rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1035{ 1112{
1036 SET_R (this); 1113 make_current ();
1037 SET_LOCALE (locale);
1038 1114
1039 refresh_limit = 1; 1115 refresh_limit = 1;
1040 refresh_count = 0; 1116 refresh_count = 0;
1041 flush (); 1117 flush ();
1042} 1118}
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1123{
1048 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1125 want_refresh = 1;
1050 1126
1051 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1128}
1053#endif 1129#endif
1054 1130
1055#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1056void 1132void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1147{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1150 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1151 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1153 }
1079} 1154}
1080#endif 1155#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1160{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1162 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1164 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1166 }
1093} 1167}
1094#endif 1168#endif
… …
1099{ 1173{
1100 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1101 || 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)
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1177 {
1104 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1107 1180
1108 refresh_type |= SMOOTH_REFRESH;
1109 want_refresh = 1; 1181 want_refresh = 1;
1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111 } 1183 }
1112} 1184}
1113#endif 1185#endif
1114 1186
1115#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1116static struct event_handler 1188static struct event_handler
1117{ 1189{
1118 check_watcher cw_yield; 1190 check_watcher yield_ev;
1119 1191
1120 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1121 { 1193 {
1122 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
1123 w.stop (); 1202 w.stop ();
1124 } 1203 }
1125 1204
1126 event_handler () 1205 event_handler ()
1127 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1128 { 1207 {
1129 } 1208 }
1130} event_handler; 1209} event_handler;
1131#endif 1210#endif
1132 1211
… …
1143 1222
1144 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1145 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1147 1226
1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149 1228
1150 if (r > 0) 1229 if (r > 0)
1151 { 1230 {
1152 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1153 return true; 1232 return true;
1154 } 1233 }
1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 { 1235 {
1157#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1158 if (display->is_local) 1237 if (display->is_local)
1159 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1160#endif 1239#endif
1161 } 1240 }
1162 else 1241 else
1163 { 1242 {
1164 pty_ev.stop (); 1243 pty_ev.stop ();
1165 1244
1166 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1167 destroy (); 1246 destroy ();
1168 } 1247 }
1169 1248
1170 return false; 1249 return false;
1171} 1250}
1172 1251
1173void 1252void
1174rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1175{ 1254{
1176 SET_R (this); 1255 make_current ();
1177 SET_LOCALE (locale);
1178 1256
1179 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1180 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1181 while (pty_fill ()) 1259 while (pty_fill ())
1182 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1187} 1265}
1188 1266
1189void 1267void
1190rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1191{ 1269{
1192 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1193 recolour_cursor (); 1271 recolour_cursor ();
1194 1272
1195#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1196 hidden_pointer = 0; 1274 hidden_pointer = 0;
1197 1275
1198 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1199 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1200#endif 1278#endif
1201} 1279}
1202 1280
1203#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1204void 1282void
1205rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1206{ 1284{
1207 if (! OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1208 return; 1286 return;
1209 1287
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1211 XFlush (display->display); 1289 XFlush (dpy);
1212 1290
1213 hidden_pointer = 1; 1291 hidden_pointer = 1;
1214} 1292}
1215 1293
1216void 1294void
1217rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1218{ 1296{
1219 SET_R (this); 1297 make_current ();
1220 SET_LOCALE (locale);
1221 1298
1222 pointer_blank (); 1299 pointer_blank ();
1223} 1300}
1224#endif 1301#endif
1225 1302
… …
1290 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1291 (32 + x + 1), 1368 (32 + x + 1),
1292 (32 + y + 1)); 1369 (32 + y + 1));
1293} 1370}
1294 1371
1295#ifdef USING_W11LIB
1296void
1297rxvt_W11_process_x_event (XEvent *ev)
1298{
1299 rxvt_t *r = rxvt_get_r ();
1300
1301 x_cb (*ev);
1302}
1303#endif
1304
1305/*{{{ process an X event */ 1372/*{{{ process an X event */
1306void 1373void
1307rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1308{ 1375{
1309 dDisp; 1376 make_current ();
1310 1377
1311 SET_R (this); 1378 dLocal (Display *, dpy);
1312 SET_LOCALE (locale);
1313 1379
1314#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 if (hidden_cursor) 1383 return;
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322 1384
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1324 }
1325#endif
1326
1327#if defined(POINTER_BLANK)
1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329 {
1330 if (ev.type == MotionNotify
1331 || ev.type == ButtonPress
1332 || ev.type == ButtonRelease)
1333 if (hidden_pointer)
1334 pointer_unblank ();
1335
1336 if (ev.type == KeyPress && hidden_pointer == 0)
1337 pointer_blank ();
1338 }
1339#endif
1340
1341 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1388 unsigned int unused_mask;
1344 1389
1345 switch (ev.type) 1390 switch (ev.type)
1346 { 1391 {
1347 case KeyPress: 1392 case KeyPress:
1348#if ISO_14755 1393 key_press (ev.xkey);
1349 if (!(iso14755buf & ISO_14755_52))
1350#endif
1351 lookup_key (ev.xkey);
1352
1353 break; 1394 break;
1354 1395
1355 case KeyRelease: 1396 case KeyRelease:
1356 { 1397 key_release (ev.xkey);
1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1358 KeySym ks;
1359
1360 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361#endif
1362
1363#if ENABLE_FRILLS || ISO_14755
1364 // ISO 14755 support
1365 if (iso14755buf)
1366 if (iso14755buf & ISO_14755_52)
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371# if ISO_14755
1372 // iso14755 part 5.2 handling: release time
1373 // first: controls
1374 if ((ev.xkey.state & ControlMask)
1375 && ((ks >= 0x40 && ks <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f)))
1377 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1379 commit_iso14755 ();
1380 return; // case-break;
1381 }
1382
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks)
1385 {
1386 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 ();
1388 return; // case-break;
1389 }
1390
1391 scr_bell ();
1392# endif
1393 iso14755buf = 0;
1394 break;
1395 }
1396 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1397 {
1398# if ENABLE_OVERLAY
1399 scr_overlay_off ();
1400# endif
1401 if (iso14755buf & ISO_14755_51)
1402 commit_iso14755 ();
1403#if ISO_14755
1404 else if (iso14755buf & ISO_14755_STARTED)
1405 {
1406 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1407
1408 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1409 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1410 }
1411# endif
1412 else
1413 iso14755buf = 0;
1414 }
1415#endif
1416
1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418 if (!(ev.xkey.state & ControlMask))
1419 slip_wheel_ev.stop ();
1420 else if (ks == XK_Control_L || ks == XK_Control_R)
1421 mouse_slip_wheel_speed = 0;
1422#endif
1423 break; 1398 break;
1424 }
1425 1399
1426 case ButtonPress: 1400 case ButtonPress:
1427 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1428 break; 1402 break;
1429 1403
… …
1431 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1432 break; 1406 break;
1433 1407
1434 case ClientMessage: 1408 case ClientMessage:
1435 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437 { 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 {
1438 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)))
1439 destroy (); 1419 destroy ();
1420 }
1440#if ENABLE_EWMH 1421#if ENABLE_EWMH
1441 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])
1442 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &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 }
1445#endif 1437#endif
1446 } 1438 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1456#ifdef OFFIX_DND
1457 /* OffiX Dnd (drag 'n' drop) protocol */
1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1459 && (ev.xclient.data.l[0] == DndFile
1460 || ev.xclient.data.l[0] == DndDir
1461 || ev.xclient.data.l[0] == DndLink))
1462 {
1463 /* Get Dnd data */
1464 Atom ActualType;
1465 int ActualFormat;
1466 unsigned char *data;
1467 unsigned long Size, RemainingBytes;
1468
1469 XGetWindowProperty (disp, display->root,
1470 xa[XA_DNDSELECTION],
1471 0L, 1000000L,
1472 False, AnyPropertyType,
1473 &ActualType, &ActualFormat,
1474 &Size, &RemainingBytes,
1475 &data);
1476 set_string_property (XA_CUT_BUFFER0, data);
1477 XFree (data);
1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1480 }
1481#endif /* OFFIX_DND */
1482 break; 1439 break;
1483 1440
1484 case MappingNotify: 1441 case MappingNotify:
1485 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1486 break; 1443 break;
… …
1509 break; 1466 break;
1510 } 1467 }
1511 break; 1468 break;
1512 1469
1513 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1514 focus_in (); 1474 focus_in ();
1515 break; 1475 break;
1516 1476
1517 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1518 focus_out (); 1481 focus_out ();
1519 break; 1482 break;
1520 1483
1521 case ConfigureNotify: 1484 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1523 { 1486 {
1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ; 1488 ;
1526 1489
1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1528 { 1491 {
1529 seen_resize = 1; 1492 seen_resize = 1;
1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531 } 1494 }
1532 1495
1533#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
1534 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1535 check_our_parents (); 1500 check_our_parents ();
1536#endif 1501#endif
1537 } 1502 }
1538 break; 1503 break;
1539 1504
1540 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1543 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1544 1510
1545 break; 1511 break;
1546 1512
1547 case SelectionClear: 1513 case SelectionClear:
1548 selection_clear (); 1514 selection_clear ();
… …
1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554 break; 1520 break;
1555 1521
1556 case SelectionRequest: 1522 case SelectionRequest:
1557 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));
1558 break; 1532 break;
1559 1533
1560 case UnmapNotify: 1534 case UnmapNotify:
1561 mapped = 0; 1535 mapped = 0;
1562#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1564#endif 1538#endif
1565 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 break; 1540 break;
1573 1541
1574#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1575 case ReparentNotify: 1543 case ReparentNotify:
1576 rootwin_cb (ev); 1544 rootwin_cb (ev);
… …
1582 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1583 { 1551 {
1584 do 1552 do
1585 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1586 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1588 1556
1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590 1558
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1594 1562
1595 scr_refresh (refresh_type); 1563 want_refresh = 1;
1596 } 1564 }
1597 else 1565 else
1598 { 1566 {
1599 XEvent unused_event; 1567 XEvent unused_event;
1600 1568
1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1602 ; 1570 ;
1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1604 ; 1572 ;
1605 1573
1606 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1607 { 1575 {
1608 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1609 scrollbar_show (0); 1577 scrollbar_show (0);
1610 } 1578 }
1611#ifdef MENUBAR
1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613 menubar_expose ();
1614#endif
1615 1579
1616#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1619#endif 1583#endif
1620 } 1584 }
1621 break; 1585 break;
1622 1586
1623 case MotionNotify: 1587 case MotionNotify:
1624#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1589 if (hidden_pointer)
1626 pointer_unblank (); 1590 pointer_unblank ();
1627#endif 1591#endif
1628#if MENUBAR
1629 if (isMenuBarWindow (ev.xany.window))
1630 {
1631 menubar_control (ev.xbutton);
1632 break;
1633 }
1634#endif
1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1593 break;
1637 1594
1638 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1639 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1601 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1643 ; 1603 ;
1644 1604
1645 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1646 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1649 &ev.xbutton.state); 1609 &ev.xbutton.state);
1650#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1714#endif 1674#endif
1715 } 1675 }
1716 } 1676 }
1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1718 { 1678 {
1719 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1720 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1721 ; 1681 ;
1722 1682
1723 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1724 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1725 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1726 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1727 &unused_mask); 1687 &unused_mask);
1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729 scrollbar_size ()); 1689 scrollbar_size ());
1730 scr_refresh (refresh_type); 1690 want_refresh = 1;
1731 refresh_limit = 0; 1691 refresh_limit = 0;
1732 scrollbar_show (1); 1692 scrollbar_show (1);
1733 } 1693 }
1734 break; 1694 break;
1735 } 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
1736} 1723}
1737 1724
1738void 1725void
1739rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1740{ 1727{
1741 if (!focus) 1728 if (!focus)
1742 { 1729 {
1743 focus = 1; 1730 focus = 1;
1744 want_refresh = 1; 1731 want_refresh = 1;
1745 1732
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1734
1748#if USE_XIM 1735#if USE_XIM
1749 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1750 { 1737 {
1751 IMSetStatusPosition (); 1738 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1753 } 1740 }
1754#endif 1741#endif
1755#if CURSOR_BLINK 1742#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1745#endif
1759#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1761 { 1748 {
1762 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1763 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 }
1764 } 1764 }
1765#endif 1765#endif
1766 } 1766 }
1767} 1767}
1768 1768
… …
1788#if USE_XIM 1788#if USE_XIM
1789 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1791#endif 1791#endif
1792#if CURSOR_BLINK 1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0; 1795 hidden_cursor = 0;
1796#endif 1796#endif
1797#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1802 } 1802 }
1803#endif 1803#endif
1804 } 1804 }
1805} 1805}
1806 1806
1807#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
1808void 1821void
1809rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1823{
1811 SET_R (this); 1824 make_current ();
1812 SET_LOCALE (locale);
1813 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
1814 switch (ev.type) 1831 switch (ev.type)
1815 { 1832 {
1816 case PropertyNotify: 1833 case PropertyNotify:
1817 /* 1834 /*
1818 * 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,
… …
1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1823 return; 1840 return;
1824 1841
1825 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1826 case ReparentNotify: 1843 case ReparentNotify:
1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1828 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1829 break; 1846 break;
1830 } 1847 }
1848# endif
1831} 1849}
1832#endif 1850#endif
1833 1851
1834void 1852void
1835rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
1844 /* 1862 /*
1845 * VT window processing of button press 1863 * VT window processing of button press
1846 */ 1864 */
1847 if (ev.window == vt) 1865 if (ev.window == vt)
1848 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1849#if ISO_14755 1870#if ISO_14755
1850 // 5.4 1871 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 { 1873 {
1853 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1867 { 1888 {
1868 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1869 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1870 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1871 { 1893 {
1872 /* only report double clicks */ 1894 /* only report double clicks */
1873 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1874 mouse_report (ev); 1896 mouse_report (ev);
… …
1894 else 1916 else
1895 { 1917 {
1896 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1898 1920
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1921 switch (ev.button)
1901 { 1922 {
1902 case Button1: 1923 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1924 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1925 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1926#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1927 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1928#else
1908 selection.rect = false; 1929 selection.rect = false;
1909#endif 1930#endif
1910 1931
1911 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1934 {
1914 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1916 else 1937 else
1917 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
1918 } 1939 }
1919 else 1940 else
1920 { 1941 {
1921 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1943 MEvent.clicks++;
1923 else 1944 else
1924 MEvent.clicks = 1; 1945 MEvent.clicks = 1;
1925 1946
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1947 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1948 }
1928 1949
1929 MEvent.button = Button1; 1950 MEvent.button = Button1;
1930 break; 1951 break;
1931 1952
1932 case Button3: 1953 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1935 else 1956 else
1936 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1937 1958
1938 MEvent.button = Button3; 1959 MEvent.button = Button3;
1939 break; 1960 break;
1940 } 1961 }
1941 } 1962 }
1942 1963
1943 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1944 return; 1965 return;
1945 } 1966 }
1946 1967
… …
2082 } 2103 }
2083 2104
2084 break; 2105 break;
2085 } 2106 }
2086 } 2107 }
2108
2087 return; 2109 return;
2088 } 2110 }
2089#if MENUBAR
2090 /*
2091 * Menubar window processing of button press
2092 */
2093 if (isMenuBarWindow (ev.window))
2094 menubar_control (ev);
2095#endif
2096} 2111}
2097 2112
2098void 2113void
2099rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
2100{ 2115{
… …
2106 2121
2107 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2108 { 2123 {
2109 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2110 scrollbar_show (0); 2125 scrollbar_show (0);
2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112 refresh_type &= ~SMOOTH_REFRESH;
2113#endif
2114 } 2126 }
2115 2127
2116#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2119#endif 2131#endif
2120 2132
2121 if (ev.window == vt) 2133 if (ev.window == vt)
2122 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2123#if ISO_14755 2138#if ISO_14755
2124 // 5.4 2139 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return; 2141 return;
2127#endif 2142#endif
2143
2128 if (reportmode) 2144 if (reportmode)
2129 { 2145 {
2130 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2131 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2132 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2162 { 2178 {
2163 case Button1: 2179 case Button1:
2164 case Button3: 2180 case Button3:
2165 selection_make (ev.time); 2181 selection_make (ev.time);
2166 break; 2182 break;
2183
2167 case Button2: 2184 case Button2:
2168 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);
2169 break; 2187 break;
2188
2170#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2171 case Button4: 2190 case Button4:
2172 case Button5: 2191 case Button5:
2173 { 2192 {
2174 int i; 2193 int i;
… …
2176 2195
2177 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2178 2197
2179 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2180 i = 1; 2199 i = 1;
2181 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2201 i = nrow - 1;
2183 else 2202 else
2184 i = 5; 2203 i = 5;
2185 2204
2186# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2196 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2197 } 2216 }
2198 else 2217 else
2199 { 2218 {
2200# endif 2219# endif
2201# ifdef JUMP_MOUSE_WHEEL
2202 scr_page (v, i); 2220 scr_page (v, i);
2203 scr_refresh (SMOOTH_REFRESH);
2204 scrollbar_show (1); 2221 scrollbar_show (1);
2205# else
2206 while (i--)
2207 {
2208 scr_page (v, 1);
2209 scr_refresh (SMOOTH_REFRESH);
2210 scrollbar_show (1);
2211 }
2212# endif
2213# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
2214 } 2223 }
2215#endif 2224# endif
2216 } 2225 }
2217 break; 2226 break;
2218#endif 2227#endif
2219 } 2228 }
2220 } 2229 }
2221#ifdef MENUBAR
2222 else if (isMenuBarWindow (ev.window))
2223 menubar_control (ev);
2224#endif
2225} 2230}
2226 2231
2227#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2228#if TINTING 2233#if TINTING
2229/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2230 2235
2231typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2232 2237
2233void 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)
2234{ 2239{
2235 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2236 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240 int i; 2245 int i;
2241 2246
2242 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2243 2248
2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2245 2250
2246 /* for convenience */ 2251 /* for convenience */
2247 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2468 Atom atype; 2473 Atom atype;
2469 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2470 Window root, oldp, *list; 2475 Window root, oldp, *list;
2471 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2472 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2474 2478
2475 pchanged = 0; 2479 pchanged = 0;
2476 2480
2477 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2478 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2479 2483
2480 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2481 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2482 2486
2483 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2484 2488
2485 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2486 { 2490 {
2487 if (am_transparent) 2491 if (am_transparent)
2488 { 2492 {
2489 pchanged = 1; 2493 pchanged = 1;
2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2491 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2492 } 2496 }
2493 2497
2494 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2495 } 2499 }
2496 2500
2497 /* 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. */
2498 XSync (disp, False); 2502 XSync (dpy, False);
2499 2503
2500 /* 2504 /*
2501 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2502 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2503 * 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.
2504 */ 2508 */
2505 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2508 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2509 2513
2510 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2511 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2515 2519
2516 if (!i || prop == NULL 2520 if (!i || prop == NULL
2517#if TINTING 2521#if TINTING
2518 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2519#endif 2523#endif
2520 ) 2524 )
2521 have_pixmap = 0; 2525 have_pixmap = 0;
2522 else 2526 else
2523 { 2527 {
… …
2536 Window cr; 2540 Window cr;
2537 XImage *image; 2541 XImage *image;
2538 GC gc; 2542 GC gc;
2539 XGCValues gcvalue; 2543 XGCValues gcvalue;
2540 2544
2541 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2542 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2543 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2544 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2545 nx = ny = 0; 2549 nx = ny = 0;
2546 2550
… …
2559 } 2563 }
2560 2564
2561 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2562 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563 2567
2564 XSync (disp, False); 2568 XSync (dpy, False);
2565 allowedxerror = -1; 2569 allowedxerror = -1;
2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2567 2571
2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2569 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2570 allowedxerror = 0; 2574 allowedxerror = 0;
2571 2575
… …
2574 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2575 { 2579 {
2576 pchanged = 1; 2580 pchanged = 1;
2577 if (pixmap != None) 2581 if (pixmap != None)
2578 { 2582 {
2579 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2580 pixmap = None; 2584 pixmap = None;
2581 } 2585 }
2582 } 2586 }
2583 2587
2584 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2585 } 2589 }
2586 else 2590 else
2587 { 2591 {
2588 if (pixmap != None) 2592 if (pixmap != None)
2589 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2590 2594
2591#if TINTING 2595#if TINTING
2592 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2593 { 2597 {
2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2596 2599
2600 rgba c;
2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2598 2602
2599 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2600 } 2604 }
2601#endif 2605#endif
2602 2606
2603 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2604 szHint.width, szHint.height, image->depth);
2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2606 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2607 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2608 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2609 XDestroyImage (image); 2612 XDestroyImage (image);
2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2611 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2612 2615
2613 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2614 pchanged = 1; 2617 pchanged = 1;
2615 2618
2616 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2617 } 2620 }
2618 } 2621 }
2619 2622
2620 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2622 else 2625 else
2623 { 2626 {
2624 unsigned int n; 2627 unsigned int n;
2625 /* 2628 /*
2626 * InheritPixmap transparency 2629 * InheritPixmap transparency
2627 */ 2630 */
2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2629 { 2632 {
2630 oldp = parent[i]; 2633 oldp = parent[i];
2631 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2632 &parent[i], &list, &n);
2633 XFree (list); 2635 XFree (list);
2634 2636
2635 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2636 { 2638 {
2637 if (oldp != None) 2639 if (oldp != None)
… …
2645 } 2647 }
2646 2648
2647 n = 0; 2649 n = 0;
2648 2650
2649 if (pchanged) 2651 if (pchanged)
2650 {
2651 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2652 { 2653 {
2653 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2655 { 2657 {
2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2657 break; 2659 break;
2658 } 2660 }
2659 } 2661 }
2660 }
2661 2662
2662 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2663 { 2664 {
2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2666 am_transparent = 0; 2667 am_transparent = 0;
2667 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2668 } 2669 }
2669 else 2670 else
2670 { 2671 {
2671#if WAIT_FOR_WM
2672 /* wait (an arbitrary period) for the WM to do its thing
2673 * needed for fvwm2.2.2 (and before?) */
2674 sleep (1);
2675#endif
2676 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2677 { 2673 {
2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2680 } 2676 }
2681 2677
2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2683 am_transparent = 1; 2679 am_transparent = 1;
2684 } 2680 }
2685 2681
2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2687 parent[i] = None; 2683 parent[i] = None;
2688 } 2684 }
2689 2685
2690 if (scrollBar.win) 2686 if (scrollBar.win)
2691 { 2687 {
2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2693 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2694 scrollbar_show (0); 2690 scrollbar_show (0);
2695 } 2691 }
2696 2692
2697 if (am_transparent) 2693 if (am_transparent)
… …
2709 2705
2710bool 2706bool
2711rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2712{ 2708{
2713 bool flag = false; 2709 bool flag = false;
2714 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2716 2712
2717 for (;;) 2713 for (;;)
2718 { 2714 {
2719 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2720 { 2716 {
2721 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2722 ch = next_char (); 2718 ch = next_char ();
2723 }
2724 2719
2725 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2726 break; 2721 break;
2722 }
2727 2723
2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2724 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2729 { 2725 {
2730 if (!seen_input) 2726 if (!seen_input)
2731 { 2727 {
… …
2740 if (seen_resize && cmd_pid) 2736 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2737 kill (-cmd_pid, SIGWINCH);
2742 } 2738 }
2743 2739
2744 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2742 bool refreshnow = false;
2747 int nlines = 0; 2743 int nlines = 0;
2748 unicode_t *str = buf; 2744 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2746
2751 for (;;) 2747 for (;;)
2752 { 2748 {
2753 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))
2754 break; 2750 break;
… …
2760 if (ch == C0_LF) 2756 if (ch == C0_LF)
2761 nlines++; 2757 nlines++;
2762 2758
2763 refresh_count++; 2759 refresh_count++;
2764 2760
2765 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2766 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2767 { 2763 {
2768 refreshnow = true; 2764 refreshnow = true;
2769 refresh_count = 0; 2765 refresh_count = 0;
2770 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2772 } 2768 }
2773 2769
2774 // scr_add_lines only works for nlines <= nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2771 if (nlines >= nrow - 1)
2776 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 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))))
2778 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2779 2776
2780 nlines = 0; 2777 nlines = 0;
2781 str = buf; 2778 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2779 eol = str + min (ncol, UBUFSIZ);
2783 } 2780 }
… …
2797 2794
2798 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2796 ch = next_char ();
2800 } 2797 }
2801 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802 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))))
2803 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2804 2802
2805 /* 2803 /*
2806 * 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
2807 * 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.
2808 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2809 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2810 */ 2808 */
2811 if (refreshnow) 2809 if (refreshnow)
2812 { 2810 {
2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814 refresh_limit++; 2812 refresh_limit++;
2815 else 2813 else
2816 { 2814 {
2817 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2818 scr_refresh (refresh_type); 2817 scr_refresh ();
2819 flush_ev.stop (); 2818 want_refresh = 1;
2820 } 2819 }
2821 } 2820 }
2822 2821
2823 } 2822 }
2824 else 2823 else
… …
2839 } 2838 }
2840 2839
2841 return flag; 2840 return flag;
2842} 2841}
2843 2842
2844// read the next octet
2845unicode_t
2846rxvt_term::next_octet ()
2847{
2848 return cmdbuf_ptr < cmdbuf_endp
2849 ? *cmdbuf_ptr++
2850 : NOCHAR;
2851}
2852
2853// read the next character 2843// read the next character
2854unicode_t 2844wchar_t
2855rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2856{ 2846{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2848 {
2859 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2869 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2860 break;
2871 } 2861 }
2872 2862
2873 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2874 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
2875 2865
2876 // assume wchar == unicode 2866 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2868 return wc & UNICODE_MASK;
2879 } 2869 }
2880 2870
2881 return NOCHAR; 2871 return NOCHAR;
2882} 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;
2883 2884
2884/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2885/* 2886/*
2886 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2887 * to the command. 2888 * to the command.
2888 */ 2889 */
2889unicode_t 2890wchar_t
2890rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2891{ 2892{
2892 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2893 2894
2894 if (c == NOCHAR) 2895 if (c == NOCHAR)
2895 throw out_of_input; 2896 throw out_of_input;
2896 2897
2897 return c; 2898 return c;
2898} 2899}
2899 2900
2900unicode_t 2901uint32_t
2901rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902{ 2903{
2903 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2904 2905
2905 if (c == NOCHAR) 2906 if (c == NOCHAR)
2906 throw out_of_input; 2907 throw out_of_input;
2907 2908
2908 return c; 2909 return c;
… …
3144 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3145 break; 3146 break;
3146 case '+': 3147 case '+':
3147 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3148 break; 3149 break;
3149#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3150 case '6': 3151 case '6':
3151 scr_backindex (); 3152 scr_backindex ();
3152 break; 3153 break;
3153#endif 3154#endif
3154 case '7': 3155 case '7':
3155 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3156 break; 3157 break;
3157 case '8': 3158 case '8':
3158 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3159 break; 3160 break;
3160#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3161 case '9': 3162 case '9':
3162 scr_forwardindex (); 3163 scr_forwardindex ();
3163 break; 3164 break;
3164#endif 3165#endif
3165 case '=': 3166 case '=':
… …
3175 break; 3176 break;
3176 3177
3177 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
3179 { 3180 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 3183 }
3183 break; 3184 break;
3184 3185
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
3327 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3328 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3329 if (arg[p] == -1) 3330 if (arg[p] == -1)
3330 arg[p] = ndef; 3331 arg[p] = ndef;
3331 3332
3332#ifdef DEBUG_CMD
3333 fprintf (stderr, "CSI ");
3334 for (p = 0; p < nargs; p++)
3335 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3336 fprintf (stderr, "%c\n", ch);
3337#endif
3338
3339 /* 3333 /*
3340 * private mode handling 3334 * private mode handling
3341 */ 3335 */
3342 if (priv) 3336 if (priv)
3343 { 3337 {
3344 switch (priv) 3338 switch (priv)
3345 { 3339 {
3346 case '>': 3340 case '>':
3347 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3348 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 }
3349 break; 3352 break;
3350 case '?': 3353 case '?':
3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3352 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3353 break; 3356 break;
… …
3479 break; 3482 break;
3480 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3481 scr_report_position (); 3484 scr_report_position ();
3482 break; 3485 break;
3483 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3484 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3485 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3486 break; 3489 break;
3487 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3489 break; 3492 break;
… …
3556 break; 3559 break;
3557 case CSI_75: 3560 case CSI_75:
3558 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3559 break; 3562 break;
3560 3563
3561#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3562 case CSI_74: 3565 case CSI_74:
3563 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3564 break; 3567 break;
3565#endif 3568#endif
3566 3569
… …
3573 break; 3576 break;
3574 } 3577 }
3575} 3578}
3576/*}}} */ 3579/*}}} */
3577 3580
3578#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3579/* ARGSUSED */ 3582/* ARGSUSED */
3580void 3583void
3581rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3582{ 3585{
3583 int x, y; 3586 int x, y;
3584 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3585 Window wdummy; 3588 Window wdummy;
3586 dDisp; 3589
3590 dLocal (Display *, dpy);
3587 3591
3588 if (nargs == 0) 3592 if (nargs == 0)
3589 return; 3593 return;
3590 3594
3591 switch (args[0]) 3595 switch (args[0])
3592 { 3596 {
3593 /* 3597 /*
3594 * commands 3598 * commands
3595 */ 3599 */
3596 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3597 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3598 break; 3602 break;
3599 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3600 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3601 break; 3605 break;
3602 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3603 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3604 break; 3608 break;
3605 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3607 break; 3611 break;
3608 case 5: /* raise window */ 3612 case 5: /* raise window */
3609 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3610 break; 3614 break;
3611 case 6: /* lower window */ 3615 case 6: /* lower window */
3612 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3613 break; 3617 break;
3614 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3615 scr_touch (true); 3619 scr_touch (true);
3616 break; 3620 break;
3617 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3624 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3625 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3626 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3627 break; 3631 break;
3628 3632
3629
3630 /* 3633 /*
3631 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3632 */ 3635 */
3633 case 11: /* report window state */ 3636 case 11: /* report window state */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3636 break; 3639 break;
3637 case 13: /* report window position */ 3640 case 13: /* report window position */
3638 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3639 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3640 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3641 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3642 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3643 break; 3646 break;
3644 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3647 break; 3650 break;
3648 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3649 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3650 break; 3653 break;
… …
3652 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3653 break; 3656 break;
3654 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3655 { 3658 {
3656 char *s; 3659 char *s;
3657 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3658 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 */
3659 XFree (s); 3662 XFree (s);
3660 } 3663 }
3661 break; 3664 break;
3662 case 21: /* report window title */ 3665 case 21: /* report window title */
3663 { 3666 {
3664 char *s; 3667 char *s;
3665 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3666 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 */
3667 XFree (s); 3670 XFree (s);
3668 } 3671 }
3669 break; 3672 break;
3670 } 3673 }
3671} 3674}
… …
3698 seen_esc = true; 3701 seen_esc = true;
3699 continue; 3702 continue;
3700 } 3703 }
3701 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3702 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3703 else if (ch < 0x20) 3708 else if (ch < 0x20)
3704 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3705 3710
3706 seen_esc = false; 3711 seen_esc = false;
3707 3712
3708 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3709 // stop at some sane length 3714 // stop at some sane length
3710 return NULL; 3715 return NULL;
3711 3716
3712 if (ch == C0_SYN)
3713 string[n++] = cmd_get8 ();
3714 else
3715 string[n++] = ch; 3717 string[n++] = ch;
3716 } 3718 }
3717 3719
3718 string[n++] = '\0'; 3720 string[n++] = '\0';
3719 3721
3720 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3771void 3773void
3772rxvt_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)
3773{ 3775{
3774 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3775 { 3777 {
3776 unsigned short r, g, b; 3778 rgba c;
3777 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
3778 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);
3779 } 3787 }
3780 else 3788 else
3781 set_window_color (color, str); 3789 set_window_color (color, str);
3782} 3790}
3783 3791
… …
3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3786 */ 3794 */
3787void 3795void
3788rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789{ 3797{
3790 int changed = 0;
3791 int color; 3798 int color;
3792 char *buf, *name; 3799 char *buf, *name;
3793 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3794 int saveop = op; 3801 int saveop = op;
3795 dDisp; 3802
3803 dLocal (Display *, dpy);
3796 3804
3797 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
3798 switch (op) 3810 switch (op)
3799 { 3811 {
3800 case XTerm_name: 3812 case XTerm_name:
3801 set_title (str); 3813 set_title (str);
3802 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3816 unsigned long bytes_after; 3828 unsigned long bytes_after;
3817 unsigned char *value = 0; 3829 unsigned char *value = 0;
3818 const char *str = ""; 3830 const char *str = "";
3819 3831
3820 if (prop 3832 if (prop
3821 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3822 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3823 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3824 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3825 && actual_type != None 3837 && actual_type != None
3826 && actual_format == 8) 3838 && actual_format == 8)
3827 str = (const char *)(value); 3839 str = (const char *)(value);
3828 3840
3829 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3830 3842
3831 XFree (value); 3843 XFree (value);
3832 } 3844 }
3833 else 3845 else
3834 { 3846 {
… …
3838 { 3850 {
3839 *eq = 0; 3851 *eq = 0;
3840 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3841 } 3853 }
3842 else 3854 else
3843 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3844 display->atom (str)); 3856 display->atom (str));
3845 } 3857 }
3846 break; 3858 break;
3847 3859
3848 case XTerm_Color: 3860 case XTerm_Color:
… …
3850 { 3862 {
3851 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3852 break; 3864 break;
3853 3865
3854 *name++ = '\0'; 3866 *name++ = '\0';
3855 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3856 3868
3857 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858 break; 3870 break;
3859 3871
3860 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3861 *buf++ = '\0'; 3873 *buf++ = '\0';
3862 3874
3863 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3864 {
3865 unsigned short r, g, b;
3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868 }
3869 else
3870 set_window_color (color + minCOLOR, name);
3871 } 3876 }
3872 break; 3877 break;
3873 case XTerm_Color00: 3878 case XTerm_Color00:
3874 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3875 break; 3880 break;
3876 case XTerm_Color01: 3881 case XTerm_Color01:
3877 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3878 break; 3883 break;
3879#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3880 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3881 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3882 break; 3887 break;
3883#endif 3888#endif
3884 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3885 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3886 break; 3891 break;
3887 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3888 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3889 break; 3894 break;
3890#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3891 case XTerm_Color_BD:
3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893 break;
3894 case XTerm_Color_UL:
3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896 break;
3897 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3898 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);
3899 break; 3906 break;
3900 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3902 break; 3909 break;
3903#endif 3910#endif
3904#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3905 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3907 check_our_parents (); 3915 check_our_parents ();
3916
3908 if (am_transparent) 3917 if (am_transparent)
3909 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3910 break;
3911#endif
3912 3919
3920 break;
3921#endif
3922
3913 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3914 if (*str != ';') 3925 if (*str != ';')
3915 { 3926 {
3916#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3917 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3918 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3919#endif
3920 scr_touch (true); 3930 scr_touch (true);
3931#endif
3921 } 3932 }
3933
3934 int changed = 0;
3935
3922 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3923 { 3937 {
3924 str++; 3938 str++;
3925#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3926 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3927#endif 3941#endif
3928 } 3942 }
3929 3943
3930 if (changed) 3944 if (changed)
3931 { 3945 {
3932#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3933 resize_pixmap (); 3947 resize_pixmap ();
3934#endif
3935 scr_touch (true); 3948 scr_touch (true);
3949#endif
3936 } 3950 }
3951 }
3937 break; 3952 break;
3938 3953
3939 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3940 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3941 break; 3956 break;
3942 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3943 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3944 break; 3959 break;
3945 3960
3946 case XTerm_logfile: 3961 case XTerm_logfile:
3947 // TODO, when secure mode? 3962 // TODO, when secure mode?
3948 break; 3963 break;
3949 3964
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0 3965#if 0
3957 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3958 { 3967 {
3959 int fd; 3968 int fd;
3960 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)
3961 { 3970 {
3962 scr_dump (fd); 3971 scr_dump (fd);
… …
3973 case URxvt_italicFont: 3982 case URxvt_italicFont:
3974 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3975#endif 3984#endif
3976 if (query) 3985 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3979 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3980 resp); 3989 resp);
3981 else 3990 else
3982 { 3991 {
3983 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3986 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3987 set_fonts (); 3996 set_fonts ();
3988 } 3997 }
3989 break; 3998 break;
3990 3999
3991#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
3992 case URxvt_locale: 4009 case URxvt_locale:
3993 if (query) 4010 if (query)
3994 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);
3995 else 4012 else
3996 { 4013 {
3997 set_locale (str); 4014 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3999 init_xlocale (); 4016 init_xlocale ();
4000 } 4017 }
4001 break; 4018 break;
4002 4019
4003 case URxvt_view_up: 4020 case URxvt_view_up:
… …
4014 break; 4031 break;
4015#endif 4032#endif
4016 4033
4017#if ENABLE_PERL 4034#if ENABLE_PERL
4018 case URxvt_perl: 4035 case URxvt_perl:
4019 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)))
4020 ; // no responses yet 4037 ; // no responses yet
4021 break; 4038 break;
4022#endif 4039#endif
4023 } 4040 }
4024} 4041}
… …
4056 return state; 4073 return state;
4057} 4074}
4058 4075
4059/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
4060void 4077void
4061rxvt_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)
4062{ 4079{
4063 unsigned int i, j; 4080 unsigned int i, j;
4064 int state; 4081 int state;
4065 4082
4066 static const struct 4083 static const struct
… …
4077 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
4078 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
4079 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
4081 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
4082#ifdef menuBar_esc
4083 { menuBar_esc, PrivMode_menuBar },
4084#endif
4085 // 18, 19 printing-related 4099 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
4087#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
4088 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
4089#endif 4103#endif
… …
4136 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
4137 switch (arg[i]) 4151 switch (arg[i])
4138 { 4152 {
4139#if ENABLE_STYLES 4153#if ENABLE_STYLES
4140 case 1021: 4154 case 1021:
4141 if (mode) 4155 set_option (Opt_intensityStyles, mode);
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145 4156
4146 scr_touch (true); 4157 scr_touch (true);
4147 break; 4158 break;
4148#endif 4159#endif
4149 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4150 case 1049: 4161 case 1049:
4151 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4152 if (mode == 0) 4163 if (mode == 0)
4153 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4154 else if (mode == 1) 4165 else if (mode == 1)
4155 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4156 break; 4167 break;
… …
4171 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
4172 if (priv_modes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
4173 set_widthheight (((state ? 132 : 80) * fwidth), height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
4174 break; 4185 break;
4175 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
4176 if (!state) 4187 set_option (Opt_jumpScroll, !state);
4177 SET_OPTION (Opt_jumpScroll);
4178 else
4179 CLR_OPTION (Opt_jumpScroll);
4180 break; 4188 break;
4181 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4182 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4183 break; 4191 break;
4184 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4190 /* 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 */
4191 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4194 break; 4202 break;
4195#ifdef menuBar_esc
4196 case menuBar_esc:
4197#ifdef MENUBAR
4198 map_menuBar (state);
4199#endif
4200 break;
4201#endif
4202#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4203 case scrollBar_esc: 4204 case scrollBar_esc:
4204 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4205 { 4206 {
4206 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4225#if 0 4226#if 0
4226 case 1001: 4227 case 1001:
4227 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
4228#endif 4229#endif
4229 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
4230 if (!state) 4231 set_option (Opt_scrollTtyOutput, !state);
4231 SET_OPTION (Opt_scrollTtyOutput);
4232 else
4233 CLR_OPTION (Opt_scrollTtyOutput);
4234 break; 4232 break;
4235 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4236 if (state) 4234 set_option (Opt_scrollTtyKeypress, state);
4237 SET_OPTION (Opt_scrollTtyKeypress);
4238 else
4239 CLR_OPTION (Opt_scrollTtyKeypress);
4240 break; 4235 break;
4241 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4242 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4243 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4244 scr_erase_screen (2); 4239 scr_erase_screen (2);
4245 scr_change_screen (state); 4240 scr_change_screen (state);
4246 break; 4241 break;
4247 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4248 scr_change_screen (state); 4243 scr_change_screen (state);
4249 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4250 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4251 scr_erase_screen (2); 4246 scr_erase_screen (2);
4252 break; 4247 break;
4253 default: 4248 default:
4254 break; 4249 break;
… …
4382 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4383 break; 4378 break;
4384 4379
4385 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4386 4381
4387#if ENABLE_FRILLS 4382#if !ENABLE_MINIMAL
4388 case 90: 4383 case 90:
4389 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4390 case 92: 4385 case 92:
4391 case 93: 4386 case 93:
4392 case 94: 4387 case 94:
… …
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455 4450
4456void 4451void
4457rxvt_term::tt_write (const char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4458{ 4453{
4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4455 return;
4456
4457 if (pty->pty < 0)
4458 return;
4459
4459 if (v_buflen == 0) 4460 if (v_buflen == 0)
4460 { 4461 {
4461 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));
4462 4463
4463 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4464 return; 4465 return;
4465 4466
4466 data += written; 4467 data += written;
… …
4475 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4476} 4477}
4477 4478
4478void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4479{ 4480{
4480 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));
4481 4482
4482 if (written > 0) 4483 if (written > 0)
4483 { 4484 {
4484 v_buflen -= written; 4485 v_buflen -= written;
4485 4486

Diff Legend

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