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.239 by root, Fri Jan 6 03:02:22 2006 UTC vs.
Revision 1.314 by root, Thu Jul 6 23:48:11 2006 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);
… …
867#endif 871#endif
868 /* nil */ ; 872 /* nil */ ;
869 } 873 }
870 } 874 }
871 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
872 if (len <= 0) 879 if (len <= 0)
873 return; /* not mapped */ 880 return; /* not mapped */
874 881
875 if (OPTION (Opt_scrollTtyKeypress)) 882 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 883 if (view_start)
… …
902 { 909 {
903 const char ch = C0_ESC; 910 const char ch = C0_ESC;
904 tt_write (&ch, 1); 911 tt_write (&ch, 1);
905 } 912 }
906 913
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); 914 tt_write (kbuf, (unsigned int)len);
918} 915}
919/*}}} */
920 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 995unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 997{
927 unsigned int n, s; 998 unsigned int n, s;
928 999
… …
969 1040
970 if (want_refresh) 1041 if (want_refresh)
971 { 1042 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 { 1044 {
974 int row = -view_start; 1045 int row = view_start;
1046 int end_row = row + nrow;
975 1047
976 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
977 --row; 1049 --row;
978 1050
979 while (row < -view_start + nrow) 1051 do
980 { 1052 {
981 int start_row = row; 1053 int start_row = row;
982 line_t *l; 1054 line_t *l;
983 1055
984 do 1056 do
985 { 1057 {
986 l = &ROW (row); 1058 l = &ROW (row++);
987 1059
988 if (!(l->f & LINE_FILTERED)) 1060 if (!(l->f & LINE_FILTERED))
989 { 1061 {
990 // line not filtered, mark it as filtered 1062 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED; 1063 l->f |= LINE_FILTERED;
992 while (l->is_longer ()) 1064 while (l->is_longer ())
993 { 1065 {
994 l = &ROW (++row); 1066 l = &ROW (row++);
995 l->f |= LINE_FILTERED; 1067 l->f |= LINE_FILTERED;
996 } 1068 }
997 1069
998 // and filter it 1070 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000 1072
1001 break; 1073 break;
1002 } 1074 }
1003 } 1075 }
1004 while (l->is_longer ()); 1076 while (l->is_longer () && row < end_row);
1005
1006 row++;
1007 } 1077 }
1078 while (row < end_row);
1008 1079 }
1009 }
1010 1080
1011 scr_refresh (refresh_type); 1081 scr_refresh ();
1012 scrollbar_show (1); 1082 scrollbar_show (1);
1013#ifdef USE_XIM 1083#ifdef USE_XIM
1014 IMSendSpot (); 1084 IMSendSpot ();
1015#endif 1085#endif
1016 } 1086 }
… …
1019} 1089}
1020 1090
1021void 1091void
1022rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1023{ 1093{
1024 SET_R (this); 1094 make_current ();
1025 SET_LOCALE (locale);
1026 1095
1027 display->flush (); 1096 display->flush ();
1028 1097
1029 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1031} 1100}
1032 1101
1033void 1102void
1034rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1035{ 1104{
1036 SET_R (this); 1105 make_current ();
1037 SET_LOCALE (locale);
1038 1106
1039 refresh_limit = 1; 1107 refresh_limit = 1;
1040 refresh_count = 0; 1108 refresh_count = 0;
1041 flush (); 1109 flush ();
1042} 1110}
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1115{
1048 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1117 want_refresh = 1;
1050 1118
1051 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1120}
1053#endif 1121#endif
1054 1122
1055#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1056void 1124void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1139{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1142 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1143 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1145 }
1079} 1146}
1080#endif 1147#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1152{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1154 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1156 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1158 }
1093} 1159}
1094#endif 1160#endif
… …
1099{ 1165{
1100 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1169 {
1104 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1107 1172
1108 refresh_type |= SMOOTH_REFRESH;
1109 want_refresh = 1; 1173 want_refresh = 1;
1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111 } 1175 }
1112} 1176}
1113#endif 1177#endif
1114 1178
1115#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1116static struct event_handler 1180static struct event_handler
1117{ 1181{
1118 check_watcher cw_yield; 1182 check_watcher yield_ev;
1119 1183
1120 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1121 { 1185 {
1122 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1123 w.stop (); 1194 w.stop ();
1124 } 1195 }
1125 1196
1126 event_handler () 1197 event_handler ()
1127 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1128 { 1199 {
1129 } 1200 }
1130} event_handler; 1201} event_handler;
1131#endif 1202#endif
1132 1203
… …
1143 1214
1144 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1145 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1147 1218
1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149 1220
1150 if (r > 0) 1221 if (r > 0)
1151 { 1222 {
1152 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1153 return true; 1224 return true;
1154 } 1225 }
1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 { 1227 {
1157#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1158 if (display->is_local) 1229 if (display->is_local)
1159 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1160#endif 1231#endif
1161 } 1232 }
1162 else 1233 else
1163 { 1234 {
1164 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1171} 1242}
1172 1243
1173void 1244void
1174rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1175{ 1246{
1176 SET_R (this); 1247 make_current ();
1177 SET_LOCALE (locale);
1178 1248
1179 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1180 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1181 while (pty_fill ()) 1251 while (pty_fill ())
1182 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1187} 1257}
1188 1258
1189void 1259void
1190rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1191{ 1261{
1192 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1193 recolour_cursor (); 1263 recolour_cursor ();
1194 1264
1195#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1196 hidden_pointer = 0; 1266 hidden_pointer = 0;
1197 1267
… …
1202 1272
1203#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1204void 1274void
1205rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1206{ 1276{
1207 if (! OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1208 return; 1278 return;
1209 1279
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1211 XFlush (display->display); 1281 XFlush (dpy);
1212 1282
1213 hidden_pointer = 1; 1283 hidden_pointer = 1;
1214} 1284}
1215 1285
1216void 1286void
1217rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1218{ 1288{
1219 SET_R (this); 1289 make_current ();
1220 SET_LOCALE (locale);
1221 1290
1222 pointer_blank (); 1291 pointer_blank ();
1223} 1292}
1224#endif 1293#endif
1225 1294
… …
1290 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1291 (32 + x + 1), 1360 (32 + x + 1),
1292 (32 + y + 1)); 1361 (32 + y + 1));
1293} 1362}
1294 1363
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 */ 1364/*{{{ process an X event */
1306void 1365void
1307rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1308{ 1367{
1309 dDisp; 1368 make_current ();
1310 1369
1311 SET_R (this); 1370 dLocal (Display *, dpy);
1312 SET_LOCALE (locale);
1313 1371
1314#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 if (hidden_cursor) 1375 return;
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322 1376
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // 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; 1378 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1380 unsigned int unused_mask;
1344 1381
1345 switch (ev.type) 1382 switch (ev.type)
1346 { 1383 {
1347 case KeyPress: 1384 case KeyPress:
1348#if ISO_14755 1385 key_press (ev.xkey);
1349 if (!(iso14755buf & ISO_14755_52))
1350#endif
1351 lookup_key (ev.xkey);
1352
1353 break; 1386 break;
1354 1387
1355 case KeyRelease: 1388 case KeyRelease:
1356 { 1389 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; 1390 break;
1424 }
1425 1391
1426 case ButtonPress: 1392 case ButtonPress:
1427 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1428 break; 1394 break;
1429 1395
… …
1431 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1432 break; 1398 break;
1433 1399
1434 case ClientMessage: 1400 case ClientMessage:
1435 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1438 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1439 destroy (); 1411 destroy ();
1412 }
1440#if ENABLE_EWMH 1413#if ENABLE_EWMH
1441 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1445#endif 1429#endif
1446 } 1430 }
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; 1431 break;
1483 1432
1484 case MappingNotify: 1433 case MappingNotify:
1485 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1486 break; 1435 break;
… …
1519 break; 1468 break;
1520 1469
1521 case ConfigureNotify: 1470 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1523 { 1472 {
1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ; 1474 ;
1526 1475
1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1528 { 1477 {
1529 seen_resize = 1; 1478 seen_resize = 1;
1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531 } 1480 }
1532 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1535 check_our_parents (); 1486 check_our_parents ();
1536#endif 1487#endif
1537 } 1488 }
1538 break; 1489 break;
1539 1490
1540 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1543 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1544 1496
1545 break; 1497 break;
1546 1498
1547 case SelectionClear: 1499 case SelectionClear:
1548 selection_clear (); 1500 selection_clear ();
… …
1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554 break; 1506 break;
1555 1507
1556 case SelectionRequest: 1508 case SelectionRequest:
1557 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1510 break;
1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1558 break; 1518 break;
1559 1519
1560 case UnmapNotify: 1520 case UnmapNotify:
1561 mapped = 0; 1521 mapped = 0;
1562#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1564#endif 1524#endif
1565 break; 1525 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; 1526 break;
1573 1527
1574#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1575 case ReparentNotify: 1529 case ReparentNotify:
1576 rootwin_cb (ev); 1530 rootwin_cb (ev);
… …
1582 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1583 { 1537 {
1584 do 1538 do
1585 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1586 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1588 1542
1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590 1544
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1594 1548
1595 scr_refresh (refresh_type); 1549 want_refresh = 1;
1596 } 1550 }
1597 else 1551 else
1598 { 1552 {
1599 XEvent unused_event; 1553 XEvent unused_event;
1600 1554
1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1602 ; 1556 ;
1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1604 ; 1558 ;
1605 1559
1606 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1607 { 1561 {
1608 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1609 scrollbar_show (0); 1563 scrollbar_show (0);
1610 } 1564 }
1611#ifdef MENUBAR
1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613 menubar_expose ();
1614#endif
1615 1565
1616#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1619#endif 1569#endif
1620 } 1570 }
1621 break; 1571 break;
1622 1572
1623 case MotionNotify: 1573 case MotionNotify:
1624#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1575 if (hidden_pointer)
1626 pointer_unblank (); 1576 pointer_unblank ();
1627#endif 1577#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) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1579 break;
1637 1580
1638 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1639 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1587 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1643 ; 1589 ;
1644 1590
1645 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1646 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1649 &ev.xbutton.state); 1595 &ev.xbutton.state);
1650#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1714#endif 1660#endif
1715 } 1661 }
1716 } 1662 }
1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1718 { 1664 {
1719 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1720 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1721 ; 1667 ;
1722 1668
1723 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1724 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1725 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1726 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1727 &unused_mask); 1673 &unused_mask);
1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729 scrollbar_size ()); 1675 scrollbar_size ());
1730 scr_refresh (refresh_type); 1676 want_refresh = 1;
1731 refresh_limit = 0; 1677 refresh_limit = 0;
1732 scrollbar_show (1); 1678 scrollbar_show (1);
1733 } 1679 }
1734 break; 1680 break;
1735 } 1681 }
1682
1683#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1685 {
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif
1695
1696#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 {
1699 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease)
1702 if (hidden_pointer)
1703 pointer_unblank ();
1704
1705 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank ();
1707 }
1708#endif
1736} 1709}
1737 1710
1738void 1711void
1739rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1740{ 1713{
1741 if (!focus) 1714 if (!focus)
1742 { 1715 {
1743 focus = 1; 1716 focus = 1;
1744 want_refresh = 1; 1717 want_refresh = 1;
1745 1718
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1720
1748#if USE_XIM 1721#if USE_XIM
1749 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1750 { 1723 {
1751 IMSetStatusPosition (); 1724 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1753 } 1726 }
1754#endif 1727#endif
1755#if CURSOR_BLINK 1728#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1731#endif
1759#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1761 { 1734 {
1762 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
… …
1802 } 1775 }
1803#endif 1776#endif
1804 } 1777 }
1805} 1778}
1806 1779
1807#if TRANSPARENT 1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1791}
1792
1793#if TRANSPARENT || ENABLE_PERL
1808void 1794void
1809rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1796{
1811 SET_R (this); 1797 make_current ();
1812 SET_LOCALE (locale);
1813 1798
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return;
1802
1803# if TRANSPARENT
1814 switch (ev.type) 1804 switch (ev.type)
1815 { 1805 {
1816 case PropertyNotify: 1806 case PropertyNotify:
1817 /* 1807 /*
1818 * if user used some Esetroot compatible prog to set the root bg, 1808 * if user used some Esetroot compatible prog to set the root bg,
… …
1826 case ReparentNotify: 1816 case ReparentNotify:
1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1828 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1829 break; 1819 break;
1830 } 1820 }
1821# endif
1831} 1822}
1832#endif 1823#endif
1833 1824
1834void 1825void
1835rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
… …
1844 /* 1835 /*
1845 * VT window processing of button press 1836 * VT window processing of button press
1846 */ 1837 */
1847 if (ev.window == vt) 1838 if (ev.window == vt)
1848 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1849#if ISO_14755 1843#if ISO_14755
1850 // 5.4 1844 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 { 1846 {
1853 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
… …
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1859#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1860 if (ev.button == MEvent.button && clickintime)
1867 { 1861 {
1868 /* same button, within alloted time */ 1862 /* same button, within alloted time */
1869 MEvent.clicks++; 1863 MEvent.clicks++;
1864
1870 if (MEvent.clicks > 1) 1865 if (MEvent.clicks > 1)
1871 { 1866 {
1872 /* only report double clicks */ 1867 /* only report double clicks */
1873 MEvent.clicks = 2; 1868 MEvent.clicks = 2;
1874 mouse_report (ev); 1869 mouse_report (ev);
… …
1894 else 1889 else
1895 { 1890 {
1896 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1898 1893
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1894 switch (ev.button)
1901 { 1895 {
1902 case Button1: 1896 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1901#else
1908 selection.rect = false; 1902 selection.rect = false;
1909#endif 1903#endif
1910 1904
1911 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1907 {
1914 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1916 else 1910 else
1917 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1918 } 1912 }
1919 else 1913 else
1920 { 1914 {
1921 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1916 MEvent.clicks++;
1923 else 1917 else
1924 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1925 1919
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1921 }
1928 1922
1929 MEvent.button = Button1; 1923 MEvent.button = Button1;
1930 break; 1924 break;
1931 1925
1932 case Button3: 1926 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1935 else 1929 else
1936 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1937 1931
1938 MEvent.button = Button3; 1932 MEvent.button = Button3;
1939 break; 1933 break;
1940 } 1934 }
1941 } 1935 }
1942 1936
1943 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1944 return; 1938 return;
1945 } 1939 }
1946 1940
… …
2082 } 2076 }
2083 2077
2084 break; 2078 break;
2085 } 2079 }
2086 } 2080 }
2081
2087 return; 2082 return;
2088 } 2083 }
2089#if MENUBAR
2090 /*
2091 * Menubar window processing of button press
2092 */
2093 if (isMenuBarWindow (ev.window))
2094 menubar_control (ev);
2095#endif
2096} 2084}
2097 2085
2098void 2086void
2099rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2100{ 2088{
… …
2106 2094
2107 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2108 { 2096 {
2109 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2110 scrollbar_show (0); 2098 scrollbar_show (0);
2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112 refresh_type &= ~SMOOTH_REFRESH;
2113#endif
2114 } 2099 }
2115 2100
2116#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2119#endif 2104#endif
2120 2105
2121 if (ev.window == vt) 2106 if (ev.window == vt)
2122 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2123#if ISO_14755 2111#if ISO_14755
2124 // 5.4 2112 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return; 2114 return;
2127#endif 2115#endif
2116
2128 if (reportmode) 2117 if (reportmode)
2129 { 2118 {
2130 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2131 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2132 if (ev.button >= 4) 2121 if (ev.button >= 4)
… …
2162 { 2151 {
2163 case Button1: 2152 case Button1:
2164 case Button3: 2153 case Button3:
2165 selection_make (ev.time); 2154 selection_make (ev.time);
2166 break; 2155 break;
2156
2167 case Button2: 2157 case Button2:
2168 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2169 break; 2160 break;
2161
2170#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2171 case Button4: 2163 case Button4:
2172 case Button5: 2164 case Button5:
2173 { 2165 {
2174 int i; 2166 int i;
… …
2196 slip_wheel_ev.start (); 2188 slip_wheel_ev.start ();
2197 } 2189 }
2198 else 2190 else
2199 { 2191 {
2200# endif 2192# endif
2201# ifdef JUMP_MOUSE_WHEEL
2202 scr_page (v, i); 2193 scr_page (v, i);
2203 scr_refresh (SMOOTH_REFRESH);
2204 scrollbar_show (1); 2194 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 2195# ifdef MOUSE_SLIP_WHEELING
2214 } 2196 }
2215#endif 2197# endif
2216 } 2198 }
2217 break; 2199 break;
2218#endif 2200#endif
2219 } 2201 }
2220 } 2202 }
2221#ifdef MENUBAR
2222 else if (isMenuBarWindow (ev.window))
2223 menubar_control (ev);
2224#endif
2225} 2203}
2226 2204
2227#ifdef TRANSPARENT 2205#ifdef TRANSPARENT
2228#if TINTING 2206#if TINTING
2229/* taken from aterm-0.4.2 */ 2207/* taken from aterm-0.4.2 */
2230 2208
2231typedef uint32_t RUINT32T; 2209typedef uint32_t RUINT32T;
2232 2210
2233void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2234{ 2212{
2235 int sh_r, sh_g, sh_b; 2213 int sh_r, sh_g, sh_b;
2236 RUINT32T mask_r, mask_g, mask_b; 2214 RUINT32T mask_r, mask_g, mask_b;
2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240 int i; 2218 int i;
2241 2219
2242 Visual *visual = display->visual; 2220 Visual *visual = term->visual;
2243 2221
2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2245 2223
2246 /* for convenience */ 2224 /* for convenience */
2247 mask_r = visual->red_mask; 2225 mask_r = visual->red_mask;
… …
2468 Atom atype; 2446 Atom atype;
2469 unsigned char *prop = NULL; 2447 unsigned char *prop = NULL;
2470 Window root, oldp, *list; 2448 Window root, oldp, *list;
2471 Pixmap rootpixmap = None; 2449 Pixmap rootpixmap = None;
2472 XWindowAttributes wattr, wrootattr; 2450 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2474 2451
2475 pchanged = 0; 2452 pchanged = 0;
2476 2453
2477 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2478 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2479 2456
2480 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2481 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2482 2459
2483 XGetWindowAttributes (disp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2484 2461
2485 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2486 { 2463 {
2487 if (am_transparent) 2464 if (am_transparent)
2488 { 2465 {
2489 pchanged = 1; 2466 pchanged = 1;
2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2491 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2492 } 2469 }
2493 2470
2494 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2495 } 2472 }
2496 2473
2497 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2498 XSync (disp, False); 2475 XSync (dpy, False);
2499 2476
2500 /* 2477 /*
2501 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2502 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2503 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2504 */ 2481 */
2505 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2508 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2509 2486
2510 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2511 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2515 2492
2516 if (!i || prop == NULL 2493 if (!i || prop == NULL
2517#if TINTING 2494#if TINTING
2518 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2519#endif 2496#endif
2520 ) 2497 )
2521 have_pixmap = 0; 2498 have_pixmap = 0;
2522 else 2499 else
2523 { 2500 {
… …
2536 Window cr; 2513 Window cr;
2537 XImage *image; 2514 XImage *image;
2538 GC gc; 2515 GC gc;
2539 XGCValues gcvalue; 2516 XGCValues gcvalue;
2540 2517
2541 XTranslateCoordinates (disp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2542 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2543 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2544 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2545 nx = ny = 0; 2522 nx = ny = 0;
2546 2523
… …
2559 } 2536 }
2560 2537
2561 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2562 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563 2540
2564 XSync (disp, False); 2541 XSync (dpy, False);
2565 allowedxerror = -1; 2542 allowedxerror = -1;
2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2567 2544
2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2569 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2570 allowedxerror = 0; 2547 allowedxerror = 0;
2571 2548
… …
2574 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2575 { 2552 {
2576 pchanged = 1; 2553 pchanged = 1;
2577 if (pixmap != None) 2554 if (pixmap != None)
2578 { 2555 {
2579 XFreePixmap (disp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2580 pixmap = None; 2557 pixmap = None;
2581 } 2558 }
2582 } 2559 }
2583 2560
2584 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2585 } 2562 }
2586 else 2563 else
2587 { 2564 {
2588 if (pixmap != None) 2565 if (pixmap != None)
2589 XFreePixmap (disp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2590 2567
2591#if TINTING 2568#if TINTING
2592 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2593 { 2570 {
2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2596 2572
2573 rgba c;
2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2598 2575
2599 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2600 } 2577 }
2601#endif 2578#endif
2602 2579
2603 pixmap = XCreatePixmap (disp, vt, 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2604 szHint.width, szHint.height, image->depth);
2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2606 XPutImage (disp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2607 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2608 XFreeGC (disp, gc); 2584 XFreeGC (dpy, gc);
2609 XDestroyImage (image); 2585 XDestroyImage (image);
2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2611 XClearWindow (disp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2612 2588
2613 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2614 pchanged = 1; 2590 pchanged = 1;
2615 2591
2616 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2617 } 2593 }
2618 } 2594 }
2619 2595
2620 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2622 else 2598 else
2623 { 2599 {
2624 unsigned int n; 2600 unsigned int n;
2625 /* 2601 /*
2626 * InheritPixmap transparency 2602 * InheritPixmap transparency
2627 */ 2603 */
2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2629 { 2605 {
2630 oldp = parent[i]; 2606 oldp = parent[i];
2631 XQueryTree (disp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2632 &parent[i], &list, &n);
2633 XFree (list); 2608 XFree (list);
2634 2609
2635 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2636 { 2611 {
2637 if (oldp != None) 2612 if (oldp != None)
… …
2645 } 2620 }
2646 2621
2647 n = 0; 2622 n = 0;
2648 2623
2649 if (pchanged) 2624 if (pchanged)
2650 {
2651 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2652 { 2626 {
2653 XGetWindowAttributes (disp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2655 { 2630 {
2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2657 break; 2632 break;
2658 } 2633 }
2659 } 2634 }
2660 }
2661 2635
2662 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2663 { 2637 {
2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2666 am_transparent = 0; 2640 am_transparent = 0;
2667 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2668 } 2642 }
2669 else 2643 else
2670 { 2644 {
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++) 2645 for (n = 0; n < (unsigned int)i; n++)
2677 { 2646 {
2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2680 } 2649 }
2681 2650
2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2683 am_transparent = 1; 2652 am_transparent = 1;
2684 } 2653 }
2685 2654
2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2687 parent[i] = None; 2656 parent[i] = None;
2688 } 2657 }
2689 2658
2690 if (scrollBar.win) 2659 if (scrollBar.win)
2691 { 2660 {
2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2693 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2694 scrollbar_show (0); 2663 scrollbar_show (0);
2695 } 2664 }
2696 2665
2697 if (am_transparent) 2666 if (am_transparent)
… …
2709 2678
2710bool 2679bool
2711rxvt_term::cmd_parse () 2680rxvt_term::cmd_parse ()
2712{ 2681{
2713 bool flag = false; 2682 bool flag = false;
2714 unicode_t ch = NOCHAR; 2683 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2684 char *seq_begin; // remember start of esc-sequence here
2716 2685
2717 for (;;) 2686 for (;;)
2718 { 2687 {
2719 if (ch == NOCHAR) 2688 if (ch == NOCHAR)
… …
2740 if (seen_resize && cmd_pid) 2709 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2710 kill (-cmd_pid, SIGWINCH);
2742 } 2711 }
2743 2712
2744 /* Read a text string from the input buffer */ 2713 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2714 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2715 bool refreshnow = false;
2747 int nlines = 0; 2716 int nlines = 0;
2748 unicode_t *str = buf; 2717 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2718 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2719
2751 for (;;) 2720 for (;;)
2752 { 2721 {
2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2722 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754 break; 2723 break;
… …
2772 } 2741 }
2773 2742
2774 // scr_add_lines only works for nlines <= nrow - 1. 2743 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2744 if (nlines >= nrow - 1)
2776 { 2745 {
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2779 2749
2780 nlines = 0; 2750 nlines = 0;
2781 str = buf; 2751 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2752 eol = str + min (ncol, UBUFSIZ);
2783 } 2753 }
… …
2797 2767
2798 seq_begin = cmdbuf_ptr; 2768 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2769 ch = next_char ();
2800 } 2770 }
2801 2771
2772 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803 scr_add_lines (buf, nlines, str - buf); 2774 scr_add_lines (buf, str - buf, nlines);
2804 2775
2805 /* 2776 /*
2806 * If there have been a lot of new lines, then update the screen 2777 * 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. 2778 * 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 2779 * the number of pages between refreshes is refresh_limit, which
… …
2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814 refresh_limit++; 2785 refresh_limit++;
2815 else 2786 else
2816 { 2787 {
2817 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2818 scr_refresh (refresh_type); 2790 scr_refresh ();
2819 flush_ev.stop (); 2791 want_refresh = 1;
2820 } 2792 }
2821 } 2793 }
2822 2794
2823 } 2795 }
2824 else 2796 else
… …
2839 } 2811 }
2840 2812
2841 return flag; 2813 return flag;
2842} 2814}
2843 2815
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 2816// read the next character
2854unicode_t 2817wchar_t
2855rxvt_term::next_char () 2818rxvt_term::next_char () NOTHROW
2856{ 2819{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2820 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2821 {
2859 // assume 7-bit to be ascii ALWAYS 2822 // assume 7-bit to be ascii ALWAYS
2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2869 cmdbuf_ptr = cmdbuf_endp; 2832 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2833 break;
2871 } 2834 }
2872 2835
2873 if (len == (size_t)-1) 2836 if (len == (size_t)-1)
2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2837 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875 2838
2876 // assume wchar == unicode 2839 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2840 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2841 return wc & UNICODE_MASK;
2879 } 2842 }
2880 2843
2881 return NOCHAR; 2844 return NOCHAR;
2882} 2845}
2846
2847// read the next octet
2848uint32_t
2849rxvt_term::next_octet () NOTHROW
2850{
2851 return cmdbuf_ptr < cmdbuf_endp
2852 ? (unsigned char)*cmdbuf_ptr++
2853 : NOCHAR;
2854}
2855
2856static class out_of_input out_of_input;
2883 2857
2884/* rxvt_cmd_getc () - Return next input character */ 2858/* rxvt_cmd_getc () - Return next input character */
2885/* 2859/*
2886 * Return the next input character after first passing any keyboard input 2860 * Return the next input character after first passing any keyboard input
2887 * to the command. 2861 * to the command.
2888 */ 2862 */
2889unicode_t 2863wchar_t
2890rxvt_term::cmd_getc () 2864rxvt_term::cmd_getc () THROW ((class out_of_input))
2891{ 2865{
2892 unicode_t c = next_char (); 2866 wchar_t c = next_char ();
2893 2867
2894 if (c == NOCHAR) 2868 if (c == NOCHAR)
2895 throw out_of_input; 2869 throw out_of_input;
2896 2870
2897 return c; 2871 return c;
2898} 2872}
2899 2873
2900unicode_t 2874uint32_t
2901rxvt_term::cmd_get8 () 2875rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902{ 2876{
2903 unicode_t c = next_octet (); 2877 uint32_t c = next_octet ();
2904 2878
2905 if (c == NOCHAR) 2879 if (c == NOCHAR)
2906 throw out_of_input; 2880 throw out_of_input;
2907 2881
2908 return c; 2882 return c;
… …
3144 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3145 break; 3119 break;
3146 case '+': 3120 case '+':
3147 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3148 break; 3122 break;
3149#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3150 case '6': 3124 case '6':
3151 scr_backindex (); 3125 scr_backindex ();
3152 break; 3126 break;
3153#endif 3127#endif
3154 case '7': 3128 case '7':
3155 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3156 break; 3130 break;
3157 case '8': 3131 case '8':
3158 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3159 break; 3133 break;
3160#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3161 case '9': 3135 case '9':
3162 scr_forwardindex (); 3136 scr_forwardindex ();
3163 break; 3137 break;
3164#endif 3138#endif
3165 case '=': 3139 case '=':
… …
3175 break; 3149 break;
3176 3150
3177 /* 8.3.87: NEXT LINE */ 3151 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 3152 case C1_NEL: /* ESC E */
3179 { 3153 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 3154 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 3155 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 3156 }
3183 break; 3157 break;
3184 3158
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 3159 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 3160 case C1_ESA: /* ESC G */
… …
3327 ndef = get_byte_array_bit (csi_defaults, i); 3301 ndef = get_byte_array_bit (csi_defaults, i);
3328 for (p = 0; p < nargs; p++) 3302 for (p = 0; p < nargs; p++)
3329 if (arg[p] == -1) 3303 if (arg[p] == -1)
3330 arg[p] = ndef; 3304 arg[p] = ndef;
3331 3305
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 /* 3306 /*
3340 * private mode handling 3307 * private mode handling
3341 */ 3308 */
3342 if (priv) 3309 if (priv)
3343 { 3310 {
3344 switch (priv) 3311 switch (priv)
3345 { 3312 {
3346 case '>': 3313 case '>':
3347 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3315 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3321 // that we do not support xterm mouse reporting (should be 95 when we do).
3322 //
3323 tt_printf ("\033[>%d;94;0c", 'U');
3324 }
3349 break; 3325 break;
3350 case '?': 3326 case '?':
3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3352 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
3353 break; 3329 break;
… …
3556 break; 3532 break;
3557 case CSI_75: 3533 case CSI_75:
3558 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3559 break; 3535 break;
3560 3536
3561#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3562 case CSI_74: 3538 case CSI_74:
3563 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3564 break; 3540 break;
3565#endif 3541#endif
3566 3542
… …
3573 break; 3549 break;
3574 } 3550 }
3575} 3551}
3576/*}}} */ 3552/*}}} */
3577 3553
3578#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3579/* ARGSUSED */ 3555/* ARGSUSED */
3580void 3556void
3581rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3582{ 3558{
3583 int x, y; 3559 int x, y;
3584 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3585 Window wdummy; 3561 Window wdummy;
3586 dDisp; 3562
3563 dLocal (Display *, dpy);
3587 3564
3588 if (nargs == 0) 3565 if (nargs == 0)
3589 return; 3566 return;
3590 3567
3591 switch (args[0]) 3568 switch (args[0])
3592 { 3569 {
3593 /* 3570 /*
3594 * commands 3571 * commands
3595 */ 3572 */
3596 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3597 XMapWindow (disp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3598 break; 3575 break;
3599 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3600 XIconifyWindow (disp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3601 break; 3578 break;
3602 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3603 XMoveWindow (disp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3604 break; 3581 break;
3605 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3607 break; 3584 break;
3608 case 5: /* raise window */ 3585 case 5: /* raise window */
3609 XRaiseWindow (disp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3610 break; 3587 break;
3611 case 6: /* lower window */ 3588 case 6: /* lower window */
3612 XLowerWindow (disp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3613 break; 3590 break;
3614 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3615 scr_touch (true); 3592 scr_touch (true);
3616 break; 3593 break;
3617 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
… …
3624 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3625 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3626 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3627 break; 3604 break;
3628 3605
3629
3630 /* 3606 /*
3631 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3632 */ 3608 */
3633 case 11: /* report window state */ 3609 case 11: /* report window state */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3636 break; 3612 break;
3637 case 13: /* report window position */ 3613 case 13: /* report window position */
3638 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3639 XTranslateCoordinates (disp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3640 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3641 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3642 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3643 break; 3619 break;
3644 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3647 break; 3623 break;
3648 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3649 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3650 break; 3626 break;
… …
3652 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3653 break; 3629 break;
3654 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3655 { 3631 {
3656 char *s; 3632 char *s;
3657 XGetIconName (disp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3659 XFree (s); 3635 XFree (s);
3660 } 3636 }
3661 break; 3637 break;
3662 case 21: /* report window title */ 3638 case 21: /* report window title */
3663 { 3639 {
3664 char *s; 3640 char *s;
3665 XFetchName (disp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3643 XFree (s);
3668 } 3644 }
3669 break; 3645 break;
3670 } 3646 }
… …
3771void 3747void
3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3748rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3773{ 3749{
3774 if (str[0] == '?' && !str[1]) 3750 if (str[0] == '?' && !str[1])
3775 { 3751 {
3776 unsigned short r, g, b; 3752 rgba c;
3777 pix_colors_focused[color].get (display, r, g, b); 3753 pix_colors_focused[color].get (c);
3754
3755#if XFT
3756 if (c.a != rgba::MAX_CC)
3757 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3758 else
3759#endif
3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3760 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3779 } 3761 }
3780 else 3762 else
3781 set_window_color (color, str); 3763 set_window_color (color, str);
3782} 3764}
3783 3765
… …
3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3786 */ 3768 */
3787void 3769void
3788rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3770rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789{ 3771{
3790 int changed = 0;
3791 int color; 3772 int color;
3792 char *buf, *name; 3773 char *buf, *name;
3793 bool query = str[0] == '?' && !str[1]; 3774 bool query = str[0] == '?' && !str[1];
3794 int saveop = op; 3775 int saveop = op;
3795 dDisp; 3776
3777 dLocal (Display *, dpy);
3796 3778
3797 assert (str != NULL); 3779 assert (str != NULL);
3780
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return;
3783
3798 switch (op) 3784 switch (op)
3799 { 3785 {
3800 case XTerm_name: 3786 case XTerm_name:
3801 set_title (str); 3787 set_title (str);
3802 /* FALLTHROUGH */ 3788 /* FALLTHROUGH */
… …
3816 unsigned long bytes_after; 3802 unsigned long bytes_after;
3817 unsigned char *value = 0; 3803 unsigned char *value = 0;
3818 const char *str = ""; 3804 const char *str = "";
3819 3805
3820 if (prop 3806 if (prop
3821 && XGetWindowProperty (disp, parent[0], 3807 && XGetWindowProperty (dpy, parent[0],
3822 prop, 0, 1<<16, 0, AnyPropertyType, 3808 prop, 0, 1<<16, 0, AnyPropertyType,
3823 &actual_type, &actual_format, 3809 &actual_type, &actual_format,
3824 &nitems, &bytes_after, &value) == Success 3810 &nitems, &bytes_after, &value) == Success
3825 && actual_type != None 3811 && actual_type != None
3826 && actual_format == 8) 3812 && actual_format == 8)
3827 str = (const char *)(value); 3813 str = (const char *)(value);
3828 3814
3829 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3815 tt_printf ("\033]%d;%s%c", op, str, resp);
3830 3816
3831 XFree (value); 3817 XFree (value);
3832 } 3818 }
3833 else 3819 else
3834 { 3820 {
… …
3838 { 3824 {
3839 *eq = 0; 3825 *eq = 0;
3840 set_utf8_property (display->atom (str), eq + 1); 3826 set_utf8_property (display->atom (str), eq + 1);
3841 } 3827 }
3842 else 3828 else
3843 XDeleteProperty (disp, parent[0], 3829 XDeleteProperty (dpy, parent[0],
3844 display->atom (str)); 3830 display->atom (str));
3845 } 3831 }
3846 break; 3832 break;
3847 3833
3848 case XTerm_Color: 3834 case XTerm_Color:
… …
3850 { 3836 {
3851 if ((name = strchr (buf, ';')) == NULL) 3837 if ((name = strchr (buf, ';')) == NULL)
3852 break; 3838 break;
3853 3839
3854 *name++ = '\0'; 3840 *name++ = '\0';
3855 color = atoi (buf); 3841 color = atoi (buf) + minCOLOR;
3856 3842
3857 if (color < 0 || color >= TOTAL_COLORS) 3843 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858 break; 3844 break;
3859 3845
3860 if ((buf = strchr (name, ';')) != NULL) 3846 if ((buf = strchr (name, ';')) != NULL)
3861 *buf++ = '\0'; 3847 *buf++ = '\0';
3862 3848
3863 if (name[0] == '?' && !name[1]) 3849 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 } 3850 }
3872 break; 3851 break;
3873 case XTerm_Color00: 3852 case XTerm_Color00:
3874 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (op, Color_fg, str, resp);
3875 break; 3854 break;
3876 case XTerm_Color01: 3855 case XTerm_Color01:
3877 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (op, Color_bg, str, resp);
3878 break; 3857 break;
3879#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3880 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3881 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (op, Color_cursor, str, resp);
3882 break; 3861 break;
3883#endif 3862#endif
3884 case XTerm_Color_pointer_fg: 3863 case XTerm_Color_pointer_fg:
3885 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3864 process_color_seq (op, Color_pointer_fg, str, resp);
3886 break; 3865 break;
3887 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3888 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (op, Color_pointer_bg, str, resp);
3889 break; 3868 break;
3890#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#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: 3870 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (op, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3899 break; 3880 break;
3900 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (op, Color_IT, str, resp);
3902 break; 3883 break;
3903#endif 3884#endif
3904#if TRANSPARENT && TINTING 3885#if TRANSPARENT && TINTING
3905 case URxvt_Color_tint: 3886 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3887 process_color_seq (op, Color_tint, str, resp);
3888
3907 check_our_parents (); 3889 check_our_parents ();
3890
3908 if (am_transparent) 3891 if (am_transparent)
3909 want_full_refresh = want_refresh = 1; 3892 want_full_refresh = want_refresh = 1;
3910 break;
3911#endif
3912 3893
3894 break;
3895#endif
3896
3913 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3914 if (*str != ';') 3899 if (*str != ';')
3915 { 3900 {
3916#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3917 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3918 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3919#endif
3920 scr_touch (true); 3904 scr_touch (true);
3905#endif
3921 } 3906 }
3907
3908 int changed = 0;
3909
3922 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3923 { 3911 {
3924 str++; 3912 str++;
3925#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3926 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3927#endif 3915#endif
3928 } 3916 }
3929 3917
3930 if (changed) 3918 if (changed)
3931 { 3919 {
3932#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3933 resize_pixmap (); 3921 resize_pixmap ();
3934#endif
3935 scr_touch (true); 3922 scr_touch (true);
3923#endif
3936 } 3924 }
3925 }
3937 break; 3926 break;
3938 3927
3939 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3940 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3941 break; 3930 break;
3942 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3943 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3944 break; 3933 break;
3945 3934
3946 case XTerm_logfile: 3935 case XTerm_logfile:
3947 // TODO, when secure mode? 3936 // TODO, when secure mode?
3948 break; 3937 break;
3949 3938
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 3939#if 0
3957 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3958 { 3941 {
3959 int fd; 3942 int fd;
3960 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3961 { 3944 {
3962 scr_dump (fd); 3945 scr_dump (fd);
… …
3986 allocated.push_back ((void *)res); 3969 allocated.push_back ((void *)res);
3987 set_fonts (); 3970 set_fonts ();
3988 } 3971 }
3989 break; 3972 break;
3990 3973
3991#if ENABLE_FRILLS 3974 case URxvt_version:
3975 if (query)
3976 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3977 op,
3978 rs[Rs_name], VERSION[0], VERSION[2],
3979 resp);
3980 break;
3981
3982#if !ENABLE_MINIMAL
3992 case URxvt_locale: 3983 case URxvt_locale:
3993 if (query) 3984 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3995 else 3986 else
3996 { 3987 {
3997 set_locale (str); 3988 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8); 3989 pty->set_utf8_mode (enc_utf8);
3999 init_xlocale (); 3990 init_xlocale ();
4000 } 3991 }
4001 break; 3992 break;
4002 3993
4003 case URxvt_view_up: 3994 case URxvt_view_up:
… …
4014 break; 4005 break;
4015#endif 4006#endif
4016 4007
4017#if ENABLE_PERL 4008#if ENABLE_PERL
4018 case URxvt_perl: 4009 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4020 ; // no responses yet 4011 ; // no responses yet
4021 break; 4012 break;
4022#endif 4013#endif
4023 } 4014 }
4024} 4015}
… …
4056 return state; 4047 return state;
4057} 4048}
4058 4049
4059/* we're not using priv _yet_ */ 4050/* we're not using priv _yet_ */
4060void 4051void
4061rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4052rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4062{ 4053{
4063 unsigned int i, j; 4054 unsigned int i, j;
4064 int state; 4055 int state;
4065 4056
4066 static const struct 4057 static const struct
… …
4077 { 5, PrivMode_rVideo }, 4068 { 5, PrivMode_rVideo },
4078 { 6, PrivMode_relOrigin }, 4069 { 6, PrivMode_relOrigin },
4079 { 7, PrivMode_Autowrap }, 4070 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode 4071 // 8, bi-directional support mode
4081 { 9, PrivMode_MouseX10 }, 4072 { 9, PrivMode_MouseX10 },
4082#ifdef menuBar_esc
4083 { menuBar_esc, PrivMode_menuBar },
4084#endif
4085 // 18, 19 printing-related 4073 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor }, 4074 { 25, PrivMode_VisibleCursor },
4087#ifdef scrollBar_esc 4075#ifdef scrollBar_esc
4088 { scrollBar_esc, PrivMode_scrollBar }, 4076 { scrollBar_esc, PrivMode_scrollBar },
4089#endif 4077#endif
… …
4136 /* extra handling for values with state unkept */ 4124 /* extra handling for values with state unkept */
4137 switch (arg[i]) 4125 switch (arg[i])
4138 { 4126 {
4139#if ENABLE_STYLES 4127#if ENABLE_STYLES
4140 case 1021: 4128 case 1021:
4141 if (mode) 4129 set_option (Opt_intensityStyles, mode);
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145 4130
4146 scr_touch (true); 4131 scr_touch (true);
4147 break; 4132 break;
4148#endif 4133#endif
4149 case 1048: /* alternative cursor save */ 4134 case 1048: /* alternative cursor save */
… …
4171 case 3: /* 80/132 */ 4156 case 3: /* 80/132 */
4172 if (priv_modes & PrivMode_132OK) 4157 if (priv_modes & PrivMode_132OK)
4173 set_widthheight (((state ? 132 : 80) * fwidth), height); 4158 set_widthheight (((state ? 132 : 80) * fwidth), height);
4174 break; 4159 break;
4175 case 4: /* smooth scrolling */ 4160 case 4: /* smooth scrolling */
4176 if (!state) 4161 set_option (Opt_jumpScroll, !state);
4177 SET_OPTION (Opt_jumpScroll);
4178 else
4179 CLR_OPTION (Opt_jumpScroll);
4180 break; 4162 break;
4181 case 5: /* reverse video */ 4163 case 5: /* reverse video */
4182 scr_rvideo_mode (state); 4164 scr_rvideo_mode (state);
4183 break; 4165 break;
4184 case 6: /* relative/absolute origins */ 4166 case 6: /* relative/absolute origins */
… …
4190 /* case 8: - auto repeat, can't do on a per window basis */ 4172 /* case 8: - auto repeat, can't do on a per window basis */
4191 case 9: /* X10 mouse reporting */ 4173 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 4175 priv_modes &= ~PrivMode_MouseX11;
4194 break; 4176 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 4177#ifdef scrollBar_esc
4203 case scrollBar_esc: 4178 case scrollBar_esc:
4204 if (scrollbar_mapping (state)) 4179 if (scrollbar_mapping (state))
4205 { 4180 {
4206 resize_all_windows (0, 0, 0); 4181 resize_all_windows (0, 0, 0);
… …
4225#if 0 4200#if 0
4226 case 1001: 4201 case 1001:
4227 break; /* X11 mouse highlighting */ 4202 break; /* X11 mouse highlighting */
4228#endif 4203#endif
4229 case 1010: /* scroll to bottom on TTY output inhibit */ 4204 case 1010: /* scroll to bottom on TTY output inhibit */
4230 if (!state) 4205 set_option (Opt_scrollTtyOutput, !state);
4231 SET_OPTION (Opt_scrollTtyOutput);
4232 else
4233 CLR_OPTION (Opt_scrollTtyOutput);
4234 break; 4206 break;
4235 case 1011: /* scroll to bottom on key press */ 4207 case 1011: /* scroll to bottom on key press */
4236 if (state) 4208 set_option (Opt_scrollTtyKeypress, state);
4237 SET_OPTION (Opt_scrollTtyKeypress);
4238 else
4239 CLR_OPTION (Opt_scrollTtyKeypress);
4240 break; 4209 break;
4241 case 1047: /* secondary screen w/ clearing last */ 4210 case 1047: /* secondary screen w/ clearing last */
4242 if (OPTION (Opt_secondaryScreen)) 4211 if (OPTION (Opt_secondaryScreen))
4243 if (current_screen != PRIMARY) 4212 if (current_screen != PRIMARY)
4244 scr_erase_screen (2); 4213 scr_erase_screen (2);
… …
4382 scr_color (Color_bg, Color_bg); 4351 scr_color (Color_bg, Color_bg);
4383 break; 4352 break;
4384 4353
4385 //case 50: // not variable spacing 4354 //case 50: // not variable spacing
4386 4355
4387#if ENABLE_FRILLS 4356#if !ENABLE_MINIMAL
4388 case 90: 4357 case 90:
4389 case 91: /* set bright fg color */ 4358 case 91: /* set bright fg color */
4390 case 92: 4359 case 92:
4391 case 93: 4360 case 93:
4392 case 94: 4361 case 94:
… …
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4423const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455 4424
4456void 4425void
4457rxvt_term::tt_write (const char *data, unsigned int len) 4426rxvt_term::tt_write (const char *data, unsigned int len)
4458{ 4427{
4459 if (pty.pty < 0) 4428 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4460 return; 4429 return;
4461 4430
4431 if (pty->pty < 0)
4432 return;
4433
4462 if (v_buflen == 0) 4434 if (v_buflen == 0)
4463 { 4435 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4436 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465 4437
4466 if ((unsigned int)written == len) 4438 if ((unsigned int)written == len)
4467 return; 4439 return;
4468 4440
4469 data += written; 4441 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4450 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4451}
4480 4452
4481void rxvt_term::pty_write () 4453void rxvt_term::pty_write ()
4482{ 4454{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4455 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484 4456
4485 if (written > 0) 4457 if (written > 0)
4486 { 4458 {
4487 v_buflen -= written; 4459 v_buflen -= written;
4488 4460

Diff Legend

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