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.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.346 by root, Wed Aug 15 06:48:16 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, Sel_Primary); 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
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}
923 1000
924#if defined (KEYSYM_RESOURCE) 1001#if defined (KEYSYM_RESOURCE)
925unsigned int 1002unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1004{
… …
957void 1034void
958rxvt_term::flush () 1035rxvt_term::flush ()
959{ 1036{
960 flush_ev.stop (); 1037 flush_ev.stop ();
961 1038
962#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
963 if (want_full_refresh) 1040 if (want_full_refresh)
964 { 1041 {
965 want_full_refresh = 0; 1042 want_full_refresh = 0;
966 scr_clear (); 1043 scr_clear ();
967 scr_touch (false); 1044 scr_touch (false);
… …
1032void 1109void
1033rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1034{ 1111{
1035 make_current (); 1112 make_current ();
1036 1113
1037 refresh_limit = 1;
1038 refresh_count = 0; 1114 refresh_count = 0;
1039 flush (); 1115 flush ();
1040} 1116}
1041 1117
1042#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1121{
1046 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1123 want_refresh = 1;
1048 1124
1049 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1126}
1051#endif 1127#endif
1052 1128
1053#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1054void 1130void
… …
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1181 }
1106} 1182}
1107#endif 1183#endif
1108 1184
1109#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1110static struct event_handler 1186static struct event_handler
1111{ 1187{
1112 check_watcher cw_yield; 1188 check_watcher yield_ev;
1113 1189
1114 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1115 { 1191 {
1116 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
1117 w.stop (); 1200 w.stop ();
1118 } 1201 }
1119 1202
1120 event_handler () 1203 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1122 { 1205 {
1123 } 1206 }
1124} event_handler; 1207} event_handler;
1125#endif 1208#endif
1126 1209
… …
1146 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1147 return true; 1230 return true;
1148 } 1231 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1233 {
1151#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1152 if (display->is_local) 1235 if (display->is_local)
1153 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1154#endif 1237#endif
1155 } 1238 }
1156 else 1239 else
1157 { 1240 {
1158 pty_ev.stop (); 1241 pty_ev.stop ();
1159 1242
1160 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1161 destroy (); 1244 destroy ();
1162 } 1245 }
1163 1246
1164 return false; 1247 return false;
1165} 1248}
1166 1249
1167void 1250void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1180} 1263}
1181 1264
1182void 1265void
1183rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1184{ 1267{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1269 recolour_cursor ();
1187 1270
1188#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1272 hidden_pointer = 0;
1190 1273
1191 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1276#endif
1194} 1277}
1195 1278
1196#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1197void 1280void
1198rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1199{ 1282{
1200 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1201 return; 1284 return;
1202 1285
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1287 XFlush (dpy);
1205 1288
1206 hidden_pointer = 1; 1289 hidden_pointer = 1;
1207} 1290}
1208 1291
1209void 1292void
… …
1282 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1283 (32 + x + 1), 1366 (32 + x + 1),
1284 (32 + y + 1)); 1367 (32 + y + 1));
1285} 1368}
1286 1369
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1370/*{{{ process an X event */
1298void 1371void
1299rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1300{ 1373{
1301 make_current (); 1374 make_current ();
1302 1375
1303 dDisp; 1376 dLocal (Display *, dpy);
1304 1377
1305 if (ev.xany.window == vt 1378 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1381 return;
… …
1313 unsigned int unused_mask; 1386 unsigned int unused_mask;
1314 1387
1315 switch (ev.type) 1388 switch (ev.type)
1316 { 1389 {
1317 case KeyPress: 1390 case KeyPress:
1318#if ISO_14755 1391 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1392 break;
1324 1393
1325 case KeyRelease: 1394 case KeyRelease:
1326 { 1395 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1396 break;
1398 }
1399 1397
1400 case ButtonPress: 1398 case ButtonPress:
1401 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1402 break; 1400 break;
1403 1401
… …
1405 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1406 break; 1404 break;
1407 1405
1408 case ClientMessage: 1406 case ClientMessage:
1409 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 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 {
1412 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)))
1413 destroy (); 1417 destroy ();
1418 }
1414#if ENABLE_EWMH 1419#if ENABLE_EWMH
1415 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])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &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 }
1419#endif 1435#endif
1420 } 1436 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1437 break;
1461 1438
1462 /* 1439 /*
1463 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1483 break; 1460 break;
1484 } 1461 }
1485 break; 1462 break;
1486 1463
1487 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1468 focus_in ();
1489 break; 1469 break;
1490 1470
1491 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1475 focus_out ();
1493 break; 1476 break;
1494 1477
1495 case ConfigureNotify: 1478 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1479 if (ev.xconfigure.window == parent[0])
1497 { 1480 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1482 ;
1500 1483
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1485 {
1503 seen_resize = 1; 1486 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488#ifdef XPM_BACKGROUND
1489 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 {
1492 bgPixmap.render ();
1493 scr_touch (true);
1494 }
1495#endif
1505 } 1496 }
1506 1497
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 1499
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500#ifdef ENABLE_TRANSPARENCY
1510 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1511 check_our_parents (); 1502 bgPixmap.render ();
1512#endif 1503#endif
1513 } 1504 }
1514 break; 1505 break;
1515 1506
1516 case PropertyNotify: 1507 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1510 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1512
1521 break; 1513 break;
1522 1514
1523 case SelectionClear: 1515 case SelectionClear:
1524 selection_clear (); 1516 selection_clear ();
… …
1547 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1548#endif 1540#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1542 break;
1551 1543
1552#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1553 case ReparentNotify: 1545 case ReparentNotify:
1554 rootwin_cb (ev); 1546 rootwin_cb (ev);
1555 break; 1547 break;
1556#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1557 1549
1558 case GraphicsExpose: 1550 case GraphicsExpose:
1559 case Expose: 1551 case Expose:
1560 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1561 { 1553 {
1562 do 1554 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1558
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1560
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1572 1564
1573 want_refresh = 1; 1565 want_refresh = 1;
1574 } 1566 }
1575 else 1567 else
1576 { 1568 {
1577 XEvent unused_event; 1569 XEvent unused_event;
1578 1570
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1572 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1574 ;
1583 1575
1584 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1585 { 1577 {
1586 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1587 scrollbar_show (0); 1579 scrollbar_show (0);
1588 } 1580 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1581 }
1595 break; 1582 break;
1596 1583
1597 case MotionNotify: 1584 case MotionNotify:
1598#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1594 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1595 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1596 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1597 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1598 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1599 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1600 ;
1614 1601
1615 XQueryPointer (disp, vt, 1602 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1603 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1604 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1605 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1606 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1607#ifdef MOUSE_THRESHOLD
… …
1684#endif 1671#endif
1685 } 1672 }
1686 } 1673 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1674 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1675 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1676 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1677 MotionNotify, &ev))
1691 ; 1678 ;
1692 1679
1693 XQueryPointer (disp, scrollBar.win, 1680 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1681 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1682 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1683 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1684 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1685 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1686 scrollbar_size ());
1700 want_refresh = 1; 1687 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1688 scrollbar_show (1);
1703 } 1689 }
1704 break; 1690 break;
1705 } 1691 }
1706 1692
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1693#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1694 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1695 {
1712 if (hidden_cursor) 1696 if (hidden_cursor)
1713 { 1697 {
1714 hidden_cursor = 0; 1698 hidden_cursor = 0;
1715 want_refresh = 1; 1699 want_refresh = 1;
1716 } 1700 }
1717 1701
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1702 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1703 }
1720#endif 1704#endif
1721 1705
1722#if defined(POINTER_BLANK) 1706#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1707 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1708 {
1725 if (ev.type == MotionNotify 1709 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1710 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1711 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1712 if (hidden_pointer)
… …
1740 if (!focus) 1724 if (!focus)
1741 { 1725 {
1742 focus = 1; 1726 focus = 1;
1743 want_refresh = 1; 1727 want_refresh = 1;
1744 1728
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1729 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1730
1747#if USE_XIM 1731#if USE_XIM
1748 if (Input_Context != NULL) 1732 if (Input_Context != NULL)
1749 { 1733 {
1750 IMSetStatusPosition (); 1734 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1735 XSetICFocus (Input_Context);
1752 } 1736 }
1753#endif 1737#endif
1754#if CURSOR_BLINK 1738#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1739 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1740 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1741#endif
1758#if OFF_FOCUS_FADING 1742#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1743 if (rs[Rs_fade])
1760 { 1744 {
1761 pix_colors = pix_colors_focused; 1745 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1746 scr_recolour ();
1763 } 1747 }
1764#endif 1748#endif
1749#if ENABLE_FRILLS
1750 if (option (Opt_urgentOnBell))
1751 {
1752 XWMHints *h;
1753
1754 h = XGetWMHints(dpy, parent[0]);
1755 if (h != NULL)
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints(dpy, parent[0], h);
1759 }
1760 }
1761#endif
1765 } 1762 }
1766} 1763}
1767 1764
1768void 1765void
1769rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1777 1774
1778#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1776 if (iso14755buf)
1780 { 1777 {
1781 iso14755buf = 0; 1778 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1779# if ISO_14755
1783 scr_overlay_off (); 1780 scr_overlay_off ();
1784# endif 1781# endif
1785 } 1782 }
1786#endif 1783#endif
1787#if USE_XIM 1784#if USE_XIM
1788 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1790#endif 1787#endif
1791#if CURSOR_BLINK 1788#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1791 hidden_cursor = 0;
1795#endif 1792#endif
1796#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
… …
1801 } 1798 }
1802#endif 1799#endif
1803 } 1800 }
1804} 1801}
1805 1802
1806#if TRANSPARENT 1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1817void
1808rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1819{
1810 make_current (); 1820 make_current ();
1811 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1827 switch (ev.type)
1813 { 1828 {
1814 case PropertyNotify: 1829 case PropertyNotify:
1815 /* 1830 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1818 */ 1833 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1836 {
1822 1837 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1838 bgPixmap.render ();
1824 case ReparentNotify: 1839 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1840 break;
1828 } 1841 }
1842# endif
1829} 1843}
1830#endif 1844#endif
1831 1845
1832void 1846void
1833rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1856 /*
1843 * VT window processing of button press 1857 * VT window processing of button press
1844 */ 1858 */
1845 if (ev.window == vt) 1859 if (ev.window == vt)
1846 { 1860 {
1861 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1862 return;
1863
1847#if ISO_14755 1864#if ISO_14755
1848 // 5.4 1865 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1866 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1867 {
1851 iso14755_54 (ev.x, ev.y); 1868 iso14755_54 (ev.x, ev.y);
… …
1893 else 1910 else
1894 { 1911 {
1895 if (ev.button != MEvent.button) 1912 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1913 MEvent.clicks = 0;
1897 1914
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1915 switch (ev.button)
1900 { 1916 {
1901 case Button1: 1917 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1922#else
1907 selection.rect = false; 1923 selection.rect = false;
1908#endif 1924#endif
1909 1925
1910 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1928 {
1913 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1915 else 1931 else
1916 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1917 } 1933 }
1918 else 1934 else
1919 { 1935 {
1920 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1937 MEvent.clicks++;
1922 else 1938 else
1923 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1924 1940
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1942 }
1927 1943
1928 MEvent.button = Button1; 1944 MEvent.button = Button1;
1929 break; 1945 break;
1930 1946
1931 case Button3: 1947 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1934 else 1950 else
1935 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1936 1952
1937 MEvent.button = Button3; 1953 MEvent.button = Button3;
1938 break; 1954 break;
1939 } 1955 }
1940 } 1956 }
1941 1957
1942 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1943 return; 1959 return;
1944 } 1960 }
1945 1961
… …
2108 sel_scroll_ev.stop(); 2124 sel_scroll_ev.stop();
2109#endif 2125#endif
2110 2126
2111 if (ev.window == vt) 2127 if (ev.window == vt)
2112 { 2128 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2130 return;
2131
2113#if ISO_14755 2132#if ISO_14755
2114 // 5.4 2133 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2134 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2135 return;
2117#endif 2136#endif
2137
2118 if (reportmode) 2138 if (reportmode)
2119 { 2139 {
2120 /* mouse report from vt window */ 2140 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2141 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2142 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2166 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2167 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2168 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2169 selection_extend (ev.x, ev.y, 0);
2150 2170
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2171 switch (ev.button)
2155 { 2172 {
2156 case Button1: 2173 case Button1:
2157 case Button3: 2174 case Button3:
2158 selection_make (ev.time); 2175 selection_make (ev.time);
2159 break; 2176 break;
2160 2177
2161 case Button2: 2178 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 {
2165 if (ev.state & ShiftMask)
2166 selection_request (ev.time, Sel_Clipboard);
2167 else
2168 selection_request (ev.time, Sel_Primary);
2169 }
2170 break; 2181 break;
2171 2182
2172#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2173 case Button4: 2184 case Button4:
2174 case Button5: 2185 case Button5:
… …
2178 2189
2179 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2180 2191
2181 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2182 i = 1; 2193 i = 1;
2183 else if (OPTION (Opt_mouseWheelScrollPage)) 2194 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2195 i = nrow - 1;
2185 else 2196 else
2186 i = 5; 2197 i = 5;
2187 2198
2188# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
… …
2209 break; 2220 break;
2210#endif 2221#endif
2211 } 2222 }
2212 } 2223 }
2213} 2224}
2214
2215#ifdef TRANSPARENT
2216#if TINTING
2217/* taken from aterm-0.4.2 */
2218
2219typedef uint32_t RUINT32T;
2220
2221void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2222{
2223 int sh_r, sh_g, sh_b;
2224 RUINT32T mask_r, mask_g, mask_b;
2225 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2226 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2227 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2228 int i;
2229
2230 Visual *visual = display->visual;
2231
2232 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2233
2234 /* for convenience */
2235 mask_r = visual->red_mask;
2236 mask_g = visual->green_mask;
2237 mask_b = visual->blue_mask;
2238
2239 /* boring lookup table pre-initialization */
2240 switch (srcImage->bits_per_pixel) {
2241 case 15:
2242 if ((mask_r != 0x7c00) ||
2243 (mask_g != 0x03e0) ||
2244 (mask_b != 0x001f))
2245 return;
2246 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2247 lookup_r = lookup;
2248 lookup_g = lookup+32;
2249 lookup_b = lookup+32+32;
2250 sh_r = 10;
2251 sh_g = 5;
2252 sh_b = 0;
2253 break;
2254 case 16:
2255 if ((mask_r != 0xf800) ||
2256 (mask_g != 0x07e0) ||
2257 (mask_b != 0x001f))
2258 return;
2259 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2260 lookup_r = lookup;
2261 lookup_g = lookup+32;
2262 lookup_b = lookup+32+64;
2263 sh_r = 11;
2264 sh_g = 5;
2265 sh_b = 0;
2266 break;
2267 case 24:
2268 if ((mask_r != 0xff0000) ||
2269 (mask_g != 0x00ff00) ||
2270 (mask_b != 0x0000ff))
2271 return;
2272 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2273 lookup_r = lookup;
2274 lookup_g = lookup+256;
2275 lookup_b = lookup+256+256;
2276 sh_r = 16;
2277 sh_g = 8;
2278 sh_b = 0;
2279 break;
2280 case 32:
2281 if ((mask_r != 0xff0000) ||
2282 (mask_g != 0x00ff00) ||
2283 (mask_b != 0x0000ff))
2284 return;
2285 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2286 lookup_r = lookup;
2287 lookup_g = lookup+256;
2288 lookup_b = lookup+256+256;
2289 sh_r = 16;
2290 sh_g = 8;
2291 sh_b = 0;
2292 break;
2293 default:
2294 return; /* we do not support this color depth */
2295 }
2296
2297 /* prepare limits for color transformation (each channel is handled separately) */
2298 if (shade < 0) {
2299 shade = -shade;
2300 if (shade < 0) shade = 0;
2301 if (shade > 100) shade = 100;
2302
2303 lower_lim_r = 65535-rm;
2304 lower_lim_g = 65535-gm;
2305 lower_lim_b = 65535-bm;
2306
2307 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2308 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2309 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2310
2311 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2312 } else {
2313 if (shade < 0) shade = 0;
2314 if (shade > 100) shade = 100;
2315
2316 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2317
2318 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2319 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2320 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2321 }
2322
2323 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2324 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2325 {
2326 unsigned int tmp;
2327
2328 tmp = lower_lim_r;
2329 lower_lim_r = lower_lim_b;
2330 lower_lim_b = tmp;
2331
2332 tmp = upper_lim_r;
2333 upper_lim_r = upper_lim_b;
2334 upper_lim_b = tmp;
2335 }
2336
2337 /* fill our lookup tables */
2338 for (i = 0; i <= mask_r>>sh_r; i++)
2339 {
2340 RUINT32T tmp;
2341 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2342 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2343 lookup_r[i] = (tmp/65535)<<sh_r;
2344 }
2345 for (i = 0; i <= mask_g>>sh_g; i++)
2346 {
2347 RUINT32T tmp;
2348 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2349 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2350 lookup_g[i] = (tmp/65535)<<sh_g;
2351 }
2352 for (i = 0; i <= mask_b>>sh_b; i++)
2353 {
2354 RUINT32T tmp;
2355 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2356 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2357 lookup_b[i] = (tmp/65535)<<sh_b;
2358 }
2359
2360 /* apply table to input image (replacing colors by newly calculated ones) */
2361 switch (srcImage->bits_per_pixel)
2362 {
2363 case 15:
2364 {
2365 unsigned short *p1, *pf, *p, *pl;
2366 p1 = (unsigned short *) srcImage->data;
2367 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width;
2372 for (; p < pl; p++)
2373 {
2374 *p = lookup_r[(*p & 0x7c00)>>10] |
2375 lookup_g[(*p & 0x03e0)>> 5] |
2376 lookup_b[(*p & 0x001f)];
2377 }
2378 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 16:
2383 {
2384 unsigned short *p1, *pf, *p, *pl;
2385 p1 = (unsigned short *) srcImage->data;
2386 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387 while (p1 < pf)
2388 {
2389 p = p1;
2390 pl = p1 + srcImage->width;
2391 for (; p < pl; p++)
2392 {
2393 *p = lookup_r[(*p & 0xf800)>>11] |
2394 lookup_g[(*p & 0x07e0)>> 5] |
2395 lookup_b[(*p & 0x001f)];
2396 }
2397 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2398 }
2399 break;
2400 }
2401 case 24:
2402 {
2403 unsigned char *p1, *pf, *p, *pl;
2404 p1 = (unsigned char *) srcImage->data;
2405 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2406 while (p1 < pf)
2407 {
2408 p = p1;
2409 pl = p1 + srcImage->width * 3;
2410 for (; p < pl; p += 3)
2411 {
2412 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2413 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2414 p[2] = lookup_r[(p[2] & 0x0000ff)];
2415 }
2416 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2417 }
2418 break;
2419 }
2420 case 32:
2421 {
2422 RUINT32T *p1, *pf, *p, *pl;
2423 p1 = (RUINT32T *) srcImage->data;
2424 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2425
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width;
2430 for (; p < pl; p++)
2431 {
2432 *p = lookup_r[(*p & 0xff0000)>>16] |
2433 lookup_g[(*p & 0x00ff00)>> 8] |
2434 lookup_b[(*p & 0x0000ff)] |
2435 (*p & ~0xffffff);
2436 }
2437 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2438 }
2439 break;
2440 }
2441 }
2442
2443 free (lookup);
2444}
2445#endif
2446
2447/*
2448 * Check our parents are still who we think they are.
2449 * Do transparency updates if required
2450 */
2451int
2452rxvt_term::check_our_parents ()
2453{
2454 int i, pchanged, aformat, have_pixmap, rootdepth;
2455 unsigned long nitems, bytes_after;
2456 Atom atype;
2457 unsigned char *prop = NULL;
2458 Window root, oldp, *list;
2459 Pixmap rootpixmap = None;
2460 XWindowAttributes wattr, wrootattr;
2461 dDisp;
2462
2463 pchanged = 0;
2464
2465 if (!OPTION (Opt_transparent))
2466 return pchanged; /* Don't try any more */
2467
2468 XGetWindowAttributes (disp, display->root, &wrootattr);
2469 rootdepth = wrootattr.depth;
2470
2471 XGetWindowAttributes (disp, parent[0], &wattr);
2472
2473 if (rootdepth != wattr.depth)
2474 {
2475 if (am_transparent)
2476 {
2477 pchanged = 1;
2478 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2479 am_transparent = am_pixmap_trans = 0;
2480 }
2481
2482 return pchanged; /* Don't try any more */
2483 }
2484
2485 /* Get all X ops out of the queue so that our information is up-to-date. */
2486 XSync (disp, False);
2487
2488 /*
2489 * Make the frame window set by the window manager have
2490 * the root background. Some window managers put multiple nested frame
2491 * windows for each client, so we have to take care about that.
2492 */
2493 i = (xa[XA_XROOTPMAP_ID]
2494 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2495 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2496 &nitems, &bytes_after, &prop) == Success);
2497
2498 if (!i || prop == NULL)
2499 i = (xa[XA_ESETROOT_PMAP_ID]
2500 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2501 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2502 &nitems, &bytes_after, &prop) == Success);
2503
2504 if (!i || prop == NULL
2505#if TINTING
2506 || !rs[Rs_color + Color_tint]
2507#endif
2508 )
2509 have_pixmap = 0;
2510 else
2511 {
2512 have_pixmap = 1;
2513 rootpixmap = *(Pixmap *)prop;
2514 XFree (prop);
2515 }
2516
2517 if (have_pixmap)
2518 {
2519 /*
2520 * Copy display->root pixmap transparency
2521 */
2522 int sx, sy, nx, ny;
2523 unsigned int nw, nh;
2524 Window cr;
2525 XImage *image;
2526 GC gc;
2527 XGCValues gcvalue;
2528
2529 XTranslateCoordinates (disp, parent[0], display->root,
2530 0, 0, &sx, &sy, &cr);
2531 nw = (unsigned int)szHint.width;
2532 nh = (unsigned int)szHint.height;
2533 nx = ny = 0;
2534
2535 if (sx < 0)
2536 {
2537 nw += sx;
2538 nx = -sx;
2539 sx = 0;
2540 }
2541
2542 if (sy < 0)
2543 {
2544 nh += sy;
2545 ny = -sy;
2546 sy = 0;
2547 }
2548
2549 min_it (nw, (unsigned int) (wrootattr.width - sx));
2550 min_it (nh, (unsigned int) (wrootattr.height - sy));
2551
2552 XSync (disp, False);
2553 allowedxerror = -1;
2554 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2555
2556 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2557 /* XXX: may need a delay here? */
2558 allowedxerror = 0;
2559
2560 if (image == NULL)
2561 {
2562 if (am_transparent && am_pixmap_trans)
2563 {
2564 pchanged = 1;
2565 if (pixmap != None)
2566 {
2567 XFreePixmap (disp, pixmap);
2568 pixmap = None;
2569 }
2570 }
2571
2572 am_pixmap_trans = 0;
2573 }
2574 else
2575 {
2576 if (pixmap != None)
2577 XFreePixmap (disp, pixmap);
2578
2579#if TINTING
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 unsigned short rm, gm, bm;
2583 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2584
2585 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2586
2587 ShadeXImage (display, image, shade, rm, gm, bm);
2588 }
2589#endif
2590
2591 pixmap = XCreatePixmap (disp, vt,
2592 szHint.width, szHint.height, image->depth);
2593 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2594 XPutImage (disp, pixmap, gc, image, 0, 0,
2595 nx, ny, image->width, image->height);
2596 XFreeGC (disp, gc);
2597 XDestroyImage (image);
2598 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2599 XClearWindow (disp, parent[0]);
2600
2601 if (!am_transparent || !am_pixmap_trans)
2602 pchanged = 1;
2603
2604 am_transparent = am_pixmap_trans = 1;
2605 }
2606 }
2607
2608 if (am_pixmap_trans)
2609 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2610 else
2611 {
2612 unsigned int n;
2613 /*
2614 * InheritPixmap transparency
2615 */
2616 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2617 {
2618 oldp = parent[i];
2619 XQueryTree (disp, parent[i - 1], &root,
2620 &parent[i], &list, &n);
2621 XFree (list);
2622
2623 if (parent[i] == display->root)
2624 {
2625 if (oldp != None)
2626 pchanged = 1;
2627
2628 break;
2629 }
2630
2631 if (oldp != parent[i])
2632 pchanged = 1;
2633 }
2634
2635 n = 0;
2636
2637 if (pchanged)
2638 {
2639 for (; n < (unsigned int)i; n++)
2640 {
2641 XGetWindowAttributes (disp, parent[n], &wattr);
2642 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2643 {
2644 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2645 break;
2646 }
2647 }
2648 }
2649
2650 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2651 {
2652 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2653 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2654 am_transparent = 0;
2655 /* XXX: also turn off Opt_transparent? */
2656 }
2657 else
2658 {
2659#if WAIT_FOR_WM
2660 /* wait (an arbitrary period) for the WM to do its thing
2661 * needed for fvwm2.2.2 (and before?) */
2662 sleep (1);
2663#endif
2664 for (n = 0; n < (unsigned int)i; n++)
2665 {
2666 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2667 XClearWindow (disp, parent[n]);
2668 }
2669
2670 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2671 am_transparent = 1;
2672 }
2673
2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2675 parent[i] = None;
2676 }
2677
2678 if (scrollBar.win)
2679 {
2680 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2681 scrollBar.setIdle ();
2682 scrollbar_show (0);
2683 }
2684
2685 if (am_transparent)
2686 {
2687 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans)
2689 flush ();
2690 }
2691
2692 return pchanged;
2693}
2694#endif
2695 2225
2696/*}}} */ 2226/*}}} */
2697 2227
2698bool 2228bool
2699rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
… …
2748 if (ch == C0_LF) 2278 if (ch == C0_LF)
2749 nlines++; 2279 nlines++;
2750 2280
2751 refresh_count++; 2281 refresh_count++;
2752 2282
2753 if (!OPTION (Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2755 { 2284 {
2756 refreshnow = true;
2757 refresh_count = 0; 2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2289 refreshnow = true;
2758 ch = NOCHAR; 2290 ch = NOCHAR;
2759 break; 2291 break;
2292 }
2760 } 2293 }
2761 2294
2762 // scr_add_lines only works for nlines <= nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2763 if (nlines >= nrow - 1) 2296 if (nlines >= nrow - 1)
2764 { 2297 {
… …
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2326 scr_add_lines (buf, str - buf, nlines);
2794 2327
2795 /* 2328 /*
2796 * If there have been a lot of new lines, then update the screen 2329 * If there have been a lot of new lines, then update the screen
2797 * What the heck I'll cheat and only refresh less than every page-full. 2330 * What the heck we'll cheat and only refresh less than every page-full.
2798 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2799 * is incremented here because we must be doing flat-out scrolling.
2800 */ 2332 */
2801 if (refreshnow) 2333 if (refreshnow)
2802 { 2334 {
2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2804 refresh_limit++;
2805 else
2806 {
2807 flag = true; 2335 flag = true;
2808 scr_refresh (); 2336 scr_refresh ();
2809 want_refresh = 1; 2337 want_refresh = 1;
2810 }
2811 } 2338 }
2812 2339
2813 } 2340 }
2814 else 2341 else
2815 { 2342 {
… …
2831 return flag; 2358 return flag;
2832} 2359}
2833 2360
2834// read the next character 2361// read the next character
2835wchar_t 2362wchar_t
2836rxvt_term::next_char () 2363rxvt_term::next_char () NOTHROW
2837{ 2364{
2838 while (cmdbuf_ptr < cmdbuf_endp) 2365 while (cmdbuf_ptr < cmdbuf_endp)
2839 { 2366 {
2840 // assume 7-bit to be ascii ALWAYS 2367 // assume 7-bit to be ascii ALWAYS
2841 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2862 return NOCHAR; 2389 return NOCHAR;
2863} 2390}
2864 2391
2865// read the next octet 2392// read the next octet
2866uint32_t 2393uint32_t
2867rxvt_term::next_octet () 2394rxvt_term::next_octet () NOTHROW
2868{ 2395{
2869 return cmdbuf_ptr < cmdbuf_endp 2396 return cmdbuf_ptr < cmdbuf_endp
2870 ? (unsigned char)*cmdbuf_ptr++ 2397 ? (unsigned char)*cmdbuf_ptr++
2871 : NOCHAR; 2398 : NOCHAR;
2872} 2399}
2400
2401static class out_of_input out_of_input;
2873 2402
2874/* rxvt_cmd_getc () - Return next input character */ 2403/* rxvt_cmd_getc () - Return next input character */
2875/* 2404/*
2876 * Return the next input character after first passing any keyboard input 2405 * Return the next input character after first passing any keyboard input
2877 * to the command. 2406 * to the command.
2878 */ 2407 */
2879wchar_t 2408wchar_t
2880rxvt_term::cmd_getc () 2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2881{ 2410{
2882 wchar_t c = next_char (); 2411 wchar_t c = next_char ();
2883 2412
2884 if (c == NOCHAR) 2413 if (c == NOCHAR)
2885 throw out_of_input; 2414 throw out_of_input;
2886 2415
2887 return c; 2416 return c;
2888} 2417}
2889 2418
2890uint32_t 2419uint32_t
2891rxvt_term::cmd_get8 () 2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2892{ 2421{
2893 uint32_t c = next_octet (); 2422 uint32_t c = next_octet ();
2894 2423
2895 if (c == NOCHAR) 2424 if (c == NOCHAR)
2896 throw out_of_input; 2425 throw out_of_input;
… …
2962 { 2491 {
2963 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2964 break; /* done = 1 */ 2493 break; /* done = 1 */
2965 } 2494 }
2966 } 2495 }
2967 2496
2968 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2969 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2970 { 2499 {
2971 done = 1; 2500 done = 1;
2972 break; 2501 break;
… …
3034 process_dcs_seq (); 2563 process_dcs_seq ();
3035 break; 2564 break;
3036 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
3037 process_csi_seq (); 2566 process_csi_seq ();
3038 break; 2567 break;
3039 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3040 process_osc_seq (); 2569 process_osc_seq ();
3041 break; 2570 break;
3042#endif 2571#endif
3043 } 2572 }
3044} 2573}
… …
3134 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3135 break; 2664 break;
3136 case '+': 2665 case '+':
3137 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3138 break; 2667 break;
3139#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3140 case '6': 2669 case '6':
3141 scr_backindex (); 2670 scr_backindex ();
3142 break; 2671 break;
3143#endif 2672#endif
3144 case '7': 2673 case '7':
3145 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3146 break; 2675 break;
3147 case '8': 2676 case '8':
3148 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3149 break; 2678 break;
3150#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3151 case '9': 2680 case '9':
3152 scr_forwardindex (); 2681 scr_forwardindex ();
3153 break; 2682 break;
3154#endif 2683#endif
3155 case '=': 2684 case '=':
… …
3272 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3273 unsigned int nargs, p; 2802 unsigned int nargs, p;
3274 int n, ndef; 2803 int n, ndef;
3275 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS];
3276 2805
3277 for (nargs = ESC_ARGS; nargs > 0;) 2806 memset (arg, 0, sizeof (arg));
3278 arg[--nargs] = 0; 2807 nargs = 0;
3279 2808
3280 priv = 0; 2809 priv = 0;
3281 ch = cmd_getc (); 2810 ch = cmd_getc ();
3282 if (ch >= '<' && ch <= '?') 2811 if (ch >= '<' && ch <= '?')
3283 { /* '<' '=' '>' '?' */ 2812 { /* '<' '=' '>' '?' */
… …
3317 ndef = get_byte_array_bit (csi_defaults, i); 2846 ndef = get_byte_array_bit (csi_defaults, i);
3318 for (p = 0; p < nargs; p++) 2847 for (p = 0; p < nargs; p++)
3319 if (arg[p] == -1) 2848 if (arg[p] == -1)
3320 arg[p] = ndef; 2849 arg[p] = ndef;
3321 2850
3322#ifdef DEBUG_CMD
3323 fprintf (stderr, "CSI ");
3324 for (p = 0; p < nargs; p++)
3325 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3326 fprintf (stderr, "%c\n", ch);
3327#endif
3328
3329 /* 2851 /*
3330 * private mode handling 2852 * private mode handling
3331 */ 2853 */
3332 if (priv) 2854 if (priv)
3333 { 2855 {
3334 switch (priv) 2856 switch (priv)
3335 { 2857 {
3336 case '>': 2858 case '>':
3337 if (ch == CSI_DA) /* secondary device attributes */ 2859 if (ch == CSI_DA) /* secondary device attributes */
3338 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2860 {
2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2863 //
2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2866 // that we do not support xterm mouse reporting (should be 95 when we do).
2867 //
2868 tt_printf ("\033[>%d;94;0c", 'U');
2869 }
3339 break; 2870 break;
3340 case '?': 2871 case '?':
3341 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3342 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
3343 break; 2874 break;
… …
3469 break; 3000 break;
3470 case 6: /* CPR requested */ 3001 case 6: /* CPR requested */
3471 scr_report_position (); 3002 scr_report_position ();
3472 break; 3003 break;
3473 case 7: /* unofficial extension */ 3004 case 7: /* unofficial extension */
3474 if (OPTION (Opt_insecure)) 3005 if (option (Opt_insecure))
3475 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3006 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3476 break; 3007 break;
3477 case 8: /* unofficial extension */ 3008 case 8: /* unofficial extension */
3478 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3009 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3479 break; 3010 break;
… …
3546 break; 3077 break;
3547 case CSI_75: 3078 case CSI_75:
3548 scr_cursor (RESTORE); 3079 scr_cursor (RESTORE);
3549 break; 3080 break;
3550 3081
3551#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3552 case CSI_74: 3083 case CSI_74:
3553 process_window_ops (arg, nargs); 3084 process_window_ops (arg, nargs);
3554 break; 3085 break;
3555#endif 3086#endif
3556 3087
… …
3563 break; 3094 break;
3564 } 3095 }
3565} 3096}
3566/*}}} */ 3097/*}}} */
3567 3098
3568#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3569/* ARGSUSED */ 3100/* ARGSUSED */
3570void 3101void
3571rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3102rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3572{ 3103{
3573 int x, y; 3104 int x, y;
3574 XWindowAttributes wattr; 3105 XWindowAttributes wattr;
3575 Window wdummy; 3106 Window wdummy;
3576 dDisp; 3107
3108 dLocal (Display *, dpy);
3577 3109
3578 if (nargs == 0) 3110 if (nargs == 0)
3579 return; 3111 return;
3580 3112
3581 switch (args[0]) 3113 switch (args[0])
3582 { 3114 {
3583 /* 3115 /*
3584 * commands 3116 * commands
3585 */ 3117 */
3586 case 1: /* deiconify window */ 3118 case 1: /* deiconify window */
3587 XMapWindow (disp, parent[0]); 3119 XMapWindow (dpy, parent[0]);
3588 break; 3120 break;
3589 case 2: /* iconify window */ 3121 case 2: /* iconify window */
3590 XIconifyWindow (disp, parent[0], display->screen); 3122 XIconifyWindow (dpy, parent[0], display->screen);
3591 break; 3123 break;
3592 case 3: /* set position (pixels) */ 3124 case 3: /* set position (pixels) */
3593 XMoveWindow (disp, parent[0], args[1], args[2]); 3125 XMoveWindow (dpy, parent[0], args[1], args[2]);
3594 break; 3126 break;
3595 case 4: /* set size (pixels) */ 3127 case 4: /* set size (pixels) */
3596 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3128 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3597 break; 3129 break;
3598 case 5: /* raise window */ 3130 case 5: /* raise window */
3599 XRaiseWindow (disp, parent[0]); 3131 XRaiseWindow (dpy, parent[0]);
3600 break; 3132 break;
3601 case 6: /* lower window */ 3133 case 6: /* lower window */
3602 XLowerWindow (disp, parent[0]); 3134 XLowerWindow (dpy, parent[0]);
3603 break; 3135 break;
3604 case 7: /* refresh window */ 3136 case 7: /* refresh window */
3605 scr_touch (true); 3137 scr_touch (true);
3606 break; 3138 break;
3607 case 8: /* set size (chars) */ 3139 case 8: /* set size (chars) */
… …
3614 if (args[0] >= 24) /* set height (chars) */ 3146 if (args[0] >= 24) /* set height (chars) */
3615 set_widthheight ((unsigned int)width, 3147 set_widthheight ((unsigned int)width,
3616 (unsigned int) (args[1] * fheight)); 3148 (unsigned int) (args[1] * fheight));
3617 break; 3149 break;
3618 3150
3619
3620 /* 3151 /*
3621 * reports - some output format copied from XTerm 3152 * reports - some output format copied from XTerm
3622 */ 3153 */
3623 case 11: /* report window state */ 3154 case 11: /* report window state */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3156 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3626 break; 3157 break;
3627 case 13: /* report window position */ 3158 case 13: /* report window position */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 XTranslateCoordinates (disp, parent[0], wattr.root, 3160 XTranslateCoordinates (dpy, parent[0], wattr.root,
3630 -wattr.border_width, -wattr.border_width, 3161 -wattr.border_width, -wattr.border_width,
3631 &x, &y, &wdummy); 3162 &x, &y, &wdummy);
3632 tt_printf ("\033[3;%d;%dt", x, y); 3163 tt_printf ("\033[3;%d;%dt", x, y);
3633 break; 3164 break;
3634 case 14: /* report window size (pixels) */ 3165 case 14: /* report window size (pixels) */
3635 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3636 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3167 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3637 break; 3168 break;
3638 case 18: /* report text area size (chars) */ 3169 case 18: /* report text area size (chars) */
3639 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3170 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3640 break; 3171 break;
… …
3642 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3643 break; 3174 break;
3644 case 20: /* report icon label */ 3175 case 20: /* report icon label */
3645 { 3176 {
3646 char *s; 3177 char *s;
3647 XGetIconName (disp, parent[0], &s); 3178 XGetIconName (dpy, parent[0], &s);
3648 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3649 XFree (s); 3180 XFree (s);
3650 } 3181 }
3651 break; 3182 break;
3652 case 21: /* report window title */ 3183 case 21: /* report window title */
3653 { 3184 {
3654 char *s; 3185 char *s;
3655 XFetchName (disp, parent[0], &s); 3186 XFetchName (dpy, parent[0], &s);
3656 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3657 XFree (s); 3188 XFree (s);
3658 } 3189 }
3659 break; 3190 break;
3660 } 3191 }
3661} 3192}
… …
3688 seen_esc = true; 3219 seen_esc = true;
3689 continue; 3220 continue;
3690 } 3221 }
3691 else if (ch == C0_BEL || ch == CHAR_ST) 3222 else if (ch == C0_BEL || ch == CHAR_ST)
3692 break; 3223 break;
3224 else if (ch == C0_SYN)
3225 ch = cmd_get8 ();
3693 else if (ch < 0x20) 3226 else if (ch < 0x20)
3694 return NULL; /* other control character - exit */ 3227 return NULL; /* other control character - exit */
3695 3228
3696 seen_esc = false; 3229 seen_esc = false;
3697 3230
3698 if (n >= STRING_MAX - 1) 3231 if (n >= STRING_MAX - 1)
3699 // stop at some sane length 3232 // stop at some sane length
3700 return NULL; 3233 return NULL;
3701 3234
3702 if (ch == C0_SYN)
3703 string[n++] = cmd_get8 ();
3704 else
3705 string[n++] = ch; 3235 string[n++] = ch;
3706 } 3236 }
3707 3237
3708 string[n++] = '\0'; 3238 string[n++] = '\0';
3709 3239
3710 ends_how = (ch == 0x5c ? C0_ESC : ch); 3240 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3761void 3291void
3762rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3292rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3763{ 3293{
3764 if (str[0] == '?' && !str[1]) 3294 if (str[0] == '?' && !str[1])
3765 { 3295 {
3766 unsigned short r, g, b; 3296 rgba c;
3767 pix_colors_focused[color].get (display, r, g, b); 3297 pix_colors_focused[color].get (c);
3298
3299#if XFT
3300 if (c.a != rgba::MAX_CC)
3301 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3302 else
3303#endif
3768 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3769 } 3305 }
3770 else 3306 else
3771 set_window_color (color, str); 3307 set_window_color (color, str);
3772} 3308}
3773 3309
… …
3779{ 3315{
3780 int color; 3316 int color;
3781 char *buf, *name; 3317 char *buf, *name;
3782 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3783 int saveop = op; 3319 int saveop = op;
3784 dDisp; 3320
3321 dLocal (Display *, dpy);
3785 3322
3786 assert (str != NULL); 3323 assert (str != NULL);
3324
3325 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3326 return;
3327
3787 switch (op) 3328 switch (op)
3788 { 3329 {
3789 case XTerm_name: 3330 case XTerm_name:
3790 set_title (str); 3331 set_title (str);
3791 /* FALLTHROUGH */ 3332 /* FALLTHROUGH */
… …
3805 unsigned long bytes_after; 3346 unsigned long bytes_after;
3806 unsigned char *value = 0; 3347 unsigned char *value = 0;
3807 const char *str = ""; 3348 const char *str = "";
3808 3349
3809 if (prop 3350 if (prop
3810 && XGetWindowProperty (disp, parent[0], 3351 && XGetWindowProperty (dpy, parent[0],
3811 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3812 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3813 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3814 && actual_type != None 3355 && actual_type != None
3815 && actual_format == 8) 3356 && actual_format == 8)
3816 str = (const char *)(value); 3357 str = (const char *)(value);
3817 3358
3818 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3359 tt_printf ("\033]%d;%s%c", op, str, resp);
3819 3360
3820 XFree (value); 3361 XFree (value);
3821 } 3362 }
3822 else 3363 else
3823 { 3364 {
… …
3827 { 3368 {
3828 *eq = 0; 3369 *eq = 0;
3829 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3830 } 3371 }
3831 else 3372 else
3832 XDeleteProperty (disp, parent[0], 3373 XDeleteProperty (dpy, parent[0],
3833 display->atom (str)); 3374 display->atom (str));
3834 } 3375 }
3835 break; 3376 break;
3836 3377
3837 case XTerm_Color: 3378 case XTerm_Color:
… …
3847 break; 3388 break;
3848 3389
3849 if ((buf = strchr (name, ';')) != NULL) 3390 if ((buf = strchr (name, ';')) != NULL)
3850 *buf++ = '\0'; 3391 *buf++ = '\0';
3851 3392
3852 if (name[0] == '?' && !name[1]) 3393 process_color_seq (op, color, name, resp);
3853 {
3854 unsigned short r, g, b;
3855 pix_colors_focused[color].get (display, r, g, b);
3856 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3857 }
3858 else
3859 set_window_color (color, name);
3860 } 3394 }
3861 break; 3395 break;
3862 case XTerm_Color00: 3396 case XTerm_Color00:
3863 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3397 process_color_seq (op, Color_fg, str, resp);
3864 break; 3398 break;
3865 case XTerm_Color01: 3399 case XTerm_Color01:
3866 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3400 process_color_seq (op, Color_bg, str, resp);
3867 break; 3401 break;
3868#ifndef NO_CURSORCOLOR 3402#ifndef NO_CURSORCOLOR
3869 case XTerm_Color_cursor: 3403 case XTerm_Color_cursor:
3870 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3404 process_color_seq (op, Color_cursor, str, resp);
3871 break; 3405 break;
3872#endif 3406#endif
3873 case XTerm_Color_pointer_fg: 3407 case XTerm_Color_pointer_fg:
3874 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3875 break; 3409 break;
3876 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3877 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3878 break; 3412 break;
3879#ifndef NO_BOLD_UNDERLINE_REVERSE 3413#ifndef NO_BOLD_UNDERLINE_REVERSE
3880 case XTerm_Color_RV: 3414 case XTerm_Color_RV:
3881 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3415 process_color_seq (op, Color_RV, str, resp);
3882 break; 3416 break;
3883 case Rxvt_Color_BD: 3417 case Rxvt_Color_BD:
3884 case URxvt_Color_BD: 3418 case URxvt_Color_BD:
3885 process_color_seq (op, Color_BD, str, resp); 3419 process_color_seq (op, Color_BD, str, resp);
3886 break; 3420 break;
3887 case Rxvt_Color_UL: 3421 case Rxvt_Color_UL:
3888 case URxvt_Color_UL: 3422 case URxvt_Color_UL:
3889 process_color_seq (op, Color_UL, str, resp); 3423 process_color_seq (op, Color_UL, str, resp);
3890 break; 3424 break;
3891 case URxvt_Color_IT: 3425 case URxvt_Color_IT:
3892 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3426 process_color_seq (op, Color_IT, str, resp);
3893 break; 3427 break;
3894#endif 3428#endif
3895#if TRANSPARENT && TINTING 3429#if ENABLE_TRANSPARENCY
3896 case URxvt_Color_tint: 3430 case URxvt_Color_tint:
3897 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3431 process_color_seq (op, Color_tint, str, resp);
3898 check_our_parents (); 3432 {
3899 if (am_transparent) 3433 bool changed = false;
3900 want_full_refresh = want_refresh = 1; 3434 if (ISSET_PIXCOLOR (Color_tint))
3901 break; 3435 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3902#endif 3436 else
3437 changed = bgPixmap.unset_tint ();
3438 if (changed)
3439 bgPixmap.render ();
3440 }
3903 3441
3442 break;
3443#endif
3444
3445#if XPM_BACKGROUND
3904 case Rxvt_Pixmap: 3446 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?"))
3905 { 3448 {
3449 char str[256];
3450
3451 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3452 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3453 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 }
3456 else
3457 {
3458 int changed = 0;
3459
3906 if (*str != ';') 3460 if (*str != ';')
3907 { 3461 {
3908#if XPM_BACKGROUND
3909 scale_pixmap (""); /* reset to default scaling */ 3462 /* reset to default scaling :*/
3463 bgPixmap.unset_geometry ();
3910 set_bgPixmap (str); /* change pixmap */ 3464 if (bgPixmap.set_file (str)) /* change pixmap */
3465 changed++;
3466 str = strchr (str, ';');
3467 if (str == NULL)
3468 bgPixmap.set_defaultGeometry ();
3469 }
3470 while (str)
3471 {
3472 str++;
3473 if (bgPixmap.set_geometry (str))
3474 changed++;
3475 str = strchr (str, ';');
3476 }
3477 if (changed)
3478 {
3479 bgPixmap.render ();
3911 scr_touch (true); 3480 scr_touch (true);
3912#endif
3913 } 3481 }
3914
3915 int changed = 0;
3916
3917 while ((str = strchr (str, ';')) != NULL)
3918 {
3919 str++;
3920#if XPM_BACKGROUND
3921 changed += scale_pixmap (str);
3922#endif
3923 } 3482 }
3924
3925 if (changed)
3926 {
3927#ifdef XPM_BACKGROUND
3928 resize_pixmap ();
3929 scr_touch (true);
3930#endif
3931 }
3932 }
3933 break; 3483 break;
3484#endif
3934 3485
3935 case Rxvt_restoreFG: 3486 case Rxvt_restoreFG:
3936 set_window_color (Color_fg, str); 3487 set_window_color (Color_fg, str);
3937 break; 3488 break;
3938 case Rxvt_restoreBG: 3489 case Rxvt_restoreBG:
… …
3963 case URxvt_italicFont: 3514 case URxvt_italicFont:
3964 case URxvt_boldItalicFont: 3515 case URxvt_boldItalicFont:
3965#endif 3516#endif
3966 if (query) 3517 if (query)
3967 tt_printf ("\33]%d;%-.250s%c", saveop, 3518 tt_printf ("\33]%d;%-.250s%c", saveop,
3968 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3519 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3969 ? fontset[op - URxvt_font]->fontdesc : "", 3520 ? fontset[op - URxvt_font]->fontdesc : "",
3970 resp); 3521 resp);
3971 else 3522 else
3972 { 3523 {
3973 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3524 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3976 allocated.push_back ((void *)res); 3527 allocated.push_back ((void *)res);
3977 set_fonts (); 3528 set_fonts ();
3978 } 3529 }
3979 break; 3530 break;
3980 3531
3981#if ENABLE_FRILLS 3532 case URxvt_version:
3533 if (query)
3534 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3535 op,
3536 rs[Rs_name], VERSION[0], VERSION[2],
3537 resp);
3538 break;
3539
3540#if !ENABLE_MINIMAL
3982 case URxvt_locale: 3541 case URxvt_locale:
3983 if (query) 3542 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3543 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 3544 else
3986 { 3545 {
3987 set_locale (str); 3546 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 3547 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 3548 init_xlocale ();
… …
4004 break; 3563 break;
4005#endif 3564#endif
4006 3565
4007#if ENABLE_PERL 3566#if ENABLE_PERL
4008 case URxvt_perl: 3567 case URxvt_perl:
4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3568 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4010 ; // no responses yet 3569 ; // no responses yet
4011 break; 3570 break;
4012#endif 3571#endif
4013 } 3572 }
4014} 3573}
… …
4046 return state; 3605 return state;
4047} 3606}
4048 3607
4049/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
4050void 3609void
4051rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4052{ 3611{
4053 unsigned int i, j; 3612 unsigned int i, j;
4054 int state; 3613 int state;
4055 3614
4056 static const struct 3615 static const struct
4057 { 3616 {
4058 const int argval; 3617 const int argval;
4059 const unsigned long bit; 3618 const unsigned long bit;
4060 }
4061
4062 argtopriv[] = { 3619 } argtopriv[] = {
4063 { 1, PrivMode_aplCUR }, 3620 { 1, PrivMode_aplCUR },
4064 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 },
4065 { 3, PrivMode_132 }, 3622 { 3, PrivMode_132 },
4066 { 4, PrivMode_smoothScroll }, 3623 { 4, PrivMode_smoothScroll },
4067 { 5, PrivMode_rVideo }, 3624 { 5, PrivMode_rVideo },
… …
4130 scr_touch (true); 3687 scr_touch (true);
4131 break; 3688 break;
4132#endif 3689#endif
4133 case 1048: /* alternative cursor save */ 3690 case 1048: /* alternative cursor save */
4134 case 1049: 3691 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 3692 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 3693 if (mode == 0)
4137 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
4138 else if (mode == 1) 3695 else if (mode == 1)
4139 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
4140 break; 3697 break;
… …
4205 break; 3762 break;
4206 case 1011: /* scroll to bottom on key press */ 3763 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 3764 set_option (Opt_scrollTtyKeypress, state);
4208 break; 3765 break;
4209 case 1047: /* secondary screen w/ clearing last */ 3766 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3769 scr_erase_screen (2);
4213 scr_change_screen (state); 3770 scr_change_screen (state);
4214 break; 3771 break;
4215 case 1049: /* secondary screen w/ clearing first */ 3772 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 3773 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 3774 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 3775 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 3776 scr_erase_screen (2);
4220 break; 3777 break;
4221 default: 3778 default:
4222 break; 3779 break;
… …
4350 scr_color (Color_bg, Color_bg); 3907 scr_color (Color_bg, Color_bg);
4351 break; 3908 break;
4352 3909
4353 //case 50: // not variable spacing 3910 //case 50: // not variable spacing
4354 3911
4355#if ENABLE_FRILLS 3912#if !ENABLE_MINIMAL
4356 case 90: 3913 case 90:
4357 case 91: /* set bright fg color */ 3914 case 91: /* set bright fg color */
4358 case 92: 3915 case 92:
4359 case 93: 3916 case 93:
4360 case 94: 3917 case 94:

Diff Legend

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