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.265 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 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, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (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}
1001
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
1008 while (l->is_longer () && row < end_row); 1084 while (l->is_longer () && row < end_row);
1009 } 1085 }
1010 while (row < end_row); 1086 while (row < end_row);
1011 } 1087 }
1012 1088
1013 scr_refresh (refresh_type); 1089 scr_refresh ();
1014 scrollbar_show (1); 1090 scrollbar_show (1);
1015#ifdef USE_XIM 1091#ifdef USE_XIM
1016 IMSendSpot (); 1092 IMSendSpot ();
1017#endif 1093#endif
1018 } 1094 }
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1123{
1048 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1125 want_refresh = 1;
1050 1126
1051 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1128}
1053#endif 1129#endif
1054 1130
1055#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1056void 1132void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1147{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1150 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1151 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1153 }
1079} 1154}
1080#endif 1155#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1160{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1162 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1164 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1166 }
1093} 1167}
1094#endif 1168#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1177 {
1104 if (view_start == top_row || view_start == 0) 1178 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1106 1180
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1181 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1183 }
1111} 1184}
1112#endif 1185#endif
1113 1186
1114#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1115static struct event_handler 1188static struct event_handler
1116{ 1189{
1117 check_watcher cw_yield; 1190 check_watcher yield_ev;
1118 1191
1119 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1120 { 1193 {
1121 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1122 w.stop (); 1202 w.stop ();
1123 } 1203 }
1124 1204
1125 event_handler () 1205 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1127 { 1207 {
1128 } 1208 }
1129} event_handler; 1209} event_handler;
1130#endif 1210#endif
1131 1211
… …
1142 1222
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1146 1226
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1228
1149 if (r > 0) 1229 if (r > 0)
1150 { 1230 {
1151 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1152 return true; 1232 return true;
1153 } 1233 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1235 {
1156#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1157 if (display->is_local) 1237 if (display->is_local)
1158 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1159#endif 1239#endif
1160 } 1240 }
1161 else 1241 else
1162 { 1242 {
1163 pty_ev.stop (); 1243 pty_ev.stop ();
1164 1244
1165 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1166 destroy (); 1246 destroy ();
1167 } 1247 }
1168 1248
1169 return false; 1249 return false;
1170} 1250}
… …
1185} 1265}
1186 1266
1187void 1267void
1188rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1189{ 1269{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1271 recolour_cursor ();
1192 1272
1193#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1274 hidden_pointer = 0;
1195 1275
1196 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1198#endif 1278#endif
1199} 1279}
1200 1280
1201#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1202void 1282void
1203rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1204{ 1284{
1205 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1206 return; 1286 return;
1207 1287
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1289 XFlush (dpy);
1210 1290
1211 hidden_pointer = 1; 1291 hidden_pointer = 1;
1212} 1292}
1213 1293
1214void 1294void
… …
1287 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1288 (32 + x + 1), 1368 (32 + x + 1),
1289 (32 + y + 1)); 1369 (32 + y + 1));
1290} 1370}
1291 1371
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301
1302/*{{{ process an X event */ 1372/*{{{ process an X event */
1303void 1373void
1304rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1305{ 1375{
1306 make_current (); 1376 make_current ();
1307 1377
1308 dDisp; 1378 dLocal (Display *, dpy);
1309 1379
1310 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1311 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return; 1383 return;
… …
1318 unsigned int unused_mask; 1388 unsigned int unused_mask;
1319 1389
1320 switch (ev.type) 1390 switch (ev.type)
1321 { 1391 {
1322 case KeyPress: 1392 case KeyPress:
1323#if ISO_14755 1393 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1394 break;
1329 1395
1330 case KeyRelease: 1396 case KeyRelease:
1331 { 1397 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1398 break;
1403 }
1404 1399
1405 case ButtonPress: 1400 case ButtonPress:
1406 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1407 break; 1402 break;
1408 1403
… …
1410 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1411 break; 1406 break;
1412 1407
1413 case ClientMessage: 1408 case ClientMessage:
1414 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1419 destroy ();
1420 }
1419#if ENABLE_EWMH 1421#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1424#endif 1437#endif
1425 } 1438 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1439 break;
1462 1440
1463 case MappingNotify: 1441 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1443 break;
… …
1488 break; 1466 break;
1489 } 1467 }
1490 break; 1468 break;
1491 1469
1492 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1474 focus_in ();
1494 break; 1475 break;
1495 1476
1496 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1481 focus_out ();
1498 break; 1482 break;
1499 1483
1500 case ConfigureNotify: 1484 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1502 { 1486 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1488 ;
1505 1489
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1491 {
1508 seen_resize = 1; 1492 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1510 } 1501 }
1511 1502
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1513 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1514 check_our_parents (); 1507 check_our_parents ();
1515#endif 1508#endif
1516 } 1509 }
1517 break; 1510 break;
1518 1511
1519 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1517
1524 break; 1518 break;
1525 1519
1526 case SelectionClear: 1520 case SelectionClear:
1527 selection_clear (); 1521 selection_clear ();
… …
1563 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1564 { 1558 {
1565 do 1559 do
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1563
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1565
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1575 1569
1576 want_refresh = 1; 1570 want_refresh = 1;
1577 } 1571 }
1578 else 1572 else
1579 { 1573 {
1580 XEvent unused_event; 1574 XEvent unused_event;
1581 1575
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1577 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1579 ;
1586 1580
1587 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1588 { 1582 {
1589 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1590 scrollbar_show (0); 1584 scrollbar_show (0);
1591 } 1585 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1586
1597#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1600#endif 1590#endif
1601 } 1591 }
1602 break; 1592 break;
1603 1593
1604 case MotionNotify: 1594 case MotionNotify:
1605#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1596 if (hidden_pointer)
1607 pointer_unblank (); 1597 pointer_unblank ();
1608#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif 1598#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1600 break;
1618 1601
1619 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
… …
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1606 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1608 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1610 ;
1628 1611
1629 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1616 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1698#endif 1681#endif
1699 } 1682 }
1700 } 1683 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702 { 1685 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1705 ; 1688 ;
1706 1689
1707 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1694 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1716 scrollbar_show (1); 1699 scrollbar_show (1);
1717 } 1700 }
1718 break; 1701 break;
1719 } 1702 }
1720 1703
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1706 {
1726 if (hidden_cursor) 1707 if (hidden_cursor)
1727 { 1708 {
1728 hidden_cursor = 0; 1709 hidden_cursor = 0;
1729 want_refresh = 1; 1710 want_refresh = 1;
1730 } 1711 }
1731 1712
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1714 }
1734#endif 1715#endif
1735 1716
1736#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1719 {
1739 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1754 if (!focus) 1735 if (!focus)
1755 { 1736 {
1756 focus = 1; 1737 focus = 1;
1757 want_refresh = 1; 1738 want_refresh = 1;
1758 1739
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 1741
1761#if USE_XIM 1742#if USE_XIM
1762 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1763 { 1744 {
1764 IMSetStatusPosition (); 1745 IMSetPosition ();
1765 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1766 } 1747 }
1767#endif 1748#endif
1768#if CURSOR_BLINK 1749#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1752#endif
1772#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1774 { 1755 {
1775 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1777 } 1771 }
1778#endif 1772#endif
1779 } 1773 }
1780} 1774}
1781 1775
… …
1801#if USE_XIM 1795#if USE_XIM
1802 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1804#endif 1798#endif
1805#if CURSOR_BLINK 1799#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1808 hidden_cursor = 0; 1802 hidden_cursor = 0;
1809#endif 1803#endif
1810#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1815 } 1809 }
1816#endif 1810#endif
1817 } 1811 }
1818} 1812}
1819 1813
1820#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1821void 1828void
1822rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1830{
1824 make_current (); 1831 make_current ();
1825 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1826 switch (ev.type) 1838 switch (ev.type)
1827 { 1839 {
1828 case PropertyNotify: 1840 case PropertyNotify:
1829 /* 1841 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
… …
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1835 return; 1847 return;
1836 1848
1837 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1838 case ReparentNotify: 1850 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1840 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1841 break; 1853 break;
1842 } 1854 }
1855# endif
1843} 1856}
1844#endif 1857#endif
1845 1858
1846void 1859void
1847rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1869 /*
1857 * VT window processing of button press 1870 * VT window processing of button press
1858 */ 1871 */
1859 if (ev.window == vt) 1872 if (ev.window == vt)
1860 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1861#if ISO_14755 1877#if ISO_14755
1862 // 5.4 1878 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1880 {
1865 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1907 else 1923 else
1908 { 1924 {
1909 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1911 1927
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1928 switch (ev.button)
1914 { 1929 {
1915 case Button1: 1930 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1935#else
1921 selection.rect = false; 1936 selection.rect = false;
1922#endif 1937#endif
1923 1938
1924 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1941 {
1927 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1929 else 1944 else
1930 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1931 } 1946 }
1932 else 1947 else
1933 { 1948 {
1934 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1950 MEvent.clicks++;
1936 else 1951 else
1937 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1938 1953
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1955 }
1941 1956
1942 MEvent.button = Button1; 1957 MEvent.button = Button1;
1943 break; 1958 break;
1944 1959
1945 case Button3: 1960 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1948 else 1963 else
1949 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1950 1965
1951 MEvent.button = Button3; 1966 MEvent.button = Button3;
1952 break; 1967 break;
1953 } 1968 }
1954 } 1969 }
1955 1970
1956 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1957 return; 1972 return;
1958 } 1973 }
1959 1974
… …
2098 } 2113 }
2099 } 2114 }
2100 2115
2101 return; 2116 return;
2102 } 2117 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2118}
2112 2119
2113void 2120void
2114rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
2115{ 2122{
… …
2121 2128
2122 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
2123 { 2130 {
2124 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
2125 scrollbar_show (0); 2132 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2133 }
2130 2134
2131#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2134#endif 2138#endif
2135 2139
2136 if (ev.window == vt) 2140 if (ev.window == vt)
2137 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2138#if ISO_14755 2145#if ISO_14755
2139 // 5.4 2146 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2148 return;
2142#endif 2149#endif
2150
2143 if (reportmode) 2151 if (reportmode)
2144 { 2152 {
2145 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2180 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2175 2183
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2184 switch (ev.button)
2180 { 2185 {
2181 case Button1: 2186 case Button1:
2182 case Button3: 2187 case Button3:
2183 selection_make (ev.time); 2188 selection_make (ev.time);
2184 break; 2189 break;
2190
2185 case Button2: 2191 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2194 break;
2195
2188#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2189 case Button4: 2197 case Button4:
2190 case Button5: 2198 case Button5:
2191 { 2199 {
2192 int i; 2200 int i;
… …
2194 2202
2195 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2196 2204
2197 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2198 i = 1; 2206 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2208 i = nrow - 1;
2201 else 2209 else
2202 i = 5; 2210 i = 5;
2203 2211
2204# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2224 } 2232 }
2225 break; 2233 break;
2226#endif 2234#endif
2227 } 2235 }
2228 } 2236 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2237}
2234 2238
2235#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2236#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2237/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2238 2242
2239typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2240 2244
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{ 2246{
2243 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i; 2252 int i;
2249 2253
2250 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2251 2255
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253 2257
2254 /* for convenience */ 2258 /* for convenience */
2255 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2469 * Do transparency updates if required 2473 * Do transparency updates if required
2470 */ 2474 */
2471int 2475int
2472rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2473{ 2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2474 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2476 Atom atype; 2488 Atom atype;
2477 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2478 Window root, oldp, *list; 2490 Window root, oldp, *list;
2479 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2481 dDisp; 2493 int sx, sy;
2494 Window cr;
2482 2495
2483 pchanged = 0; 2496 pchanged = 0;
2484 2497
2485 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2486 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2487 2500
2488 XGetWindowAttributes (disp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2490 2503
2491 XGetWindowAttributes (disp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2492 2505
2493 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2494 { 2507 {
2495 if (am_transparent) 2508 if (am_transparent)
2496 { 2509 {
2497 pchanged = 1; 2510 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2500 } 2513 }
2501 2514
2502 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2503 } 2516 }
2504 2517
2505 /* Get all X ops out of the queue so that our information is up-to-date. */ 2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False); 2519 XSync (dpy, False);
2507 2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2508 /* 2528 /*
2509 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that. 2531 * windows for each client, so we have to take care about that.
2512 */ 2532 */
2513 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2517 2537
2518 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2523 2543
2524 if (!i || prop == NULL 2544 if (!i || prop == NULL
2525#if TINTING 2545#if TINTING
2526 || !rs[Rs_color + Color_tint] 2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2527#endif 2551#endif
2528 ) 2552 )
2529 have_pixmap = 0; 2553 have_pixmap = 0;
2530 else 2554 else
2531 { 2555 {
… …
2534 XFree (prop); 2558 XFree (prop);
2535 } 2559 }
2536 2560
2537 if (have_pixmap) 2561 if (have_pixmap)
2538 { 2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2539 /* 2685 /*
2540 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2541 */ 2687 */
2542 int sx, sy, nx, ny; 2688 int nx, ny;
2543 unsigned int nw, nh; 2689 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image; 2690 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548 2691
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2553 nx = ny = 0; 2694 nx = ny = 0;
2554 2695
2555 if (sx < 0) 2696 if (sx < 0)
2556 { 2697 {
2557 nw += sx; 2698 nw += sx;
2558 nx = -sx; 2699 nx = -sx;
2559 sx = 0; 2700 sx = 0;
2560 } 2701 }
2561 2702
2562 if (sy < 0) 2703 if (sy < 0)
2563 { 2704 {
2564 nh += sy; 2705 nh += sy;
2565 ny = -sy; 2706 ny = -sy;
2566 sy = 0; 2707 sy = 0;
2567 } 2708 }
2568 2709
2569 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571 2712
2572 XSync (disp, False); 2713 XSync (dpy, False);
2573 allowedxerror = -1; 2714 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575 2716
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2578 allowedxerror = 0; 2719 allowedxerror = 0;
2579
2580 if (image == NULL) 2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2581 { 2749 {
2582 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2583 { 2751 {
2584 pchanged = 1; 2752 pchanged = 1;
2585 if (pixmap != None) 2753 if (pixmap != None)
2586 { 2754 {
2587 XFreePixmap (disp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2588 pixmap = None; 2756 pixmap = None;
2589 } 2757 }
2590 } 2758 }
2591 2759
2592 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2593 } 2761 }
2594 else 2762 else
2595 { 2763 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2620 2766
2621 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1; 2768 pchanged = 1;
2623 2769
2624 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2625 } 2771 }
2626 } 2772 }
2627 2773
2628 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2630 else 2776 else
2631 { 2777 {
2632 unsigned int n; 2778 unsigned int n;
2633 /* 2779 /*
2634 * InheritPixmap transparency 2780 * InheritPixmap transparency
2635 */ 2781 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 { 2783 {
2638 oldp = parent[i]; 2784 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2640 &parent[i], &list, &n);
2641 XFree (list); 2786 XFree (list);
2642 2787
2643 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2644 { 2789 {
2645 if (oldp != None) 2790 if (oldp != None)
… …
2653 } 2798 }
2654 2799
2655 n = 0; 2800 n = 0;
2656 2801
2657 if (pchanged) 2802 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2660 { 2804 {
2661 XGetWindowAttributes (disp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 { 2808 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break; 2810 break;
2666 } 2811 }
2667 } 2812 }
2668 }
2669 2813
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2671 { 2815 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0; 2818 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2676 } 2820 }
2677 else 2821 else
2678 { 2822 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2685 { 2824 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2688 } 2827 }
2689 2828
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2691 am_transparent = 1; 2830 am_transparent = 1;
2692 } 2831 }
2693 2832
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None; 2834 parent[i] = None;
2696 } 2835 }
2697 2836
2698 if (scrollBar.win) 2837 if (scrollBar.win)
2699 { 2838 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2702 scrollbar_show (0); 2841 scrollbar_show (0);
2703 } 2842 }
2704 2843
2705 if (am_transparent) 2844 if (am_transparent)
… …
2707 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2709 flush (); 2848 flush ();
2710 } 2849 }
2711 2850
2712 return pchanged; 2851// return pchanged;
2713} 2852}
2714#endif 2853#endif
2715 2854
2716/*}}} */ 2855/*}}} */
2717 2856
… …
2768 if (ch == C0_LF) 2907 if (ch == C0_LF)
2769 nlines++; 2908 nlines++;
2770 2909
2771 refresh_count++; 2910 refresh_count++;
2772 2911
2773 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2774 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2914 {
2776 refreshnow = true; 2915 refreshnow = true;
2777 refresh_count = 0; 2916 refresh_count = 0;
2778 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2780 } 2919 }
2781 2920
2782 // scr_add_lines only works for nlines <= nrow - 1. 2921 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2922 if (nlines >= nrow - 1)
2784 { 2923 {
2924 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2925 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2926 scr_add_lines (buf, str - buf, nlines);
2787 2927
2788 nlines = 0; 2928 nlines = 0;
2789 str = buf; 2929 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2930 eol = str + min (ncol, UBUFSIZ);
… …
2805 2945
2806 seq_begin = cmdbuf_ptr; 2946 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2947 ch = next_char ();
2808 } 2948 }
2809 2949
2950 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2952 scr_add_lines (buf, str - buf, nlines);
2812 2953
2813 /* 2954 /*
2814 * If there have been a lot of new lines, then update the screen 2955 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2956 * What the heck I'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2817 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2818 */ 2959 */
2819 if (refreshnow) 2960 if (refreshnow)
2820 { 2961 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++; 2963 refresh_limit++;
2823 else 2964 else
2824 { 2965 {
2825 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2826 scr_refresh (refresh_type); 2968 scr_refresh ();
2827 want_refresh = 1; 2969 want_refresh = 1;
2828 } 2970 }
2829 } 2971 }
2830 2972
2831 } 2973 }
… …
2849 return flag; 2991 return flag;
2850} 2992}
2851 2993
2852// read the next character 2994// read the next character
2853wchar_t 2995wchar_t
2854rxvt_term::next_char () 2996rxvt_term::next_char () NOTHROW
2855{ 2997{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2998 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2999 {
2858 // assume 7-bit to be ascii ALWAYS 3000 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3001 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 return NOCHAR; 3022 return NOCHAR;
2881} 3023}
2882 3024
2883// read the next octet 3025// read the next octet
2884uint32_t 3026uint32_t
2885rxvt_term::next_octet () 3027rxvt_term::next_octet () NOTHROW
2886{ 3028{
2887 return cmdbuf_ptr < cmdbuf_endp 3029 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 3030 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 3031 : NOCHAR;
2890} 3032}
3033
3034static class out_of_input out_of_input;
2891 3035
2892/* rxvt_cmd_getc () - Return next input character */ 3036/* rxvt_cmd_getc () - Return next input character */
2893/* 3037/*
2894 * Return the next input character after first passing any keyboard input 3038 * Return the next input character after first passing any keyboard input
2895 * to the command. 3039 * to the command.
2896 */ 3040 */
2897wchar_t 3041wchar_t
2898rxvt_term::cmd_getc () 3042rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 3043{
2900 wchar_t c = next_char (); 3044 wchar_t c = next_char ();
2901 3045
2902 if (c == NOCHAR) 3046 if (c == NOCHAR)
2903 throw out_of_input; 3047 throw out_of_input;
2904 3048
2905 return c; 3049 return c;
2906} 3050}
2907 3051
2908uint32_t 3052uint32_t
2909rxvt_term::cmd_get8 () 3053rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 3054{
2911 uint32_t c = next_octet (); 3055 uint32_t c = next_octet ();
2912 3056
2913 if (c == NOCHAR) 3057 if (c == NOCHAR)
2914 throw out_of_input; 3058 throw out_of_input;
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 3297 break;
3154 case '+': 3298 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 3300 break;
3157#if ENABLE_FRILLS 3301#if !ENABLE_MINIMAL
3158 case '6': 3302 case '6':
3159 scr_backindex (); 3303 scr_backindex ();
3160 break; 3304 break;
3161#endif 3305#endif
3162 case '7': 3306 case '7':
3163 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
3164 break; 3308 break;
3165 case '8': 3309 case '8':
3166 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
3167 break; 3311 break;
3168#if ENABLE_FRILLS 3312#if !ENABLE_MINIMAL
3169 case '9': 3313 case '9':
3170 scr_forwardindex (); 3314 scr_forwardindex ();
3171 break; 3315 break;
3172#endif 3316#endif
3173 case '=': 3317 case '=':
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 3479 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 3480 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 3481 if (arg[p] == -1)
3338 arg[p] = ndef; 3482 arg[p] = ndef;
3339 3483
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 3484 /*
3348 * private mode handling 3485 * private mode handling
3349 */ 3486 */
3350 if (priv) 3487 if (priv)
3351 { 3488 {
3352 switch (priv) 3489 switch (priv)
3353 { 3490 {
3354 case '>': 3491 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3493 {
3494 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496 //
3497 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3499 // that we do not support xterm mouse reporting (should be 95 when we do).
3500 //
3501 tt_printf ("\033[>%d;94;0c", 'U');
3502 }
3357 break; 3503 break;
3358 case '?': 3504 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 3507 break;
… …
3487 break; 3633 break;
3488 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3489 scr_report_position (); 3635 scr_report_position ();
3490 break; 3636 break;
3491 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3493 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3494 break; 3640 break;
3495 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3497 break; 3643 break;
… …
3564 break; 3710 break;
3565 case CSI_75: 3711 case CSI_75:
3566 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
3567 break; 3713 break;
3568 3714
3569#if ENABLE_FRILLS 3715#if !ENABLE_MINIMAL
3570 case CSI_74: 3716 case CSI_74:
3571 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
3572 break; 3718 break;
3573#endif 3719#endif
3574 3720
… …
3581 break; 3727 break;
3582 } 3728 }
3583} 3729}
3584/*}}} */ 3730/*}}} */
3585 3731
3586#if ENABLE_FRILLS 3732#if !ENABLE_MINIMAL
3587/* ARGSUSED */ 3733/* ARGSUSED */
3588void 3734void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3736{
3591 int x, y; 3737 int x, y;
3592 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3593 Window wdummy; 3739 Window wdummy;
3594 dDisp; 3740
3741 dLocal (Display *, dpy);
3595 3742
3596 if (nargs == 0) 3743 if (nargs == 0)
3597 return; 3744 return;
3598 3745
3599 switch (args[0]) 3746 switch (args[0])
3600 { 3747 {
3601 /* 3748 /*
3602 * commands 3749 * commands
3603 */ 3750 */
3604 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3606 break; 3753 break;
3607 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3609 break; 3756 break;
3610 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3612 break; 3759 break;
3613 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3762 break;
3616 case 5: /* raise window */ 3763 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3618 break; 3765 break;
3619 case 6: /* lower window */ 3766 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3621 break; 3768 break;
3622 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3623 scr_touch (true); 3770 scr_touch (true);
3624 break; 3771 break;
3625 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
… …
3632 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3780 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3781 (unsigned int) (args[1] * fheight));
3635 break; 3782 break;
3636 3783
3637
3638 /* 3784 /*
3639 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3640 */ 3786 */
3641 case 11: /* report window state */ 3787 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3790 break;
3645 case 13: /* report window position */ 3791 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3797 break;
3652 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3801 break;
3656 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3804 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3807 break;
3662 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3663 { 3809 {
3664 char *s; 3810 char *s;
3665 XGetIconName (disp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3812 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3813 XFree (s);
3668 } 3814 }
3669 break; 3815 break;
3670 case 21: /* report window title */ 3816 case 21: /* report window title */
3671 { 3817 {
3672 char *s; 3818 char *s;
3673 XFetchName (disp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3820 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s); 3821 XFree (s);
3676 } 3822 }
3677 break; 3823 break;
3678 } 3824 }
3679} 3825}
… …
3706 seen_esc = true; 3852 seen_esc = true;
3707 continue; 3853 continue;
3708 } 3854 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3859 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3713 3861
3714 seen_esc = false; 3862 seen_esc = false;
3715 3863
3716 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3717 // stop at some sane length 3865 // stop at some sane length
3718 return NULL; 3866 return NULL;
3719 3867
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3868 string[n++] = ch;
3724 } 3869 }
3725 3870
3726 string[n++] = '\0'; 3871 string[n++] = '\0';
3727 3872
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3779void 3924void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3925rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{ 3926{
3782 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3783 { 3928 {
3784 unsigned short r, g, b; 3929 rgba c;
3785 pix_colors_focused[color].get (display, r, g, b); 3930 pix_colors_focused[color].get (c);
3931
3932#if XFT
3933 if (c.a != rgba::MAX_CC)
3934 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3935 else
3936#endif
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3937 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787 } 3938 }
3788 else 3939 else
3789 set_window_color (color, str); 3940 set_window_color (color, str);
3790} 3941}
3791 3942
… …
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3944 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3945 */
3795void 3946void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3947rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797{ 3948{
3798 int changed = 0;
3799 int color; 3949 int color;
3800 char *buf, *name; 3950 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3952 int saveop = op;
3803 dDisp; 3953
3954 dLocal (Display *, dpy);
3804 3955
3805 assert (str != NULL); 3956 assert (str != NULL);
3957
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return;
3960
3806 switch (op) 3961 switch (op)
3807 { 3962 {
3808 case XTerm_name: 3963 case XTerm_name:
3809 set_title (str); 3964 set_title (str);
3810 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3979 unsigned long bytes_after;
3825 unsigned char *value = 0; 3980 unsigned char *value = 0;
3826 const char *str = ""; 3981 const char *str = "";
3827 3982
3828 if (prop 3983 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3988 && actual_type != None
3834 && actual_format == 8) 3989 && actual_format == 8)
3835 str = (const char *)(value); 3990 str = (const char *)(value);
3836 3991
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3993
3839 XFree (value); 3994 XFree (value);
3840 } 3995 }
3841 else 3996 else
3842 { 3997 {
… …
3846 { 4001 {
3847 *eq = 0; 4002 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3849 } 4004 }
3850 else 4005 else
3851 XDeleteProperty (disp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3852 display->atom (str)); 4007 display->atom (str));
3853 } 4008 }
3854 break; 4009 break;
3855 4010
3856 case XTerm_Color: 4011 case XTerm_Color:
… …
3866 break; 4021 break;
3867 4022
3868 if ((buf = strchr (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 4024 *buf++ = '\0';
3870 4025
3871 if (name[0] == '?' && !name[1]) 4026 process_color_seq (op, color, name, resp);
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 }
3877 else
3878 set_window_color (color, name);
3879 } 4027 }
3880 break; 4028 break;
3881 case XTerm_Color00: 4029 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3883 break; 4031 break;
3884 case XTerm_Color01: 4032 case XTerm_Color01:
3885 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3886 break; 4034 break;
3887#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3890 break; 4038 break;
3891#endif 4039#endif
3892 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3894 break; 4042 break;
3895 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3897 break; 4045 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4048 process_color_seq (op, Color_RV, str, resp);
3901 break; 4049 break;
3902 case Rxvt_Color_BD: 4050 case Rxvt_Color_BD:
3903 case URxvt_Color_BD: 4051 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp); 4052 process_color_seq (op, Color_BD, str, resp);
3905 break; 4053 break;
3906 case Rxvt_Color_UL: 4054 case Rxvt_Color_UL:
3907 case URxvt_Color_UL: 4055 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp); 4056 process_color_seq (op, Color_UL, str, resp);
3909 break; 4057 break;
3910 case URxvt_Color_IT: 4058 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4059 process_color_seq (op, Color_IT, str, resp);
3912 break; 4060 break;
3913#endif 4061#endif
3914#if TRANSPARENT && TINTING 4062#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint: 4063 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4064 process_color_seq (op, Color_tint, str, resp);
4065
3917 check_our_parents (); 4066 check_our_parents ();
4067
3918 if (am_transparent) 4068 if (am_transparent)
3919 want_full_refresh = want_refresh = 1; 4069 want_full_refresh = want_refresh = 1;
4070
3920 break; 4071 break;
3921#endif 4072#endif
3922 4073
3923 case Rxvt_Pixmap: 4074 case Rxvt_Pixmap:
4075 {
3924 if (*str != ';') 4076 if (*str != ';')
3925 { 4077 {
3926#if XPM_BACKGROUND 4078#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */ 4079 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */ 4080 set_bgPixmap (str); /* change pixmap */
3929 scr_touch (true); 4081 scr_touch (true);
3930#endif 4082#endif
3931 } 4083 }
3932 4084
4085 int changed = 0;
4086
3933 while ((str = strchr (str, ';')) != NULL) 4087 while ((str = strchr (str, ';')) != NULL)
3934 { 4088 {
3935 str++; 4089 str++;
3936#if XPM_BACKGROUND 4090#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 4091 changed += scale_pixmap (str);
3938#endif 4092#endif
3939 } 4093 }
3940 4094
3941 if (changed) 4095 if (changed)
3942 { 4096 {
3943#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 4098 resize_pixmap ();
3945 scr_touch (true); 4099 scr_touch (true);
3946#endif 4100#endif
3947 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
4107 }
3948 break; 4108 break;
3949 4109
3950 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
3952 break; 4112 break;
… …
3956 4116
3957 case XTerm_logfile: 4117 case XTerm_logfile:
3958 // TODO, when secure mode? 4118 // TODO, when secure mode?
3959 break; 4119 break;
3960 4120
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 4121#if 0
3968 case Rxvt_dumpscreen: /* no error notices */ 4122 case Rxvt_dumpscreen: /* no error notices */
3969 { 4123 {
3970 int fd; 4124 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4125 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3984 case URxvt_italicFont: 4138 case URxvt_italicFont:
3985 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3986#endif 4140#endif
3987 if (query) 4141 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp); 4145 resp);
3992 else 4146 else
3993 { 4147 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3997 allocated.push_back ((void *)res); 4151 allocated.push_back ((void *)res);
3998 set_fonts (); 4152 set_fonts ();
3999 } 4153 }
4000 break; 4154 break;
4001 4155
4002#if ENABLE_FRILLS 4156 case URxvt_version:
4157 if (query)
4158 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4159 op,
4160 rs[Rs_name], VERSION[0], VERSION[2],
4161 resp);
4162 break;
4163
4164#if !ENABLE_MINIMAL
4003 case URxvt_locale: 4165 case URxvt_locale:
4004 if (query) 4166 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4006 else 4168 else
4007 { 4169 {
4008 set_locale (str); 4170 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 4172 init_xlocale ();
4011 } 4173 }
4012 break; 4174 break;
4013 4175
4014 case URxvt_view_up: 4176 case URxvt_view_up:
… …
4025 break; 4187 break;
4026#endif 4188#endif
4027 4189
4028#if ENABLE_PERL 4190#if ENABLE_PERL
4029 case URxvt_perl: 4191 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4031 ; // no responses yet 4193 ; // no responses yet
4032 break; 4194 break;
4033#endif 4195#endif
4034 } 4196 }
4035} 4197}
… …
4067 return state; 4229 return state;
4068} 4230}
4069 4231
4070/* we're not using priv _yet_ */ 4232/* we're not using priv _yet_ */
4071void 4233void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4234rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4235{
4074 unsigned int i, j; 4236 unsigned int i, j;
4075 int state; 4237 int state;
4076 4238
4077 static const struct 4239 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4250 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4251 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4252 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4253 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4254 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4255 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4256 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4257#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4258 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4259#endif
… …
4154 scr_touch (true); 4313 scr_touch (true);
4155 break; 4314 break;
4156#endif 4315#endif
4157 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4158 case 1049: 4317 case 1049:
4159 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4160 if (mode == 0) 4319 if (mode == 0)
4161 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4162 else if (mode == 1) 4321 else if (mode == 1)
4163 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4164 break; 4323 break;
… …
4195 /* case 8: - auto repeat, can't do on a per window basis */ 4354 /* case 8: - auto repeat, can't do on a per window basis */
4196 case 9: /* X10 mouse reporting */ 4355 case 9: /* X10 mouse reporting */
4197 if (state) /* orthogonal */ 4356 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX11; 4357 priv_modes &= ~PrivMode_MouseX11;
4199 break; 4358 break;
4200#ifdef menuBar_esc
4201 case menuBar_esc:
4202#ifdef MENUBAR
4203 map_menuBar (state);
4204#endif
4205 break;
4206#endif
4207#ifdef scrollBar_esc 4359#ifdef scrollBar_esc
4208 case scrollBar_esc: 4360 case scrollBar_esc:
4209 if (scrollbar_mapping (state)) 4361 if (scrollbar_mapping (state))
4210 { 4362 {
4211 resize_all_windows (0, 0, 0); 4363 resize_all_windows (0, 0, 0);
… …
4236 break; 4388 break;
4237 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4238 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4239 break; 4391 break;
4240 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4241 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4242 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4243 scr_erase_screen (2); 4395 scr_erase_screen (2);
4244 scr_change_screen (state); 4396 scr_change_screen (state);
4245 break; 4397 break;
4246 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4247 scr_change_screen (state); 4399 scr_change_screen (state);
4248 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4249 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4250 scr_erase_screen (2); 4402 scr_erase_screen (2);
4251 break; 4403 break;
4252 default: 4404 default:
4253 break; 4405 break;
… …
4381 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
4382 break; 4534 break;
4383 4535
4384 //case 50: // not variable spacing 4536 //case 50: // not variable spacing
4385 4537
4386#if ENABLE_FRILLS 4538#if !ENABLE_MINIMAL
4387 case 90: 4539 case 90:
4388 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
4389 case 92: 4541 case 92:
4390 case 93: 4542 case 93:
4391 case 94: 4543 case 94:
… …
4456rxvt_term::tt_write (const char *data, unsigned int len) 4608rxvt_term::tt_write (const char *data, unsigned int len)
4457{ 4609{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4610 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return; 4611 return;
4460 4612
4461 if (pty.pty < 0) 4613 if (pty->pty < 0)
4462 return; 4614 return;
4463 4615
4464 if (v_buflen == 0) 4616 if (v_buflen == 0)
4465 { 4617 {
4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4618 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4467 4619
4468 if ((unsigned int)written == len) 4620 if ((unsigned int)written == len)
4469 return; 4621 return;
4470 4622
4471 data += written; 4623 data += written;
… …
4480 pty_ev.set (EVENT_READ | EVENT_WRITE); 4632 pty_ev.set (EVENT_READ | EVENT_WRITE);
4481} 4633}
4482 4634
4483void rxvt_term::pty_write () 4635void rxvt_term::pty_write ()
4484{ 4636{
4485 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4637 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4486 4638
4487 if (written > 0) 4639 if (written > 0)
4488 { 4640 {
4489 v_buflen -= written; 4641 v_buflen -= written;
4490 4642

Diff Legend

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