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.264 by root, Mon Jan 16 06:37:51 2006 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 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)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
716 727
717 case XK_Find: 728 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
719 break; 730 break;
720 731
721#ifdef XK_KP_End 732#ifdef XK_KP_Insert
722 case XK_KP_Insert: 733 case XK_KP_Insert:
723 /* allow shift to override */ 734 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 736 {
726 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
… …
873 return; 884 return;
874 885
875 if (len <= 0) 886 if (len <= 0)
876 return; /* not mapped */ 887 return; /* not mapped */
877 888
878 if (OPTION (Opt_scrollTtyKeypress)) 889 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 890 if (view_start)
880 { 891 {
881 view_start = 0; 892 view_start = 0;
882 want_refresh = 1; 893 want_refresh = 1;
883 } 894 }
… …
905 { 916 {
906 const char ch = C0_ESC; 917 const char ch = C0_ESC;
907 tt_write (&ch, 1); 918 tt_write (&ch, 1);
908 } 919 }
909 920
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); 921 tt_write (kbuf, (unsigned int)len);
921} 922}
922/*}}} */
923 923
924void
925rxvt_term::key_release (XKeyEvent &ev)
926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
1000
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1001#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1002unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1004{
930 unsigned int n, s; 1005 unsigned int n, s;
931 1006
… …
959void 1034void
960rxvt_term::flush () 1035rxvt_term::flush ()
961{ 1036{
962 flush_ev.stop (); 1037 flush_ev.stop ();
963 1038
964#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
965 if (want_full_refresh) 1040 if (want_full_refresh)
966 { 1041 {
967 want_full_refresh = 0; 1042 want_full_refresh = 0;
968 scr_clear (); 1043 scr_clear ();
969 scr_touch (false); 1044 scr_touch (false);
… …
1008 while (l->is_longer () && row < end_row); 1083 while (l->is_longer () && row < end_row);
1009 } 1084 }
1010 while (row < end_row); 1085 while (row < end_row);
1011 } 1086 }
1012 1087
1013 scr_refresh (refresh_type); 1088 scr_refresh ();
1014 scrollbar_show (1); 1089 scrollbar_show (1);
1015#ifdef USE_XIM 1090#ifdef USE_XIM
1016 IMSendSpot (); 1091 IMSendSpot ();
1017#endif 1092#endif
1018 } 1093 }
… …
1034void 1109void
1035rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1036{ 1111{
1037 make_current (); 1112 make_current ();
1038 1113
1039 refresh_limit = 1;
1040 refresh_count = 0; 1114 refresh_count = 0;
1041 flush (); 1115 flush ();
1042} 1116}
1043 1117
1044#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1121{
1048 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1123 want_refresh = 1;
1050 1124
1051 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1126}
1053#endif 1127#endif
1054 1128
1055#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1056void 1130void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1145{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1148 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1149 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1151 }
1079} 1152}
1080#endif 1153#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1158{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1160 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1162 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1164 }
1093} 1165}
1094#endif 1166#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1175 {
1104 if (view_start == top_row || view_start == 0) 1176 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1177 mouse_slip_wheel_speed = 0;
1106 1178
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1179 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1181 }
1111} 1182}
1112#endif 1183#endif
1113 1184
1114#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1115static struct event_handler 1186static struct event_handler
1116{ 1187{
1117 check_watcher cw_yield; 1188 check_watcher yield_ev;
1118 1189
1119 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1120 { 1191 {
1121 sched_yield (); 1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1122 w.stop (); 1200 w.stop ();
1123 } 1201 }
1124 1202
1125 event_handler () 1203 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1127 { 1205 {
1128 } 1206 }
1129} event_handler; 1207} event_handler;
1130#endif 1208#endif
1131 1209
… …
1142 1220
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1146 1224
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1226
1149 if (r > 0) 1227 if (r > 0)
1150 { 1228 {
1151 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1152 return true; 1230 return true;
1153 } 1231 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1233 {
1156#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1157 if (display->is_local) 1235 if (display->is_local)
1158 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1159#endif 1237#endif
1160 } 1238 }
1161 else 1239 else
1162 { 1240 {
1163 pty_ev.stop (); 1241 pty_ev.stop ();
1164 1242
1165 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1166 destroy (); 1244 destroy ();
1167 } 1245 }
1168 1246
1169 return false; 1247 return false;
1170} 1248}
1171 1249
1172void 1250void
1173rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1185} 1263}
1186 1264
1187void 1265void
1188rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1189{ 1267{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1269 recolour_cursor ();
1192 1270
1193#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1272 hidden_pointer = 0;
1195 1273
1196 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1198#endif 1276#endif
1199} 1277}
1200 1278
1201#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1202void 1280void
1203rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1204{ 1282{
1205 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1206 return; 1284 return;
1207 1285
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1287 XFlush (dpy);
1210 1288
1211 hidden_pointer = 1; 1289 hidden_pointer = 1;
1212} 1290}
1213 1291
1214void 1292void
… …
1287 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1288 (32 + x + 1), 1366 (32 + x + 1),
1289 (32 + y + 1)); 1367 (32 + y + 1));
1290} 1368}
1291 1369
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301
1302/*{{{ process an X event */ 1370/*{{{ process an X event */
1303void 1371void
1304rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1305{ 1373{
1306 make_current (); 1374 make_current ();
1307 1375
1308 dDisp; 1376 dLocal (Display *, dpy);
1309 1377
1310 if (ev.xany.window == vt 1378 if (ev.xany.window == vt
1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1381 return;
1313 1382
1314 // for XQueryPointer 1383 // for XQueryPointer
1315 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
… …
1317 unsigned int unused_mask; 1386 unsigned int unused_mask;
1318 1387
1319 switch (ev.type) 1388 switch (ev.type)
1320 { 1389 {
1321 case KeyPress: 1390 case KeyPress:
1322#if ISO_14755 1391 key_press (ev.xkey);
1323 if (!(iso14755buf & ISO_14755_52))
1324#endif
1325 lookup_key (ev.xkey);
1326
1327 break; 1392 break;
1328 1393
1329 case KeyRelease: 1394 case KeyRelease:
1330 { 1395 key_release (ev.xkey);
1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1332 KeySym keysym;
1333
1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1335#endif
1336
1337#if ENABLE_FRILLS || ISO_14755
1338 // ISO 14755 support
1339 if (iso14755buf)
1340 if (iso14755buf & ISO_14755_52)
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345# if ISO_14755
1346 // iso14755 part 5.2 handling: release time
1347 // first: controls
1348 if ((ev.xkey.state & ControlMask)
1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1351 {
1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1353 commit_iso14755 ();
1354 goto skip_switch;
1355 }
1356
1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1358 if (i[0] == keysym)
1359 {
1360 iso14755buf = ISO_14755_51 | i[1];
1361 commit_iso14755 ();
1362 goto skip_switch;
1363 }
1364
1365 scr_bell ();
1366# endif
1367 iso14755buf = 0;
1368 break;
1369 }
1370 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1371 {
1372# if ENABLE_OVERLAY
1373 scr_overlay_off ();
1374# endif
1375 if (iso14755buf & ISO_14755_51)
1376 commit_iso14755 ();
1377#if ISO_14755
1378 else if (iso14755buf & ISO_14755_STARTED)
1379 {
1380 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1381
1382 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1383 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1384 }
1385# endif
1386 else
1387 iso14755buf = 0;
1388 }
1389#endif
1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393 break;
1394
1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1396 if (!(ev.xkey.state & ControlMask))
1397 slip_wheel_ev.stop ();
1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1399 mouse_slip_wheel_speed = 0;
1400#endif
1401 break; 1396 break;
1402 }
1403 1397
1404 case ButtonPress: 1398 case ButtonPress:
1405 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1406 break; 1400 break;
1407 1401
… …
1409 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1410 break; 1404 break;
1411 1405
1412 case ClientMessage: 1406 case ClientMessage:
1413 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1417 destroy (); 1417 destroy ();
1418 }
1418#if ENABLE_EWMH 1419#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1423#endif 1435#endif
1424 } 1436 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1434#ifdef OFFIX_DND
1435 /* OffiX Dnd (drag 'n' drop) protocol */
1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1437 && (ev.xclient.data.l[0] == DndFile
1438 || ev.xclient.data.l[0] == DndDir
1439 || ev.xclient.data.l[0] == DndLink))
1440 {
1441 /* Get Dnd data */
1442 Atom ActualType;
1443 int ActualFormat;
1444 unsigned char *data;
1445 unsigned long Size, RemainingBytes;
1446
1447 XGetWindowProperty (disp, display->root,
1448 xa[XA_DNDSELECTION],
1449 0L, 1000000L,
1450 False, AnyPropertyType,
1451 &ActualType, &ActualFormat,
1452 &Size, &RemainingBytes,
1453 &data);
1454 set_string_property (XA_CUT_BUFFER0, data);
1455 XFree (data);
1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1458 }
1459#endif /* OFFIX_DND */
1460 break;
1461
1462 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1437 break;
1465 1438
1466 /* 1439 /*
1467 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1468 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1487 break; 1460 break;
1488 } 1461 }
1489 break; 1462 break;
1490 1463
1491 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1492 focus_in (); 1468 focus_in ();
1493 break; 1469 break;
1494 1470
1495 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1496 focus_out (); 1475 focus_out ();
1497 break; 1476 break;
1498 1477
1499 case ConfigureNotify: 1478 case ConfigureNotify:
1500 if (ev.xconfigure.window == parent[0]) 1479 if (ev.xconfigure.window == parent[0])
1501 { 1480 {
1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1503 ; 1482 ;
1504 1483
1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506 { 1485 {
1507 seen_resize = 1; 1486 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1488 }
1510 1489 else
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490 {
1491#ifdef ENABLE_TRANSPARENCY
1512 if (OPTION (Opt_transparent)) 1492 if (option (Opt_transparent))
1513 check_our_parents (); 1493 if (bgPixmap.render ())
1494 scr_touch (false);
1514#endif 1495#endif
1496 }
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 } 1498 }
1516 break; 1499 break;
1517 1500
1518 case PropertyNotify: 1501 case PropertyNotify:
1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1503 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1504 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1505 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1506
1523 break; 1507 break;
1524 1508
1525 case SelectionClear: 1509 case SelectionClear:
1526 selection_clear (); 1510 selection_clear ();
… …
1549 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1550#endif 1534#endif
1551 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1552 break; 1536 break;
1553 1537
1554#ifdef TRANSPARENT 1538#ifdef ENABLE_TRANSPARENCY
1555 case ReparentNotify: 1539 case ReparentNotify:
1556 rootwin_cb (ev); 1540 rootwin_cb (ev);
1557 break; 1541 break;
1558#endif /* TRANSPARENT */ 1542#endif /* ENABLE_TRANSPARENCY */
1559 1543
1560 case GraphicsExpose: 1544 case GraphicsExpose:
1561 case Expose: 1545 case Expose:
1562 if (ev.xany.window == vt) 1546 if (ev.xany.window == vt)
1563 { 1547 {
1564 do 1548 do
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1549 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1550 ev.xexpose.width, ev.xexpose.height, False);
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1568 1552
1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570 1554
1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1572 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1573 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1574 1558
1575 want_refresh = 1; 1559 want_refresh = 1;
1576 } 1560 }
1577 else 1561 else
1578 { 1562 {
1579 XEvent unused_event; 1563 XEvent unused_event;
1580 1564
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1582 ; 1566 ;
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1584 ; 1568 ;
1585 1569
1586 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1587 { 1571 {
1588 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1589 scrollbar_show (0); 1573 scrollbar_show (0);
1590 } 1574 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595
1596#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window);
1599#endif
1600 } 1575 }
1601 break; 1576 break;
1602 1577
1603 case MotionNotify: 1578 case MotionNotify:
1604#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1580 if (hidden_pointer)
1606 pointer_unblank (); 1581 pointer_unblank ();
1607#endif 1582#endif
1608#if MENUBAR
1609 if (isMenuBarWindow (ev.xany.window))
1610 {
1611 menubar_control (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1584 break;
1617 1585
1618 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1619 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1590 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1592 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1625 ; 1594 ;
1626 1595
1627 XQueryPointer (disp, vt, 1596 XQueryPointer (dpy, vt,
1628 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1629 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1630 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1631 &ev.xbutton.state); 1600 &ev.xbutton.state);
1632#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1696#endif 1665#endif
1697 } 1666 }
1698 } 1667 }
1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1700 { 1669 {
1701 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1702 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1703 ; 1672 ;
1704 1673
1705 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1706 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1707 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1708 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1709 &unused_mask); 1678 &unused_mask);
1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1711 scrollbar_size ()); 1680 scrollbar_size ());
1712 want_refresh = 1; 1681 want_refresh = 1;
1713 refresh_limit = 0;
1714 scrollbar_show (1); 1682 scrollbar_show (1);
1715 } 1683 }
1716 break; 1684 break;
1717 } 1685 }
1718 1686
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1723 { 1689 {
1724 if (hidden_cursor) 1690 if (hidden_cursor)
1725 { 1691 {
1726 hidden_cursor = 0; 1692 hidden_cursor = 0;
1727 want_refresh = 1; 1693 want_refresh = 1;
1728 } 1694 }
1729 1695
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731 } 1697 }
1732#endif 1698#endif
1733 1699
1734#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 { 1702 {
1737 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1740 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1752 if (!focus) 1718 if (!focus)
1753 { 1719 {
1754 focus = 1; 1720 focus = 1;
1755 want_refresh = 1; 1721 want_refresh = 1;
1756 1722
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1724
1759#if USE_XIM 1725#if USE_XIM
1760 if (Input_Context != NULL) 1726 if (Input_Context != NULL)
1761 { 1727 {
1762 IMSetStatusPosition (); 1728 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1729 XSetICFocus (Input_Context);
1764 } 1730 }
1765#endif 1731#endif
1766#if CURSOR_BLINK 1732#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1733 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1735#endif
1770#if OFF_FOCUS_FADING 1736#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1737 if (rs[Rs_fade])
1772 { 1738 {
1773 pix_colors = pix_colors_focused; 1739 pix_colors = pix_colors_focused;
1774 scr_recolour (); 1740 scr_recolour ();
1775 } 1741 }
1776#endif 1742#endif
1743#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell))
1745 {
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]);
1749 if (h != NULL)
1750 {
1751 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h);
1753 }
1754 }
1755#endif
1777 } 1756 }
1778} 1757}
1779 1758
1780void 1759void
1781rxvt_term::focus_out () 1760rxvt_term::focus_out ()
… …
1789 1768
1790#if ENABLE_FRILLS || ISO_14755 1769#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf) 1770 if (iso14755buf)
1792 { 1771 {
1793 iso14755buf = 0; 1772 iso14755buf = 0;
1794# if ENABLE_OVERLAY 1773# if ISO_14755
1795 scr_overlay_off (); 1774 scr_overlay_off ();
1796# endif 1775# endif
1797 } 1776 }
1798#endif 1777#endif
1799#if USE_XIM 1778#if USE_XIM
1800 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1780 XUnsetICFocus (Input_Context);
1802#endif 1781#endif
1803#if CURSOR_BLINK 1782#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1783 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1784 cursor_blink_ev.stop ();
1806 hidden_cursor = 0; 1785 hidden_cursor = 0;
1807#endif 1786#endif
1808#if OFF_FOCUS_FADING 1787#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1788 if (rs[Rs_fade])
… …
1813 } 1792 }
1814#endif 1793#endif
1815 } 1794 }
1816} 1795}
1817 1796
1818#if TRANSPARENT 1797void
1798rxvt_term::update_fade_color (unsigned int idx)
1799{
1800#if OFF_FOCUS_FADING
1801 if (rs[Rs_fade])
1802 {
1803 rgba c;
1804 pix_colors [Color_fade].get (c);
1805 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1806 }
1807#endif
1808}
1809
1810#if ENABLE_TRANSPARENCY || ENABLE_PERL
1819void 1811void
1820rxvt_term::rootwin_cb (XEvent &ev) 1812rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1813{
1822 make_current (); 1814 make_current ();
1823 1815
1816 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1817 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1820# if ENABLE_TRANSPARENCY
1824 switch (ev.type) 1821 switch (ev.type)
1825 { 1822 {
1826 case PropertyNotify: 1823 case PropertyNotify:
1827 /* 1824 /*
1828 * if user used some Esetroot compatible prog to set the root bg, 1825 * if user used some Esetroot compatible prog to set the root bg,
1829 * use the property to determine the pixmap. We use it later on. 1826 * use the property to determine the pixmap. We use it later on.
1830 */ 1827 */
1831 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1832 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1833 return; 1830 {
1834 1831 bgPixmap.set_root_pixmap ();
1835 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1836 case ReparentNotify: 1833 }
1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1838 want_refresh = want_full_refresh = 1;
1839 break; 1834 break;
1840 } 1835 }
1836# endif
1841} 1837}
1842#endif 1838#endif
1843 1839
1844void 1840void
1845rxvt_term::button_press (XButtonEvent &ev) 1841rxvt_term::button_press (XButtonEvent &ev)
… …
1854 /* 1850 /*
1855 * VT window processing of button press 1851 * VT window processing of button press
1856 */ 1852 */
1857 if (ev.window == vt) 1853 if (ev.window == vt)
1858 { 1854 {
1855 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1856 return;
1857
1859#if ISO_14755 1858#if ISO_14755
1860 // 5.4 1859 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1861 {
1863 iso14755_54 (ev.x, ev.y); 1862 iso14755_54 (ev.x, ev.y);
… …
1905 else 1904 else
1906 { 1905 {
1907 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1909 1908
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1909 switch (ev.button)
1912 { 1910 {
1913 case Button1: 1911 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1916#else
1919 selection.rect = false; 1917 selection.rect = false;
1920#endif 1918#endif
1921 1919
1922 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1922 {
1925 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1927 else 1925 else
1928 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1929 } 1927 }
1930 else 1928 else
1931 { 1929 {
1932 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1931 MEvent.clicks++;
1934 else 1932 else
1935 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1936 1934
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1936 }
1939 1937
1940 MEvent.button = Button1; 1938 MEvent.button = Button1;
1941 break; 1939 break;
1942 1940
1943 case Button3: 1941 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1946 else 1944 else
1947 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1948 1946
1949 MEvent.button = Button3; 1947 MEvent.button = Button3;
1950 break; 1948 break;
1951 } 1949 }
1952 } 1950 }
1953 1951
1954 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1955 return; 1953 return;
1956 } 1954 }
1957 1955
… …
2096 } 2094 }
2097 } 2095 }
2098 2096
2099 return; 2097 return;
2100 } 2098 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2099}
2110 2100
2111void 2101void
2112rxvt_term::button_release (XButtonEvent &ev) 2102rxvt_term::button_release (XButtonEvent &ev)
2113{ 2103{
… …
2119 2109
2120 if (scrollbar_isUpDn ()) 2110 if (scrollbar_isUpDn ())
2121 { 2111 {
2122 scrollBar.setIdle (); 2112 scrollBar.setIdle ();
2123 scrollbar_show (0); 2113 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2114 }
2128 2115
2129#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2132#endif 2119#endif
2133 2120
2134 if (ev.window == vt) 2121 if (ev.window == vt)
2135 { 2122 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2124 return;
2125
2136#if ISO_14755 2126#if ISO_14755
2137 // 5.4 2127 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2128 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2129 return;
2140#endif 2130#endif
2131
2141 if (reportmode) 2132 if (reportmode)
2142 { 2133 {
2143 /* mouse report from vt window */ 2134 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2135 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2136 if (ev.button >= 4)
… …
2169 if (priv_modes & PrivMode_mouse_report 2160 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2161 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2162 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2163 selection_extend (ev.x, ev.y, 0);
2173 2164
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2165 switch (ev.button)
2178 { 2166 {
2179 case Button1: 2167 case Button1:
2180 case Button3: 2168 case Button3:
2181 selection_make (ev.time); 2169 selection_make (ev.time);
2182 break; 2170 break;
2171
2183 case Button2: 2172 case Button2:
2184 selection_request (ev.time, ev.x, ev.y); 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2185 break; 2175 break;
2176
2186#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2187 case Button4: 2178 case Button4:
2188 case Button5: 2179 case Button5:
2189 { 2180 {
2190 int i; 2181 int i;
… …
2192 2183
2193 v = ev.button == Button4 ? UP : DN; 2184 v = ev.button == Button4 ? UP : DN;
2194 2185
2195 if (ev.state & ShiftMask) 2186 if (ev.state & ShiftMask)
2196 i = 1; 2187 i = 1;
2197 else if (OPTION (Opt_mouseWheelScrollPage)) 2188 else if (option (Opt_mouseWheelScrollPage))
2198 i = nrow - 1; 2189 i = nrow - 1;
2199 else 2190 else
2200 i = 5; 2191 i = 5;
2201 2192
2202# ifdef MOUSE_SLIP_WHEELING 2193# ifdef MOUSE_SLIP_WHEELING
… …
2222 } 2213 }
2223 break; 2214 break;
2224#endif 2215#endif
2225 } 2216 }
2226 } 2217 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2218}
2232
2233#ifdef TRANSPARENT
2234#if TINTING
2235/* taken from aterm-0.4.2 */
2236
2237typedef uint32_t RUINT32T;
2238
2239void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2240{
2241 int sh_r, sh_g, sh_b;
2242 RUINT32T mask_r, mask_g, mask_b;
2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246 int i;
2247
2248 Visual *visual = display->visual;
2249
2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251
2252 /* for convenience */
2253 mask_r = visual->red_mask;
2254 mask_g = visual->green_mask;
2255 mask_b = visual->blue_mask;
2256
2257 /* boring lookup table pre-initialization */
2258 switch (srcImage->bits_per_pixel) {
2259 case 15:
2260 if ((mask_r != 0x7c00) ||
2261 (mask_g != 0x03e0) ||
2262 (mask_b != 0x001f))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2265 lookup_r = lookup;
2266 lookup_g = lookup+32;
2267 lookup_b = lookup+32+32;
2268 sh_r = 10;
2269 sh_g = 5;
2270 sh_b = 0;
2271 break;
2272 case 16:
2273 if ((mask_r != 0xf800) ||
2274 (mask_g != 0x07e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+64;
2281 sh_r = 11;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 24:
2286 if ((mask_r != 0xff0000) ||
2287 (mask_g != 0x00ff00) ||
2288 (mask_b != 0x0000ff))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2291 lookup_r = lookup;
2292 lookup_g = lookup+256;
2293 lookup_b = lookup+256+256;
2294 sh_r = 16;
2295 sh_g = 8;
2296 sh_b = 0;
2297 break;
2298 case 32:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 default:
2312 return; /* we do not support this color depth */
2313 }
2314
2315 /* prepare limits for color transformation (each channel is handled separately) */
2316 if (shade < 0) {
2317 shade = -shade;
2318 if (shade < 0) shade = 0;
2319 if (shade > 100) shade = 100;
2320
2321 lower_lim_r = 65535-rm;
2322 lower_lim_g = 65535-gm;
2323 lower_lim_b = 65535-bm;
2324
2325 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2326 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2327 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2328
2329 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2330 } else {
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2335
2336 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2337 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2338 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2339 }
2340
2341 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2342 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2343 {
2344 unsigned int tmp;
2345
2346 tmp = lower_lim_r;
2347 lower_lim_r = lower_lim_b;
2348 lower_lim_b = tmp;
2349
2350 tmp = upper_lim_r;
2351 upper_lim_r = upper_lim_b;
2352 upper_lim_b = tmp;
2353 }
2354
2355 /* fill our lookup tables */
2356 for (i = 0; i <= mask_r>>sh_r; i++)
2357 {
2358 RUINT32T tmp;
2359 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2360 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2361 lookup_r[i] = (tmp/65535)<<sh_r;
2362 }
2363 for (i = 0; i <= mask_g>>sh_g; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2367 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2368 lookup_g[i] = (tmp/65535)<<sh_g;
2369 }
2370 for (i = 0; i <= mask_b>>sh_b; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2374 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2375 lookup_b[i] = (tmp/65535)<<sh_b;
2376 }
2377
2378 /* apply table to input image (replacing colors by newly calculated ones) */
2379 switch (srcImage->bits_per_pixel)
2380 {
2381 case 15:
2382 {
2383 unsigned short *p1, *pf, *p, *pl;
2384 p1 = (unsigned short *) srcImage->data;
2385 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2386 while (p1 < pf)
2387 {
2388 p = p1;
2389 pl = p1 + srcImage->width;
2390 for (; p < pl; p++)
2391 {
2392 *p = lookup_r[(*p & 0x7c00)>>10] |
2393 lookup_g[(*p & 0x03e0)>> 5] |
2394 lookup_b[(*p & 0x001f)];
2395 }
2396 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2397 }
2398 break;
2399 }
2400 case 16:
2401 {
2402 unsigned short *p1, *pf, *p, *pl;
2403 p1 = (unsigned short *) srcImage->data;
2404 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2405 while (p1 < pf)
2406 {
2407 p = p1;
2408 pl = p1 + srcImage->width;
2409 for (; p < pl; p++)
2410 {
2411 *p = lookup_r[(*p & 0xf800)>>11] |
2412 lookup_g[(*p & 0x07e0)>> 5] |
2413 lookup_b[(*p & 0x001f)];
2414 }
2415 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 case 24:
2420 {
2421 unsigned char *p1, *pf, *p, *pl;
2422 p1 = (unsigned char *) srcImage->data;
2423 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2424 while (p1 < pf)
2425 {
2426 p = p1;
2427 pl = p1 + srcImage->width * 3;
2428 for (; p < pl; p += 3)
2429 {
2430 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2431 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2432 p[2] = lookup_r[(p[2] & 0x0000ff)];
2433 }
2434 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2435 }
2436 break;
2437 }
2438 case 32:
2439 {
2440 RUINT32T *p1, *pf, *p, *pl;
2441 p1 = (RUINT32T *) srcImage->data;
2442 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2443
2444 while (p1 < pf)
2445 {
2446 p = p1;
2447 pl = p1 + srcImage->width;
2448 for (; p < pl; p++)
2449 {
2450 *p = lookup_r[(*p & 0xff0000)>>16] |
2451 lookup_g[(*p & 0x00ff00)>> 8] |
2452 lookup_b[(*p & 0x0000ff)] |
2453 (*p & ~0xffffff);
2454 }
2455 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2456 }
2457 break;
2458 }
2459 }
2460
2461 free (lookup);
2462}
2463#endif
2464
2465/*
2466 * Check our parents are still who we think they are.
2467 * Do transparency updates if required
2468 */
2469int
2470rxvt_term::check_our_parents ()
2471{
2472 int i, pchanged, aformat, have_pixmap, rootdepth;
2473 unsigned long nitems, bytes_after;
2474 Atom atype;
2475 unsigned char *prop = NULL;
2476 Window root, oldp, *list;
2477 Pixmap rootpixmap = None;
2478 XWindowAttributes wattr, wrootattr;
2479 dDisp;
2480
2481 pchanged = 0;
2482
2483 if (!OPTION (Opt_transparent))
2484 return pchanged; /* Don't try any more */
2485
2486 XGetWindowAttributes (disp, display->root, &wrootattr);
2487 rootdepth = wrootattr.depth;
2488
2489 XGetWindowAttributes (disp, parent[0], &wattr);
2490
2491 if (rootdepth != wattr.depth)
2492 {
2493 if (am_transparent)
2494 {
2495 pchanged = 1;
2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2497 am_transparent = am_pixmap_trans = 0;
2498 }
2499
2500 return pchanged; /* Don't try any more */
2501 }
2502
2503 /* Get all X ops out of the queue so that our information is up-to-date. */
2504 XSync (disp, False);
2505
2506 /*
2507 * Make the frame window set by the window manager have
2508 * the root background. Some window managers put multiple nested frame
2509 * windows for each client, so we have to take care about that.
2510 */
2511 i = (xa[XA_XROOTPMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success);
2515
2516 if (!i || prop == NULL)
2517 i = (xa[XA_ESETROOT_PMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL
2523#if TINTING
2524 || !rs[Rs_color + Color_tint]
2525#endif
2526 )
2527 have_pixmap = 0;
2528 else
2529 {
2530 have_pixmap = 1;
2531 rootpixmap = *(Pixmap *)prop;
2532 XFree (prop);
2533 }
2534
2535 if (have_pixmap)
2536 {
2537 /*
2538 * Copy display->root pixmap transparency
2539 */
2540 int sx, sy, nx, ny;
2541 unsigned int nw, nh;
2542 Window cr;
2543 XImage *image;
2544 GC gc;
2545 XGCValues gcvalue;
2546
2547 XTranslateCoordinates (disp, parent[0], display->root,
2548 0, 0, &sx, &sy, &cr);
2549 nw = (unsigned int)szHint.width;
2550 nh = (unsigned int)szHint.height;
2551 nx = ny = 0;
2552
2553 if (sx < 0)
2554 {
2555 nw += sx;
2556 nx = -sx;
2557 sx = 0;
2558 }
2559
2560 if (sy < 0)
2561 {
2562 nh += sy;
2563 ny = -sy;
2564 sy = 0;
2565 }
2566
2567 min_it (nw, (unsigned int) (wrootattr.width - sx));
2568 min_it (nh, (unsigned int) (wrootattr.height - sy));
2569
2570 XSync (disp, False);
2571 allowedxerror = -1;
2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573
2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2575 /* XXX: may need a delay here? */
2576 allowedxerror = 0;
2577
2578 if (image == NULL)
2579 {
2580 if (am_transparent && am_pixmap_trans)
2581 {
2582 pchanged = 1;
2583 if (pixmap != None)
2584 {
2585 XFreePixmap (disp, pixmap);
2586 pixmap = None;
2587 }
2588 }
2589
2590 am_pixmap_trans = 0;
2591 }
2592 else
2593 {
2594 if (pixmap != None)
2595 XFreePixmap (disp, pixmap);
2596
2597#if TINTING
2598 if (ISSET_PIXCOLOR (Color_tint))
2599 {
2600 unsigned short rm, gm, bm;
2601 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602
2603 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2604
2605 ShadeXImage (display, image, shade, rm, gm, bm);
2606 }
2607#endif
2608
2609 pixmap = XCreatePixmap (disp, vt,
2610 szHint.width, szHint.height, image->depth);
2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2612 XPutImage (disp, pixmap, gc, image, 0, 0,
2613 nx, ny, image->width, image->height);
2614 XFreeGC (disp, gc);
2615 XDestroyImage (image);
2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2617 XClearWindow (disp, parent[0]);
2618
2619 if (!am_transparent || !am_pixmap_trans)
2620 pchanged = 1;
2621
2622 am_transparent = am_pixmap_trans = 1;
2623 }
2624 }
2625
2626 if (am_pixmap_trans)
2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2628 else
2629 {
2630 unsigned int n;
2631 /*
2632 * InheritPixmap transparency
2633 */
2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 {
2636 oldp = parent[i];
2637 XQueryTree (disp, parent[i - 1], &root,
2638 &parent[i], &list, &n);
2639 XFree (list);
2640
2641 if (parent[i] == display->root)
2642 {
2643 if (oldp != None)
2644 pchanged = 1;
2645
2646 break;
2647 }
2648
2649 if (oldp != parent[i])
2650 pchanged = 1;
2651 }
2652
2653 n = 0;
2654
2655 if (pchanged)
2656 {
2657 for (; n < (unsigned int)i; n++)
2658 {
2659 XGetWindowAttributes (disp, parent[n], &wattr);
2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2661 {
2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663 break;
2664 }
2665 }
2666 }
2667
2668 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2669 {
2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2672 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */
2674 }
2675 else
2676 {
2677#if WAIT_FOR_WM
2678 /* wait (an arbitrary period) for the WM to do its thing
2679 * needed for fvwm2.2.2 (and before?) */
2680 sleep (1);
2681#endif
2682 for (n = 0; n < (unsigned int)i; n++)
2683 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]);
2686 }
2687
2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2689 am_transparent = 1;
2690 }
2691
2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693 parent[i] = None;
2694 }
2695
2696 if (scrollBar.win)
2697 {
2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2699 scrollBar.setIdle ();
2700 scrollbar_show (0);
2701 }
2702
2703 if (am_transparent)
2704 {
2705 want_refresh = want_full_refresh = 1;
2706 if (am_pixmap_trans)
2707 flush ();
2708 }
2709
2710 return pchanged;
2711}
2712#endif
2713 2219
2714/*}}} */ 2220/*}}} */
2715 2221
2716bool 2222bool
2717rxvt_term::cmd_parse () 2223rxvt_term::cmd_parse ()
… …
2766 if (ch == C0_LF) 2272 if (ch == C0_LF)
2767 nlines++; 2273 nlines++;
2768 2274
2769 refresh_count++; 2275 refresh_count++;
2770 2276
2771 if (!OPTION (Opt_jumpScroll) 2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2772 || (refresh_count >= refresh_limit * (nrow - 1)))
2773 { 2278 {
2774 refreshnow = true;
2775 refresh_count = 0; 2279 refresh_count = 0;
2280
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2282 {
2283 refreshnow = true;
2776 ch = NOCHAR; 2284 ch = NOCHAR;
2777 break; 2285 break;
2286 }
2778 } 2287 }
2779 2288
2780 // scr_add_lines only works for nlines <= nrow - 1. 2289 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2290 if (nlines >= nrow - 1)
2782 { 2291 {
2292 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2293 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2294 scr_add_lines (buf, str - buf, nlines);
2785 2295
2786 nlines = 0; 2296 nlines = 0;
2787 str = buf; 2297 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2298 eol = str + min (ncol, UBUFSIZ);
… …
2803 2313
2804 seq_begin = cmdbuf_ptr; 2314 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2315 ch = next_char ();
2806 } 2316 }
2807 2317
2318 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2319 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809 scr_add_lines (buf, str - buf, nlines); 2320 scr_add_lines (buf, str - buf, nlines);
2810 2321
2811 /* 2322 /*
2812 * If there have been a lot of new lines, then update the screen 2323 * If there have been a lot of new lines, then update the screen
2813 * What the heck I'll cheat and only refresh less than every page-full. 2324 * What the heck we'll cheat and only refresh less than every page-full.
2814 * the number of pages between refreshes is refresh_limit, which 2325 * if skipScroll is enabled.
2815 * is incremented here because we must be doing flat-out scrolling.
2816 */ 2326 */
2817 if (refreshnow) 2327 if (refreshnow)
2818 { 2328 {
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++;
2821 else
2822 {
2823 flag = true; 2329 flag = true;
2824 scr_refresh (refresh_type); 2330 scr_refresh ();
2825 want_refresh = 1; 2331 want_refresh = 1;
2826 }
2827 } 2332 }
2828 2333
2829 } 2334 }
2830 else 2335 else
2831 { 2336 {
… …
2847 return flag; 2352 return flag;
2848} 2353}
2849 2354
2850// read the next character 2355// read the next character
2851wchar_t 2356wchar_t
2852rxvt_term::next_char () 2357rxvt_term::next_char () NOTHROW
2853{ 2358{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2360 {
2856 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2878 return NOCHAR; 2383 return NOCHAR;
2879} 2384}
2880 2385
2881// read the next octet 2386// read the next octet
2882uint32_t 2387uint32_t
2883rxvt_term::next_octet () 2388rxvt_term::next_octet () NOTHROW
2884{ 2389{
2885 return cmdbuf_ptr < cmdbuf_endp 2390 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2391 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2392 : NOCHAR;
2888} 2393}
2394
2395static class out_of_input out_of_input;
2889 2396
2890/* rxvt_cmd_getc () - Return next input character */ 2397/* rxvt_cmd_getc () - Return next input character */
2891/* 2398/*
2892 * Return the next input character after first passing any keyboard input 2399 * Return the next input character after first passing any keyboard input
2893 * to the command. 2400 * to the command.
2894 */ 2401 */
2895wchar_t 2402wchar_t
2896rxvt_term::cmd_getc () 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2404{
2898 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2899 2406
2900 if (c == NOCHAR) 2407 if (c == NOCHAR)
2901 throw out_of_input; 2408 throw out_of_input;
2902 2409
2903 return c; 2410 return c;
2904} 2411}
2905 2412
2906uint32_t 2413uint32_t
2907rxvt_term::cmd_get8 () 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2415{
2909 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2910 2417
2911 if (c == NOCHAR) 2418 if (c == NOCHAR)
2912 throw out_of_input; 2419 throw out_of_input;
… …
2978 { 2485 {
2979 if ((buf[len++] = cmd_getc ()) == 'i') 2486 if ((buf[len++] = cmd_getc ()) == 'i')
2980 break; /* done = 1 */ 2487 break; /* done = 1 */
2981 } 2488 }
2982 } 2489 }
2983 2490
2984 for (i = 0; i < len; i++) 2491 for (i = 0; i < len; i++)
2985 if (putc (buf[i], fd) == EOF) 2492 if (putc (buf[i], fd) == EOF)
2986 { 2493 {
2987 done = 1; 2494 done = 1;
2988 break; 2495 break;
… …
3050 process_dcs_seq (); 2557 process_dcs_seq ();
3051 break; 2558 break;
3052 case 0x9b: /* CSI */ 2559 case 0x9b: /* CSI */
3053 process_csi_seq (); 2560 process_csi_seq ();
3054 break; 2561 break;
3055 case 0x9d: /* CSI */ 2562 case 0x9d: /* OSC */
3056 process_osc_seq (); 2563 process_osc_seq ();
3057 break; 2564 break;
3058#endif 2565#endif
3059 } 2566 }
3060} 2567}
… …
3150 scr_charset_set (2, (unsigned int)cmd_getc ()); 2657 scr_charset_set (2, (unsigned int)cmd_getc ());
3151 break; 2658 break;
3152 case '+': 2659 case '+':
3153 scr_charset_set (3, (unsigned int)cmd_getc ()); 2660 scr_charset_set (3, (unsigned int)cmd_getc ());
3154 break; 2661 break;
3155#if ENABLE_FRILLS 2662#if !ENABLE_MINIMAL
3156 case '6': 2663 case '6':
3157 scr_backindex (); 2664 scr_backindex ();
3158 break; 2665 break;
3159#endif 2666#endif
3160 case '7': 2667 case '7':
3161 scr_cursor (SAVE); 2668 scr_cursor (SAVE);
3162 break; 2669 break;
3163 case '8': 2670 case '8':
3164 scr_cursor (RESTORE); 2671 scr_cursor (RESTORE);
3165 break; 2672 break;
3166#if ENABLE_FRILLS 2673#if !ENABLE_MINIMAL
3167 case '9': 2674 case '9':
3168 scr_forwardindex (); 2675 scr_forwardindex ();
3169 break; 2676 break;
3170#endif 2677#endif
3171 case '=': 2678 case '=':
… …
3288 unicode_t ch, priv, i; 2795 unicode_t ch, priv, i;
3289 unsigned int nargs, p; 2796 unsigned int nargs, p;
3290 int n, ndef; 2797 int n, ndef;
3291 int arg[ESC_ARGS]; 2798 int arg[ESC_ARGS];
3292 2799
3293 for (nargs = ESC_ARGS; nargs > 0;) 2800 memset (arg, 0, sizeof (arg));
3294 arg[--nargs] = 0; 2801 nargs = 0;
3295 2802
3296 priv = 0; 2803 priv = 0;
3297 ch = cmd_getc (); 2804 ch = cmd_getc ();
3298 if (ch >= '<' && ch <= '?') 2805 if (ch >= '<' && ch <= '?')
3299 { /* '<' '=' '>' '?' */ 2806 { /* '<' '=' '>' '?' */
… …
3333 ndef = get_byte_array_bit (csi_defaults, i); 2840 ndef = get_byte_array_bit (csi_defaults, i);
3334 for (p = 0; p < nargs; p++) 2841 for (p = 0; p < nargs; p++)
3335 if (arg[p] == -1) 2842 if (arg[p] == -1)
3336 arg[p] = ndef; 2843 arg[p] = ndef;
3337 2844
3338#ifdef DEBUG_CMD
3339 fprintf (stderr, "CSI ");
3340 for (p = 0; p < nargs; p++)
3341 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3342 fprintf (stderr, "%c\n", ch);
3343#endif
3344
3345 /* 2845 /*
3346 * private mode handling 2846 * private mode handling
3347 */ 2847 */
3348 if (priv) 2848 if (priv)
3349 { 2849 {
3350 switch (priv) 2850 switch (priv)
3351 { 2851 {
3352 case '>': 2852 case '>':
3353 if (ch == CSI_DA) /* secondary device attributes */ 2853 if (ch == CSI_DA) /* secondary device attributes */
3354 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2854 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2860 // that we do not support xterm mouse reporting (should be 95 when we do).
2861 //
2862 tt_printf ("\033[>%d;94;0c", 'U');
2863 }
3355 break; 2864 break;
3356 case '?': 2865 case '?':
3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
3359 break; 2868 break;
… …
3485 break; 2994 break;
3486 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
3487 scr_report_position (); 2996 scr_report_position ();
3488 break; 2997 break;
3489 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
3490 if (OPTION (Opt_insecure)) 2999 if (option (Opt_insecure))
3491 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3492 break; 3001 break;
3493 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
3494 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3495 break; 3004 break;
… …
3562 break; 3071 break;
3563 case CSI_75: 3072 case CSI_75:
3564 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
3565 break; 3074 break;
3566 3075
3567#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3568 case CSI_74: 3077 case CSI_74:
3569 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
3570 break; 3079 break;
3571#endif 3080#endif
3572 3081
… …
3579 break; 3088 break;
3580 } 3089 }
3581} 3090}
3582/*}}} */ 3091/*}}} */
3583 3092
3584#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3585/* ARGSUSED */ 3094/* ARGSUSED */
3586void 3095void
3587rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3096rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588{ 3097{
3589 int x, y; 3098 int x, y;
3590 XWindowAttributes wattr; 3099 XWindowAttributes wattr;
3591 Window wdummy; 3100 Window wdummy;
3592 dDisp; 3101
3102 dLocal (Display *, dpy);
3593 3103
3594 if (nargs == 0) 3104 if (nargs == 0)
3595 return; 3105 return;
3596 3106
3597 switch (args[0]) 3107 switch (args[0])
3598 { 3108 {
3599 /* 3109 /*
3600 * commands 3110 * commands
3601 */ 3111 */
3602 case 1: /* deiconify window */ 3112 case 1: /* deiconify window */
3603 XMapWindow (disp, parent[0]); 3113 XMapWindow (dpy, parent[0]);
3604 break; 3114 break;
3605 case 2: /* iconify window */ 3115 case 2: /* iconify window */
3606 XIconifyWindow (disp, parent[0], display->screen); 3116 XIconifyWindow (dpy, parent[0], display->screen);
3607 break; 3117 break;
3608 case 3: /* set position (pixels) */ 3118 case 3: /* set position (pixels) */
3609 XMoveWindow (disp, parent[0], args[1], args[2]); 3119 XMoveWindow (dpy, parent[0], args[1], args[2]);
3610 break; 3120 break;
3611 case 4: /* set size (pixels) */ 3121 case 4: /* set size (pixels) */
3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3122 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613 break; 3123 break;
3614 case 5: /* raise window */ 3124 case 5: /* raise window */
3615 XRaiseWindow (disp, parent[0]); 3125 XRaiseWindow (dpy, parent[0]);
3616 break; 3126 break;
3617 case 6: /* lower window */ 3127 case 6: /* lower window */
3618 XLowerWindow (disp, parent[0]); 3128 XLowerWindow (dpy, parent[0]);
3619 break; 3129 break;
3620 case 7: /* refresh window */ 3130 case 7: /* refresh window */
3621 scr_touch (true); 3131 scr_touch (true);
3622 break; 3132 break;
3623 case 8: /* set size (chars) */ 3133 case 8: /* set size (chars) */
… …
3630 if (args[0] >= 24) /* set height (chars) */ 3140 if (args[0] >= 24) /* set height (chars) */
3631 set_widthheight ((unsigned int)width, 3141 set_widthheight ((unsigned int)width,
3632 (unsigned int) (args[1] * fheight)); 3142 (unsigned int) (args[1] * fheight));
3633 break; 3143 break;
3634 3144
3635
3636 /* 3145 /*
3637 * reports - some output format copied from XTerm 3146 * reports - some output format copied from XTerm
3638 */ 3147 */
3639 case 11: /* report window state */ 3148 case 11: /* report window state */
3640 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3150 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642 break; 3151 break;
3643 case 13: /* report window position */ 3152 case 13: /* report window position */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3153 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 XTranslateCoordinates (disp, parent[0], wattr.root, 3154 XTranslateCoordinates (dpy, parent[0], wattr.root,
3646 -wattr.border_width, -wattr.border_width, 3155 -wattr.border_width, -wattr.border_width,
3647 &x, &y, &wdummy); 3156 &x, &y, &wdummy);
3648 tt_printf ("\033[3;%d;%dt", x, y); 3157 tt_printf ("\033[3;%d;%dt", x, y);
3649 break; 3158 break;
3650 case 14: /* report window size (pixels) */ 3159 case 14: /* report window size (pixels) */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3161 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653 break; 3162 break;
3654 case 18: /* report text area size (chars) */ 3163 case 18: /* report text area size (chars) */
3655 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656 break; 3165 break;
… …
3658 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3167 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659 break; 3168 break;
3660 case 20: /* report icon label */ 3169 case 20: /* report icon label */
3661 { 3170 {
3662 char *s; 3171 char *s;
3663 XGetIconName (disp, parent[0], &s); 3172 XGetIconName (dpy, parent[0], &s);
3664 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3173 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3665 XFree (s); 3174 XFree (s);
3666 } 3175 }
3667 break; 3176 break;
3668 case 21: /* report window title */ 3177 case 21: /* report window title */
3669 { 3178 {
3670 char *s; 3179 char *s;
3671 XFetchName (disp, parent[0], &s); 3180 XFetchName (dpy, parent[0], &s);
3672 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3181 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3182 XFree (s);
3674 } 3183 }
3675 break; 3184 break;
3676 } 3185 }
3677} 3186}
… …
3704 seen_esc = true; 3213 seen_esc = true;
3705 continue; 3214 continue;
3706 } 3215 }
3707 else if (ch == C0_BEL || ch == CHAR_ST) 3216 else if (ch == C0_BEL || ch == CHAR_ST)
3708 break; 3217 break;
3218 else if (ch == C0_SYN)
3219 ch = cmd_get8 ();
3709 else if (ch < 0x20) 3220 else if (ch < 0x20)
3710 return NULL; /* other control character - exit */ 3221 return NULL; /* other control character - exit */
3711 3222
3712 seen_esc = false; 3223 seen_esc = false;
3713 3224
3714 if (n >= STRING_MAX - 1) 3225 if (n >= STRING_MAX - 1)
3715 // stop at some sane length 3226 // stop at some sane length
3716 return NULL; 3227 return NULL;
3717 3228
3718 if (ch == C0_SYN)
3719 string[n++] = cmd_get8 ();
3720 else
3721 string[n++] = ch; 3229 string[n++] = ch;
3722 } 3230 }
3723 3231
3724 string[n++] = '\0'; 3232 string[n++] = '\0';
3725 3233
3726 ends_how = (ch == 0x5c ? C0_ESC : ch); 3234 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3777void 3285void
3778rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3286rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3779{ 3287{
3780 if (str[0] == '?' && !str[1]) 3288 if (str[0] == '?' && !str[1])
3781 { 3289 {
3782 unsigned short r, g, b; 3290 rgba c;
3783 pix_colors_focused[color].get (display, r, g, b); 3291 pix_colors_focused[color].get (c);
3292
3293#if XFT
3294 if (c.a != rgba::MAX_CC)
3295 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3296 else
3297#endif
3784 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3298 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3785 } 3299 }
3786 else 3300 else
3787 set_window_color (color, str); 3301 set_window_color (color, str);
3788} 3302}
3789 3303
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3306 */
3793void 3307void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3308rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3309{
3796 int changed = 0;
3797 int color; 3310 int color;
3798 char *buf, *name; 3311 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3312 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3313 int saveop = op;
3801 dDisp; 3314
3315 dLocal (Display *, dpy);
3802 3316
3803 assert (str != NULL); 3317 assert (str != NULL);
3318
3319 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3320 return;
3321
3804 switch (op) 3322 switch (op)
3805 { 3323 {
3806 case XTerm_name: 3324 case XTerm_name:
3807 set_title (str); 3325 set_title (str);
3808 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
… …
3822 unsigned long bytes_after; 3340 unsigned long bytes_after;
3823 unsigned char *value = 0; 3341 unsigned char *value = 0;
3824 const char *str = ""; 3342 const char *str = "";
3825 3343
3826 if (prop 3344 if (prop
3827 && XGetWindowProperty (disp, parent[0], 3345 && XGetWindowProperty (dpy, parent[0],
3828 prop, 0, 1<<16, 0, AnyPropertyType, 3346 prop, 0, 1<<16, 0, AnyPropertyType,
3829 &actual_type, &actual_format, 3347 &actual_type, &actual_format,
3830 &nitems, &bytes_after, &value) == Success 3348 &nitems, &bytes_after, &value) == Success
3831 && actual_type != None 3349 && actual_type != None
3832 && actual_format == 8) 3350 && actual_format == 8)
3833 str = (const char *)(value); 3351 str = (const char *)(value);
3834 3352
3835 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3353 tt_printf ("\033]%d;%s%c", op, str, resp);
3836 3354
3837 XFree (value); 3355 XFree (value);
3838 } 3356 }
3839 else 3357 else
3840 { 3358 {
… …
3844 { 3362 {
3845 *eq = 0; 3363 *eq = 0;
3846 set_utf8_property (display->atom (str), eq + 1); 3364 set_utf8_property (display->atom (str), eq + 1);
3847 } 3365 }
3848 else 3366 else
3849 XDeleteProperty (disp, parent[0], 3367 XDeleteProperty (dpy, parent[0],
3850 display->atom (str)); 3368 display->atom (str));
3851 } 3369 }
3852 break; 3370 break;
3853 3371
3854 case XTerm_Color: 3372 case XTerm_Color:
… …
3864 break; 3382 break;
3865 3383
3866 if ((buf = strchr (name, ';')) != NULL) 3384 if ((buf = strchr (name, ';')) != NULL)
3867 *buf++ = '\0'; 3385 *buf++ = '\0';
3868 3386
3869 if (name[0] == '?' && !name[1]) 3387 process_color_seq (op, color, name, resp);
3870 {
3871 unsigned short r, g, b;
3872 pix_colors_focused[color].get (display, r, g, b);
3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3874 }
3875 else
3876 set_window_color (color, name);
3877 } 3388 }
3878 break; 3389 break;
3879 case XTerm_Color00: 3390 case XTerm_Color00:
3880 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3391 process_color_seq (op, Color_fg, str, resp);
3881 break; 3392 break;
3882 case XTerm_Color01: 3393 case XTerm_Color01:
3883 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3884 break; 3395 break;
3885#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3886 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3398 process_color_seq (op, Color_cursor, str, resp);
3888 break; 3399 break;
3889#endif 3400#endif
3890 case XTerm_Color_pointer_fg: 3401 case XTerm_Color_pointer_fg:
3891 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3892 break; 3403 break;
3893 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3895 break; 3406 break;
3896#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3897 case XTerm_Color_RV: 3408 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3409 process_color_seq (op, Color_RV, str, resp);
3899 break; 3410 break;
3900 case Rxvt_Color_BD: 3411 case Rxvt_Color_BD:
3901 case URxvt_Color_BD: 3412 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp); 3413 process_color_seq (op, Color_BD, str, resp);
3903 break; 3414 break;
3904 case Rxvt_Color_UL: 3415 case Rxvt_Color_UL:
3905 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3907 break; 3418 break;
3908 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3910 break; 3421 break;
3911#endif 3422#endif
3912#if TRANSPARENT && TINTING 3423#if ENABLE_TRANSPARENCY
3913 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3915 check_our_parents (); 3426 {
3916 if (am_transparent) 3427 bool changed = false;
3917 want_full_refresh = want_refresh = 1; 3428 if (ISSET_PIXCOLOR (Color_tint))
3918 break; 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3919#endif 3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3920 3435
3436 break;
3437#endif
3438
3439#if XPM_BACKGROUND
3921 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3922 if (*str != ';') 3441 if (!strcmp (str, "?"))
3923 { 3442 {
3924#if XPM_BACKGROUND 3443 char str[256];
3925 scale_pixmap (""); /* reset to default scaling */ 3444
3926 set_bgPixmap (str); /* change pixmap */ 3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3927 scr_touch (true); 3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3928#endif 3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3929 } 3449 }
3930 3450 else
3931 while ((str = strchr (str, ';')) != NULL)
3932 { 3451 {
3452 int changed = 0;
3453
3454 if (*str != ';')
3455 {
3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3458 if (bgPixmap.set_file (str)) /* change pixmap */
3459 changed++;
3460 str = strchr (str, ';');
3461 if (str == NULL)
3462 bgPixmap.set_defaultGeometry ();
3463 }
3464 while (str)
3465 {
3933 str++; 3466 str++;
3934#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3935 changed += scale_pixmap (str); 3468 changed++;
3936#endif 3469 str = strchr (str, ';');
3470 }
3471 if (changed)
3472 {
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3937 } 3476 }
3938
3939 if (changed)
3940 {
3941#ifdef XPM_BACKGROUND
3942 resize_pixmap ();
3943 scr_touch (true);
3944#endif
3945 }
3946 break; 3477 break;
3478#endif
3947 3479
3948 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3950 break; 3482 break;
3951 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:
… …
3954 3486
3955 case XTerm_logfile: 3487 case XTerm_logfile:
3956 // TODO, when secure mode? 3488 // TODO, when secure mode?
3957 break; 3489 break;
3958 3490
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3491#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3967 { 3493 {
3968 int fd; 3494 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3495 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3982 case URxvt_italicFont: 3508 case URxvt_italicFont:
3983 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3984#endif 3510#endif
3985 if (query) 3511 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp); 3515 resp);
3990 else 3516 else
3991 { 3517 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3995 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
3996 set_fonts (); 3522 set_fonts ();
3997 } 3523 }
3998 break; 3524 break;
3999 3525
4000#if ENABLE_FRILLS 3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
4001 case URxvt_locale: 3535 case URxvt_locale:
4002 if (query) 3536 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4004 else 3538 else
4005 { 3539 {
4006 set_locale (str); 3540 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3542 init_xlocale ();
4009 } 3543 }
4010 break; 3544 break;
4011 3545
4012 case URxvt_view_up: 3546 case URxvt_view_up:
… …
4023 break; 3557 break;
4024#endif 3558#endif
4025 3559
4026#if ENABLE_PERL 3560#if ENABLE_PERL
4027 case URxvt_perl: 3561 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4029 ; // no responses yet 3563 ; // no responses yet
4030 break; 3564 break;
4031#endif 3565#endif
4032 } 3566 }
4033} 3567}
… …
4065 return state; 3599 return state;
4066} 3600}
4067 3601
4068/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
4069void 3603void
4070rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4071{ 3605{
4072 unsigned int i, j; 3606 unsigned int i, j;
4073 int state; 3607 int state;
4074 3608
4075 static const struct 3609 static const struct
4076 { 3610 {
4077 const int argval; 3611 const int argval;
4078 const unsigned long bit; 3612 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3613 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
4083 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
4085 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
4086 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 3619 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 3620 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 3621 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 3623 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 3627#endif
… …
4152 scr_touch (true); 3681 scr_touch (true);
4153 break; 3682 break;
4154#endif 3683#endif
4155 case 1048: /* alternative cursor save */ 3684 case 1048: /* alternative cursor save */
4156 case 1049: 3685 case 1049:
4157 if (OPTION (Opt_secondaryScreen)) 3686 if (option (Opt_secondaryScreen))
4158 if (mode == 0) 3687 if (mode == 0)
4159 scr_cursor (RESTORE); 3688 scr_cursor (RESTORE);
4160 else if (mode == 1) 3689 else if (mode == 1)
4161 scr_cursor (SAVE); 3690 scr_cursor (SAVE);
4162 break; 3691 break;
… …
4193 /* case 8: - auto repeat, can't do on a per window basis */ 3722 /* case 8: - auto repeat, can't do on a per window basis */
4194 case 9: /* X10 mouse reporting */ 3723 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 3724 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 3725 priv_modes &= ~PrivMode_MouseX11;
4197 break; 3726 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 3727#ifdef scrollBar_esc
4206 case scrollBar_esc: 3728 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 3729 if (scrollbar_mapping (state))
4208 { 3730 {
4209 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
… …
4234 break; 3756 break;
4235 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
4236 set_option (Opt_scrollTtyKeypress, state); 3758 set_option (Opt_scrollTtyKeypress, state);
4237 break; 3759 break;
4238 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
4239 if (OPTION (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
4240 if (current_screen != PRIMARY) 3762 if (current_screen != PRIMARY)
4241 scr_erase_screen (2); 3763 scr_erase_screen (2);
4242 scr_change_screen (state); 3764 scr_change_screen (state);
4243 break; 3765 break;
4244 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
4245 scr_change_screen (state); 3767 scr_change_screen (state);
4246 if (OPTION (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3770 scr_erase_screen (2);
4249 break; 3771 break;
4250 default: 3772 default:
4251 break; 3773 break;
… …
4379 scr_color (Color_bg, Color_bg); 3901 scr_color (Color_bg, Color_bg);
4380 break; 3902 break;
4381 3903
4382 //case 50: // not variable spacing 3904 //case 50: // not variable spacing
4383 3905
4384#if ENABLE_FRILLS 3906#if !ENABLE_MINIMAL
4385 case 90: 3907 case 90:
4386 case 91: /* set bright fg color */ 3908 case 91: /* set bright fg color */
4387 case 92: 3909 case 92:
4388 case 93: 3910 case 93:
4389 case 94: 3911 case 94:
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 3976rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 3977{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return; 3979 return;
4458 3980
4459 if (pty.pty < 0) 3981 if (pty->pty < 0)
4460 return; 3982 return;
4461 3983
4462 if (v_buflen == 0) 3984 if (v_buflen == 0)
4463 { 3985 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465 3987
4466 if ((unsigned int)written == len) 3988 if ((unsigned int)written == len)
4467 return; 3989 return;
4468 3990
4469 data += written; 3991 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4001}
4480 4002
4481void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4482{ 4004{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484 4006
4485 if (written > 0) 4007 if (written > 0)
4486 { 4008 {
4487 v_buflen -= written; 4009 v_buflen -= written;
4488 4010

Diff Legend

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