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.344 by root, Fri Aug 10 23:52:12 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)
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, Sel_Primary); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
923 1001
924#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925unsigned int 1003unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1005{
… …
957void 1035void
958rxvt_term::flush () 1036rxvt_term::flush ()
959{ 1037{
960 flush_ev.stop (); 1038 flush_ev.stop ();
961 1039
962#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
963 if (want_full_refresh) 1041 if (want_full_refresh)
964 { 1042 {
965 want_full_refresh = 0; 1043 want_full_refresh = 0;
966 scr_clear (); 1044 scr_clear ();
967 scr_touch (false); 1045 scr_touch (false);
… …
1032void 1110void
1033rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1034{ 1112{
1035 make_current (); 1113 make_current ();
1036 1114
1037 refresh_limit = 1;
1038 refresh_count = 0; 1115 refresh_count = 0;
1039 flush (); 1116 flush ();
1040} 1117}
1041 1118
1042#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1122{
1046 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1124 want_refresh = 1;
1048 1125
1049 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1127}
1051#endif 1128#endif
1052 1129
1053#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1054void 1131void
… …
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1182 }
1106} 1183}
1107#endif 1184#endif
1108 1185
1109#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1110static struct event_handler 1187static struct event_handler
1111{ 1188{
1112 check_watcher cw_yield; 1189 check_watcher yield_ev;
1113 1190
1114 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1115 { 1192 {
1116 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1117 w.stop (); 1201 w.stop ();
1118 } 1202 }
1119 1203
1120 event_handler () 1204 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1122 { 1206 {
1123 } 1207 }
1124} event_handler; 1208} event_handler;
1125#endif 1209#endif
1126 1210
… …
1146 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1147 return true; 1231 return true;
1148 } 1232 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1234 {
1151#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1152 if (display->is_local) 1236 if (display->is_local)
1153 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1154#endif 1238#endif
1155 } 1239 }
1156 else 1240 else
1157 { 1241 {
1158 pty_ev.stop (); 1242 pty_ev.stop ();
1159 1243
1160 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1161 destroy (); 1245 destroy ();
1162 } 1246 }
1163 1247
1164 return false; 1248 return false;
1165} 1249}
1166 1250
1167void 1251void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1180} 1264}
1181 1265
1182void 1266void
1183rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1184{ 1268{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1270 recolour_cursor ();
1187 1271
1188#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1273 hidden_pointer = 0;
1190 1274
1191 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1277#endif
1194} 1278}
1195 1279
1196#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1197void 1281void
1198rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1199{ 1283{
1200 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1201 return; 1285 return;
1202 1286
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1288 XFlush (dpy);
1205 1289
1206 hidden_pointer = 1; 1290 hidden_pointer = 1;
1207} 1291}
1208 1292
1209void 1293void
… …
1282 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1283 (32 + x + 1), 1367 (32 + x + 1),
1284 (32 + y + 1)); 1368 (32 + y + 1));
1285} 1369}
1286 1370
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 */ 1371/*{{{ process an X event */
1298void 1372void
1299rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1300{ 1374{
1301 make_current (); 1375 make_current ();
1302 1376
1303 dDisp; 1377 dLocal (Display *, dpy);
1304 1378
1305 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1382 return;
… …
1313 unsigned int unused_mask; 1387 unsigned int unused_mask;
1314 1388
1315 switch (ev.type) 1389 switch (ev.type)
1316 { 1390 {
1317 case KeyPress: 1391 case KeyPress:
1318#if ISO_14755 1392 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1393 break;
1324 1394
1325 case KeyRelease: 1395 case KeyRelease:
1326 { 1396 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; 1397 break;
1398 }
1399 1398
1400 case ButtonPress: 1399 case ButtonPress:
1401 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1402 break; 1401 break;
1403 1402
… …
1405 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1406 break; 1405 break;
1407 1406
1408 case ClientMessage: 1407 case ClientMessage:
1409 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1418 destroy ();
1419 }
1414#if ENABLE_EWMH 1420#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1419#endif 1436#endif
1420 } 1437 }
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; 1438 break;
1461 1439
1462 /* 1440 /*
1463 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1483 break; 1461 break;
1484 } 1462 }
1485 break; 1463 break;
1486 1464
1487 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1469 focus_in ();
1489 break; 1470 break;
1490 1471
1491 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1476 focus_out ();
1493 break; 1477 break;
1494 1478
1495 case ConfigureNotify: 1479 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1497 { 1481 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1483 ;
1500 1484
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1486 {
1503 seen_resize = 1; 1487 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render_background ();
1494 scr_touch (true);
1495 }
1496#endif
1505 } 1497 }
1506 1498
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 1500
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1501#ifdef ENABLE_TRANSPARENCY
1510 if (OPTION (Opt_transparent)) 1502 if (option (Opt_transparent))
1511 check_our_parents (); 1503 bgPixmap.render_background ();
1512#endif 1504#endif
1513 } 1505 }
1514 break; 1506 break;
1515 1507
1516 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1513
1521 break; 1514 break;
1522 1515
1523 case SelectionClear: 1516 case SelectionClear:
1524 selection_clear (); 1517 selection_clear ();
… …
1547 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1548#endif 1541#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1543 break;
1551 1544
1552#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1553 case ReparentNotify: 1546 case ReparentNotify:
1554 rootwin_cb (ev); 1547 rootwin_cb (ev);
1555 break; 1548 break;
1556#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1557 1550
1558 case GraphicsExpose: 1551 case GraphicsExpose:
1559 case Expose: 1552 case Expose:
1560 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1561 { 1554 {
1562 do 1555 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1559
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1561
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1572 1565
1573 want_refresh = 1; 1566 want_refresh = 1;
1574 } 1567 }
1575 else 1568 else
1576 { 1569 {
1577 XEvent unused_event; 1570 XEvent unused_event;
1578 1571
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1573 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1575 ;
1583 1576
1584 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1585 { 1578 {
1586 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1587 scrollbar_show (0); 1580 scrollbar_show (0);
1588 } 1581 }
1589 1582
1590#ifdef TRANSPARENT 1583#ifdef ENABLE_TRANSPARENCY
1591 if (am_transparent && ev.xany.window == parent[0]) 1584 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window); 1585 XClearWindow (dpy, ev.xany.window);
1593#endif 1586#endif
1594 } 1587 }
1595 break; 1588 break;
1596 1589
1597 case MotionNotify: 1590 case MotionNotify:
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1602 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1604 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1606 ;
1614 1607
1615 XQueryPointer (disp, vt, 1608 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1611 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1612 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
… …
1684#endif 1677#endif
1685 } 1678 }
1686 } 1679 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1681 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1691 ; 1684 ;
1692 1685
1693 XQueryPointer (disp, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1690 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1692 scrollbar_size ());
1700 want_refresh = 1; 1693 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1694 scrollbar_show (1);
1703 } 1695 }
1704 break; 1696 break;
1705 } 1697 }
1706 1698
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1701 {
1712 if (hidden_cursor) 1702 if (hidden_cursor)
1713 { 1703 {
1714 hidden_cursor = 0; 1704 hidden_cursor = 0;
1715 want_refresh = 1; 1705 want_refresh = 1;
1716 } 1706 }
1717 1707
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1709 }
1720#endif 1710#endif
1721 1711
1722#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1714 {
1725 if (ev.type == MotionNotify 1715 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1716 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1717 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1718 if (hidden_pointer)
… …
1740 if (!focus) 1730 if (!focus)
1741 { 1731 {
1742 focus = 1; 1732 focus = 1;
1743 want_refresh = 1; 1733 want_refresh = 1;
1744 1734
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1736
1747#if USE_XIM 1737#if USE_XIM
1748 if (Input_Context != NULL) 1738 if (Input_Context != NULL)
1749 { 1739 {
1750 IMSetStatusPosition (); 1740 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1741 XSetICFocus (Input_Context);
1752 } 1742 }
1753#endif 1743#endif
1754#if CURSOR_BLINK 1744#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1747#endif
1758#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1760 { 1750 {
1761 pix_colors = pix_colors_focused; 1751 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1752 scr_recolour ();
1763 } 1753 }
1764#endif 1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1765 } 1768 }
1766} 1769}
1767 1770
1768void 1771void
1769rxvt_term::focus_out () 1772rxvt_term::focus_out ()
… …
1777 1780
1778#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1782 if (iso14755buf)
1780 { 1783 {
1781 iso14755buf = 0; 1784 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1785# if ISO_14755
1783 scr_overlay_off (); 1786 scr_overlay_off ();
1784# endif 1787# endif
1785 } 1788 }
1786#endif 1789#endif
1787#if USE_XIM 1790#if USE_XIM
1788 if (Input_Context != NULL) 1791 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1790#endif 1793#endif
1791#if CURSOR_BLINK 1794#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1795 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1797 hidden_cursor = 0;
1795#endif 1798#endif
1796#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
… …
1801 } 1804 }
1802#endif 1805#endif
1803 } 1806 }
1804} 1807}
1805 1808
1806#if TRANSPARENT 1809void
1810rxvt_term::update_fade_color (unsigned int idx)
1811{
1812#if OFF_FOCUS_FADING
1813 if (rs[Rs_fade])
1814 {
1815 rgba c;
1816 pix_colors [Color_fade].get (c);
1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1818 }
1819#endif
1820}
1821
1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1823void
1808rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1825{
1810 make_current (); 1826 make_current ();
1811 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1833 switch (ev.type)
1813 { 1834 {
1814 case PropertyNotify: 1835 case PropertyNotify:
1815 /* 1836 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1837 * 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. 1838 * use the property to determine the pixmap. We use it later on.
1818 */ 1839 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1842 {
1822 1843 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1844 bgPixmap.render_background ();
1824 case ReparentNotify: 1845 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1846 break;
1828 } 1847 }
1848# endif
1829} 1849}
1830#endif 1850#endif
1831 1851
1832void 1852void
1833rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1862 /*
1843 * VT window processing of button press 1863 * VT window processing of button press
1844 */ 1864 */
1845 if (ev.window == vt) 1865 if (ev.window == vt)
1846 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1847#if ISO_14755 1870#if ISO_14755
1848 // 5.4 1871 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1873 {
1851 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1893 else 1916 else
1894 { 1917 {
1895 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1897 1920
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1921 switch (ev.button)
1900 { 1922 {
1901 case Button1: 1923 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1924 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1925 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1926#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1927 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1928#else
1907 selection.rect = false; 1929 selection.rect = false;
1908#endif 1930#endif
1909 1931
1910 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1934 {
1913 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1915 else 1937 else
1916 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
1917 } 1939 }
1918 else 1940 else
1919 { 1941 {
1920 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1943 MEvent.clicks++;
1922 else 1944 else
1923 MEvent.clicks = 1; 1945 MEvent.clicks = 1;
1924 1946
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1947 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1948 }
1927 1949
1928 MEvent.button = Button1; 1950 MEvent.button = Button1;
1929 break; 1951 break;
1930 1952
1931 case Button3: 1953 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1934 else 1956 else
1935 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1936 1958
1937 MEvent.button = Button3; 1959 MEvent.button = Button3;
1938 break; 1960 break;
1939 } 1961 }
1940 } 1962 }
1941 1963
1942 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1943 return; 1965 return;
1944 } 1966 }
1945 1967
… …
2108 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2109#endif 2131#endif
2110 2132
2111 if (ev.window == vt) 2133 if (ev.window == vt)
2112 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2113#if ISO_14755 2138#if ISO_14755
2114 // 5.4 2139 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2141 return;
2117#endif 2142#endif
2143
2118 if (reportmode) 2144 if (reportmode)
2119 { 2145 {
2120 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2173 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2150 2176
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2177 switch (ev.button)
2155 { 2178 {
2156 case Button1: 2179 case Button1:
2157 case Button3: 2180 case Button3:
2158 selection_make (ev.time); 2181 selection_make (ev.time);
2159 break; 2182 break;
2160 2183
2161 case Button2: 2184 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2185 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? 2186 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; 2187 break;
2171 2188
2172#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2173 case Button4: 2190 case Button4:
2174 case Button5: 2191 case Button5:
… …
2178 2195
2179 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2180 2197
2181 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2182 i = 1; 2199 i = 1;
2183 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2201 i = nrow - 1;
2185 else 2202 else
2186 i = 5; 2203 i = 5;
2187 2204
2188# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2209 break; 2226 break;
2210#endif 2227#endif
2211 } 2228 }
2212 } 2229 }
2213} 2230}
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 2231
2696/*}}} */ 2232/*}}} */
2697 2233
2698bool 2234bool
2699rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
… …
2748 if (ch == C0_LF) 2284 if (ch == C0_LF)
2749 nlines++; 2285 nlines++;
2750 2286
2751 refresh_count++; 2287 refresh_count++;
2752 2288
2753 if (!OPTION (Opt_jumpScroll) 2289 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2755 { 2290 {
2756 refreshnow = true;
2757 refresh_count = 0; 2291 refresh_count = 0;
2292
2293 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2294 {
2295 refreshnow = true;
2758 ch = NOCHAR; 2296 ch = NOCHAR;
2759 break; 2297 break;
2298 }
2760 } 2299 }
2761 2300
2762 // scr_add_lines only works for nlines <= nrow - 1. 2301 // scr_add_lines only works for nlines <= nrow - 1.
2763 if (nlines >= nrow - 1) 2302 if (nlines >= nrow - 1)
2764 { 2303 {
… …
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2331 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2332 scr_add_lines (buf, str - buf, nlines);
2794 2333
2795 /* 2334 /*
2796 * If there have been a lot of new lines, then update the screen 2335 * 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. 2336 * 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 2337 * if skipScroll is enabled.
2799 * is incremented here because we must be doing flat-out scrolling.
2800 */ 2338 */
2801 if (refreshnow) 2339 if (refreshnow)
2802 { 2340 {
2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2804 refresh_limit++;
2805 else
2806 {
2807 flag = true; 2341 flag = true;
2808 scr_refresh (); 2342 scr_refresh ();
2809 want_refresh = 1; 2343 want_refresh = 1;
2810 }
2811 } 2344 }
2812 2345
2813 } 2346 }
2814 else 2347 else
2815 { 2348 {
… …
2831 return flag; 2364 return flag;
2832} 2365}
2833 2366
2834// read the next character 2367// read the next character
2835wchar_t 2368wchar_t
2836rxvt_term::next_char () 2369rxvt_term::next_char () NOTHROW
2837{ 2370{
2838 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2839 { 2372 {
2840 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS
2841 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2374 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2862 return NOCHAR; 2395 return NOCHAR;
2863} 2396}
2864 2397
2865// read the next octet 2398// read the next octet
2866uint32_t 2399uint32_t
2867rxvt_term::next_octet () 2400rxvt_term::next_octet () NOTHROW
2868{ 2401{
2869 return cmdbuf_ptr < cmdbuf_endp 2402 return cmdbuf_ptr < cmdbuf_endp
2870 ? (unsigned char)*cmdbuf_ptr++ 2403 ? (unsigned char)*cmdbuf_ptr++
2871 : NOCHAR; 2404 : NOCHAR;
2872} 2405}
2406
2407static class out_of_input out_of_input;
2873 2408
2874/* rxvt_cmd_getc () - Return next input character */ 2409/* rxvt_cmd_getc () - Return next input character */
2875/* 2410/*
2876 * Return the next input character after first passing any keyboard input 2411 * Return the next input character after first passing any keyboard input
2877 * to the command. 2412 * to the command.
2878 */ 2413 */
2879wchar_t 2414wchar_t
2880rxvt_term::cmd_getc () 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2881{ 2416{
2882 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2883 2418
2884 if (c == NOCHAR) 2419 if (c == NOCHAR)
2885 throw out_of_input; 2420 throw out_of_input;
2886 2421
2887 return c; 2422 return c;
2888} 2423}
2889 2424
2890uint32_t 2425uint32_t
2891rxvt_term::cmd_get8 () 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2892{ 2427{
2893 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2894 2429
2895 if (c == NOCHAR) 2430 if (c == NOCHAR)
2896 throw out_of_input; 2431 throw out_of_input;
… …
2962 { 2497 {
2963 if ((buf[len++] = cmd_getc ()) == 'i') 2498 if ((buf[len++] = cmd_getc ()) == 'i')
2964 break; /* done = 1 */ 2499 break; /* done = 1 */
2965 } 2500 }
2966 } 2501 }
2967 2502
2968 for (i = 0; i < len; i++) 2503 for (i = 0; i < len; i++)
2969 if (putc (buf[i], fd) == EOF) 2504 if (putc (buf[i], fd) == EOF)
2970 { 2505 {
2971 done = 1; 2506 done = 1;
2972 break; 2507 break;
… …
3034 process_dcs_seq (); 2569 process_dcs_seq ();
3035 break; 2570 break;
3036 case 0x9b: /* CSI */ 2571 case 0x9b: /* CSI */
3037 process_csi_seq (); 2572 process_csi_seq ();
3038 break; 2573 break;
3039 case 0x9d: /* CSI */ 2574 case 0x9d: /* OSC */
3040 process_osc_seq (); 2575 process_osc_seq ();
3041 break; 2576 break;
3042#endif 2577#endif
3043 } 2578 }
3044} 2579}
… …
3134 scr_charset_set (2, (unsigned int)cmd_getc ()); 2669 scr_charset_set (2, (unsigned int)cmd_getc ());
3135 break; 2670 break;
3136 case '+': 2671 case '+':
3137 scr_charset_set (3, (unsigned int)cmd_getc ()); 2672 scr_charset_set (3, (unsigned int)cmd_getc ());
3138 break; 2673 break;
3139#if ENABLE_FRILLS 2674#if !ENABLE_MINIMAL
3140 case '6': 2675 case '6':
3141 scr_backindex (); 2676 scr_backindex ();
3142 break; 2677 break;
3143#endif 2678#endif
3144 case '7': 2679 case '7':
3145 scr_cursor (SAVE); 2680 scr_cursor (SAVE);
3146 break; 2681 break;
3147 case '8': 2682 case '8':
3148 scr_cursor (RESTORE); 2683 scr_cursor (RESTORE);
3149 break; 2684 break;
3150#if ENABLE_FRILLS 2685#if !ENABLE_MINIMAL
3151 case '9': 2686 case '9':
3152 scr_forwardindex (); 2687 scr_forwardindex ();
3153 break; 2688 break;
3154#endif 2689#endif
3155 case '=': 2690 case '=':
… …
3272 unicode_t ch, priv, i; 2807 unicode_t ch, priv, i;
3273 unsigned int nargs, p; 2808 unsigned int nargs, p;
3274 int n, ndef; 2809 int n, ndef;
3275 int arg[ESC_ARGS]; 2810 int arg[ESC_ARGS];
3276 2811
3277 for (nargs = ESC_ARGS; nargs > 0;) 2812 memset (arg, 0, sizeof (arg));
3278 arg[--nargs] = 0; 2813 nargs = 0;
3279 2814
3280 priv = 0; 2815 priv = 0;
3281 ch = cmd_getc (); 2816 ch = cmd_getc ();
3282 if (ch >= '<' && ch <= '?') 2817 if (ch >= '<' && ch <= '?')
3283 { /* '<' '=' '>' '?' */ 2818 { /* '<' '=' '>' '?' */
… …
3317 ndef = get_byte_array_bit (csi_defaults, i); 2852 ndef = get_byte_array_bit (csi_defaults, i);
3318 for (p = 0; p < nargs; p++) 2853 for (p = 0; p < nargs; p++)
3319 if (arg[p] == -1) 2854 if (arg[p] == -1)
3320 arg[p] = ndef; 2855 arg[p] = ndef;
3321 2856
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 /* 2857 /*
3330 * private mode handling 2858 * private mode handling
3331 */ 2859 */
3332 if (priv) 2860 if (priv)
3333 { 2861 {
3334 switch (priv) 2862 switch (priv)
3335 { 2863 {
3336 case '>': 2864 case '>':
3337 if (ch == CSI_DA) /* secondary device attributes */ 2865 if (ch == CSI_DA) /* secondary device attributes */
3338 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2866 {
2867 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2868 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2869 //
2870 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2871 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2872 // that we do not support xterm mouse reporting (should be 95 when we do).
2873 //
2874 tt_printf ("\033[>%d;94;0c", 'U');
2875 }
3339 break; 2876 break;
3340 case '?': 2877 case '?':
3341 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3342 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
3343 break; 2880 break;
… …
3469 break; 3006 break;
3470 case 6: /* CPR requested */ 3007 case 6: /* CPR requested */
3471 scr_report_position (); 3008 scr_report_position ();
3472 break; 3009 break;
3473 case 7: /* unofficial extension */ 3010 case 7: /* unofficial extension */
3474 if (OPTION (Opt_insecure)) 3011 if (option (Opt_insecure))
3475 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3012 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3476 break; 3013 break;
3477 case 8: /* unofficial extension */ 3014 case 8: /* unofficial extension */
3478 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3015 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3479 break; 3016 break;
… …
3546 break; 3083 break;
3547 case CSI_75: 3084 case CSI_75:
3548 scr_cursor (RESTORE); 3085 scr_cursor (RESTORE);
3549 break; 3086 break;
3550 3087
3551#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
3552 case CSI_74: 3089 case CSI_74:
3553 process_window_ops (arg, nargs); 3090 process_window_ops (arg, nargs);
3554 break; 3091 break;
3555#endif 3092#endif
3556 3093
… …
3563 break; 3100 break;
3564 } 3101 }
3565} 3102}
3566/*}}} */ 3103/*}}} */
3567 3104
3568#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
3569/* ARGSUSED */ 3106/* ARGSUSED */
3570void 3107void
3571rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3108rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3572{ 3109{
3573 int x, y; 3110 int x, y;
3574 XWindowAttributes wattr; 3111 XWindowAttributes wattr;
3575 Window wdummy; 3112 Window wdummy;
3576 dDisp; 3113
3114 dLocal (Display *, dpy);
3577 3115
3578 if (nargs == 0) 3116 if (nargs == 0)
3579 return; 3117 return;
3580 3118
3581 switch (args[0]) 3119 switch (args[0])
3582 { 3120 {
3583 /* 3121 /*
3584 * commands 3122 * commands
3585 */ 3123 */
3586 case 1: /* deiconify window */ 3124 case 1: /* deiconify window */
3587 XMapWindow (disp, parent[0]); 3125 XMapWindow (dpy, parent[0]);
3588 break; 3126 break;
3589 case 2: /* iconify window */ 3127 case 2: /* iconify window */
3590 XIconifyWindow (disp, parent[0], display->screen); 3128 XIconifyWindow (dpy, parent[0], display->screen);
3591 break; 3129 break;
3592 case 3: /* set position (pixels) */ 3130 case 3: /* set position (pixels) */
3593 XMoveWindow (disp, parent[0], args[1], args[2]); 3131 XMoveWindow (dpy, parent[0], args[1], args[2]);
3594 break; 3132 break;
3595 case 4: /* set size (pixels) */ 3133 case 4: /* set size (pixels) */
3596 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3597 break; 3135 break;
3598 case 5: /* raise window */ 3136 case 5: /* raise window */
3599 XRaiseWindow (disp, parent[0]); 3137 XRaiseWindow (dpy, parent[0]);
3600 break; 3138 break;
3601 case 6: /* lower window */ 3139 case 6: /* lower window */
3602 XLowerWindow (disp, parent[0]); 3140 XLowerWindow (dpy, parent[0]);
3603 break; 3141 break;
3604 case 7: /* refresh window */ 3142 case 7: /* refresh window */
3605 scr_touch (true); 3143 scr_touch (true);
3606 break; 3144 break;
3607 case 8: /* set size (chars) */ 3145 case 8: /* set size (chars) */
… …
3614 if (args[0] >= 24) /* set height (chars) */ 3152 if (args[0] >= 24) /* set height (chars) */
3615 set_widthheight ((unsigned int)width, 3153 set_widthheight ((unsigned int)width,
3616 (unsigned int) (args[1] * fheight)); 3154 (unsigned int) (args[1] * fheight));
3617 break; 3155 break;
3618 3156
3619
3620 /* 3157 /*
3621 * reports - some output format copied from XTerm 3158 * reports - some output format copied from XTerm
3622 */ 3159 */
3623 case 11: /* report window state */ 3160 case 11: /* report window state */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3626 break; 3163 break;
3627 case 13: /* report window position */ 3164 case 13: /* report window position */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 XTranslateCoordinates (disp, parent[0], wattr.root, 3166 XTranslateCoordinates (dpy, parent[0], wattr.root,
3630 -wattr.border_width, -wattr.border_width, 3167 -wattr.border_width, -wattr.border_width,
3631 &x, &y, &wdummy); 3168 &x, &y, &wdummy);
3632 tt_printf ("\033[3;%d;%dt", x, y); 3169 tt_printf ("\033[3;%d;%dt", x, y);
3633 break; 3170 break;
3634 case 14: /* report window size (pixels) */ 3171 case 14: /* report window size (pixels) */
3635 XGetWindowAttributes (disp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3636 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3637 break; 3174 break;
3638 case 18: /* report text area size (chars) */ 3175 case 18: /* report text area size (chars) */
3639 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3640 break; 3177 break;
… …
3642 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3179 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3643 break; 3180 break;
3644 case 20: /* report icon label */ 3181 case 20: /* report icon label */
3645 { 3182 {
3646 char *s; 3183 char *s;
3647 XGetIconName (disp, parent[0], &s); 3184 XGetIconName (dpy, parent[0], &s);
3648 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3649 XFree (s); 3186 XFree (s);
3650 } 3187 }
3651 break; 3188 break;
3652 case 21: /* report window title */ 3189 case 21: /* report window title */
3653 { 3190 {
3654 char *s; 3191 char *s;
3655 XFetchName (disp, parent[0], &s); 3192 XFetchName (dpy, parent[0], &s);
3656 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3657 XFree (s); 3194 XFree (s);
3658 } 3195 }
3659 break; 3196 break;
3660 } 3197 }
3661} 3198}
… …
3688 seen_esc = true; 3225 seen_esc = true;
3689 continue; 3226 continue;
3690 } 3227 }
3691 else if (ch == C0_BEL || ch == CHAR_ST) 3228 else if (ch == C0_BEL || ch == CHAR_ST)
3692 break; 3229 break;
3230 else if (ch == C0_SYN)
3231 ch = cmd_get8 ();
3693 else if (ch < 0x20) 3232 else if (ch < 0x20)
3694 return NULL; /* other control character - exit */ 3233 return NULL; /* other control character - exit */
3695 3234
3696 seen_esc = false; 3235 seen_esc = false;
3697 3236
3698 if (n >= STRING_MAX - 1) 3237 if (n >= STRING_MAX - 1)
3699 // stop at some sane length 3238 // stop at some sane length
3700 return NULL; 3239 return NULL;
3701 3240
3702 if (ch == C0_SYN)
3703 string[n++] = cmd_get8 ();
3704 else
3705 string[n++] = ch; 3241 string[n++] = ch;
3706 } 3242 }
3707 3243
3708 string[n++] = '\0'; 3244 string[n++] = '\0';
3709 3245
3710 ends_how = (ch == 0x5c ? C0_ESC : ch); 3246 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3761void 3297void
3762rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3298rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3763{ 3299{
3764 if (str[0] == '?' && !str[1]) 3300 if (str[0] == '?' && !str[1])
3765 { 3301 {
3766 unsigned short r, g, b; 3302 rgba c;
3767 pix_colors_focused[color].get (display, r, g, b); 3303 pix_colors_focused[color].get (c);
3304
3305#if XFT
3306 if (c.a != rgba::MAX_CC)
3307 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3308 else
3309#endif
3768 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3310 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3769 } 3311 }
3770 else 3312 else
3771 set_window_color (color, str); 3313 set_window_color (color, str);
3772} 3314}
3773 3315
… …
3779{ 3321{
3780 int color; 3322 int color;
3781 char *buf, *name; 3323 char *buf, *name;
3782 bool query = str[0] == '?' && !str[1]; 3324 bool query = str[0] == '?' && !str[1];
3783 int saveop = op; 3325 int saveop = op;
3784 dDisp; 3326
3327 dLocal (Display *, dpy);
3785 3328
3786 assert (str != NULL); 3329 assert (str != NULL);
3330
3331 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3332 return;
3333
3787 switch (op) 3334 switch (op)
3788 { 3335 {
3789 case XTerm_name: 3336 case XTerm_name:
3790 set_title (str); 3337 set_title (str);
3791 /* FALLTHROUGH */ 3338 /* FALLTHROUGH */
… …
3805 unsigned long bytes_after; 3352 unsigned long bytes_after;
3806 unsigned char *value = 0; 3353 unsigned char *value = 0;
3807 const char *str = ""; 3354 const char *str = "";
3808 3355
3809 if (prop 3356 if (prop
3810 && XGetWindowProperty (disp, parent[0], 3357 && XGetWindowProperty (dpy, parent[0],
3811 prop, 0, 1<<16, 0, AnyPropertyType, 3358 prop, 0, 1<<16, 0, AnyPropertyType,
3812 &actual_type, &actual_format, 3359 &actual_type, &actual_format,
3813 &nitems, &bytes_after, &value) == Success 3360 &nitems, &bytes_after, &value) == Success
3814 && actual_type != None 3361 && actual_type != None
3815 && actual_format == 8) 3362 && actual_format == 8)
3816 str = (const char *)(value); 3363 str = (const char *)(value);
3817 3364
3818 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3365 tt_printf ("\033]%d;%s%c", op, str, resp);
3819 3366
3820 XFree (value); 3367 XFree (value);
3821 } 3368 }
3822 else 3369 else
3823 { 3370 {
… …
3827 { 3374 {
3828 *eq = 0; 3375 *eq = 0;
3829 set_utf8_property (display->atom (str), eq + 1); 3376 set_utf8_property (display->atom (str), eq + 1);
3830 } 3377 }
3831 else 3378 else
3832 XDeleteProperty (disp, parent[0], 3379 XDeleteProperty (dpy, parent[0],
3833 display->atom (str)); 3380 display->atom (str));
3834 } 3381 }
3835 break; 3382 break;
3836 3383
3837 case XTerm_Color: 3384 case XTerm_Color:
… …
3847 break; 3394 break;
3848 3395
3849 if ((buf = strchr (name, ';')) != NULL) 3396 if ((buf = strchr (name, ';')) != NULL)
3850 *buf++ = '\0'; 3397 *buf++ = '\0';
3851 3398
3852 if (name[0] == '?' && !name[1]) 3399 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 } 3400 }
3861 break; 3401 break;
3862 case XTerm_Color00: 3402 case XTerm_Color00:
3863 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3403 process_color_seq (op, Color_fg, str, resp);
3864 break; 3404 break;
3865 case XTerm_Color01: 3405 case XTerm_Color01:
3866 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3406 process_color_seq (op, Color_bg, str, resp);
3867 break; 3407 break;
3868#ifndef NO_CURSORCOLOR 3408#ifndef NO_CURSORCOLOR
3869 case XTerm_Color_cursor: 3409 case XTerm_Color_cursor:
3870 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3410 process_color_seq (op, Color_cursor, str, resp);
3871 break; 3411 break;
3872#endif 3412#endif
3873 case XTerm_Color_pointer_fg: 3413 case XTerm_Color_pointer_fg:
3874 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3875 break; 3415 break;
3876 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3877 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3878 break; 3418 break;
3879#ifndef NO_BOLD_UNDERLINE_REVERSE 3419#ifndef NO_BOLD_UNDERLINE_REVERSE
3880 case XTerm_Color_RV: 3420 case XTerm_Color_RV:
3881 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3421 process_color_seq (op, Color_RV, str, resp);
3882 break; 3422 break;
3883 case Rxvt_Color_BD: 3423 case Rxvt_Color_BD:
3884 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3885 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3886 break; 3426 break;
3887 case Rxvt_Color_UL: 3427 case Rxvt_Color_UL:
3888 case URxvt_Color_UL: 3428 case URxvt_Color_UL:
3889 process_color_seq (op, Color_UL, str, resp); 3429 process_color_seq (op, Color_UL, str, resp);
3890 break; 3430 break;
3891 case URxvt_Color_IT: 3431 case URxvt_Color_IT:
3892 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3432 process_color_seq (op, Color_IT, str, resp);
3893 break; 3433 break;
3894#endif 3434#endif
3895#if TRANSPARENT && TINTING 3435#if ENABLE_TRANSPARENCY
3896 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3897 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3898 check_our_parents ();
3899 if (am_transparent)
3900 want_full_refresh = want_refresh = 1;
3901 break;
3902#endif
3903
3904 case Rxvt_Pixmap:
3905 {
3906 if (*str != ';')
3907 { 3438 {
3908#if XPM_BACKGROUND
3909 scale_pixmap (""); /* reset to default scaling */
3910 set_bgPixmap (str); /* change pixmap */
3911 scr_touch (true);
3912#endif
3913 }
3914
3915 int changed = 0; 3439 bool changed = false;
3916 3440 if (ISSET_PIXCOLOR (Color_tint))
3917 while ((str = strchr (str, ';')) != NULL) 3441 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3918 { 3442 else
3919 str++; 3443 changed = bgPixmap.unset_tint ();
3920#if XPM_BACKGROUND
3921 changed += scale_pixmap (str);
3922#endif
3923 }
3924
3925 if (changed) 3444 if (changed)
3926 { 3445 {
3927#ifdef XPM_BACKGROUND 3446 bgPixmap.render_background ();
3928 resize_pixmap (); 3447 if (am_transparent)
3929 scr_touch (true); 3448 want_full_refresh = want_refresh = 1;
3930#endif
3931 } 3449 }
3932 } 3450 }
3451
3933 break; 3452 break;
3453#endif
3454
3455#if XPM_BACKGROUND
3456 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?"))
3458 {
3459 char str[256];
3460
3461 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 }
3466 else
3467 {
3468 int changed = 0;
3469
3470 if (*str != ';')
3471 {
3472 /* reset to default scaling :*/
3473 bgPixmap.unset_geometry ();
3474 if (bgPixmap.set_file (str)) /* change pixmap */
3475 changed++;
3476 str = strchr (str, ';');
3477 if (str == NULL)
3478 bgPixmap.set_defaultGeometry ();
3479 }
3480 while (str)
3481 {
3482 str++;
3483 if (bgPixmap.set_geometry (str))
3484 changed++;
3485 str = strchr (str, ';');
3486 }
3487 if (changed)
3488 {
3489 bgPixmap.render_background ();
3490 scr_touch (true);
3491 }
3492 }
3493 break;
3494#endif
3934 3495
3935 case Rxvt_restoreFG: 3496 case Rxvt_restoreFG:
3936 set_window_color (Color_fg, str); 3497 set_window_color (Color_fg, str);
3937 break; 3498 break;
3938 case Rxvt_restoreBG: 3499 case Rxvt_restoreBG:
… …
3963 case URxvt_italicFont: 3524 case URxvt_italicFont:
3964 case URxvt_boldItalicFont: 3525 case URxvt_boldItalicFont:
3965#endif 3526#endif
3966 if (query) 3527 if (query)
3967 tt_printf ("\33]%d;%-.250s%c", saveop, 3528 tt_printf ("\33]%d;%-.250s%c", saveop,
3968 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3529 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3969 ? fontset[op - URxvt_font]->fontdesc : "", 3530 ? fontset[op - URxvt_font]->fontdesc : "",
3970 resp); 3531 resp);
3971 else 3532 else
3972 { 3533 {
3973 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3534 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3976 allocated.push_back ((void *)res); 3537 allocated.push_back ((void *)res);
3977 set_fonts (); 3538 set_fonts ();
3978 } 3539 }
3979 break; 3540 break;
3980 3541
3981#if ENABLE_FRILLS 3542 case URxvt_version:
3543 if (query)
3544 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3545 op,
3546 rs[Rs_name], VERSION[0], VERSION[2],
3547 resp);
3548 break;
3549
3550#if !ENABLE_MINIMAL
3982 case URxvt_locale: 3551 case URxvt_locale:
3983 if (query) 3552 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3553 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 3554 else
3986 { 3555 {
3987 set_locale (str); 3556 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 3557 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 3558 init_xlocale ();
… …
4004 break; 3573 break;
4005#endif 3574#endif
4006 3575
4007#if ENABLE_PERL 3576#if ENABLE_PERL
4008 case URxvt_perl: 3577 case URxvt_perl:
4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3578 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4010 ; // no responses yet 3579 ; // no responses yet
4011 break; 3580 break;
4012#endif 3581#endif
4013 } 3582 }
4014} 3583}
… …
4046 return state; 3615 return state;
4047} 3616}
4048 3617
4049/* we're not using priv _yet_ */ 3618/* we're not using priv _yet_ */
4050void 3619void
4051rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4052{ 3621{
4053 unsigned int i, j; 3622 unsigned int i, j;
4054 int state; 3623 int state;
4055 3624
4056 static const struct 3625 static const struct
4057 { 3626 {
4058 const int argval; 3627 const int argval;
4059 const unsigned long bit; 3628 const unsigned long bit;
4060 }
4061
4062 argtopriv[] = { 3629 } argtopriv[] = {
4063 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR },
4064 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
4065 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 },
4066 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll },
4067 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo },
… …
4130 scr_touch (true); 3697 scr_touch (true);
4131 break; 3698 break;
4132#endif 3699#endif
4133 case 1048: /* alternative cursor save */ 3700 case 1048: /* alternative cursor save */
4134 case 1049: 3701 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 3702 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 3703 if (mode == 0)
4137 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
4138 else if (mode == 1) 3705 else if (mode == 1)
4139 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
4140 break; 3707 break;
… …
4205 break; 3772 break;
4206 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 3774 set_option (Opt_scrollTtyKeypress, state);
4208 break; 3775 break;
4209 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3779 scr_erase_screen (2);
4213 scr_change_screen (state); 3780 scr_change_screen (state);
4214 break; 3781 break;
4215 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 3783 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 3785 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 3786 scr_erase_screen (2);
4220 break; 3787 break;
4221 default: 3788 default:
4222 break; 3789 break;
… …
4350 scr_color (Color_bg, Color_bg); 3917 scr_color (Color_bg, Color_bg);
4351 break; 3918 break;
4352 3919
4353 //case 50: // not variable spacing 3920 //case 50: // not variable spacing
4354 3921
4355#if ENABLE_FRILLS 3922#if !ENABLE_MINIMAL
4356 case 90: 3923 case 90:
4357 case 91: /* set bright fg color */ 3924 case 91: /* set bright fg color */
4358 case 92: 3925 case 92:
4359 case 93: 3926 case 93:
4360 case 94: 3927 case 94:

Diff Legend

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