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

Diff Legend

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