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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.326 by root, Sat Jun 9 13:04:27 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/*}}} */ 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}
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{
… …
1006 while (l->is_longer () && row < end_row); 1084 while (l->is_longer () && row < end_row);
1007 } 1085 }
1008 while (row < end_row); 1086 while (row < end_row);
1009 } 1087 }
1010 1088
1011 scr_refresh (refresh_type); 1089 scr_refresh ();
1012 scrollbar_show (1); 1090 scrollbar_show (1);
1013#ifdef USE_XIM 1091#ifdef USE_XIM
1014 IMSendSpot (); 1092 IMSendSpot ();
1015#endif 1093#endif
1016 } 1094 }
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1123{
1046 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1125 want_refresh = 1;
1048 1126
1049 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1128}
1051#endif 1129#endif
1052 1130
1053#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1054void 1132void
… …
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1147{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1150 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1151 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1153 }
1077} 1154}
1078#endif 1155#endif
… …
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1160{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1162 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1164 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1166 }
1091} 1167}
1092#endif 1168#endif
… …
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1177 {
1102 if (view_start == top_row || view_start == 0) 1178 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1104 1180
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1181 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1183 }
1109} 1184}
1110#endif 1185#endif
1111 1186
1112#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1113static struct event_handler 1188static struct event_handler
1114{ 1189{
1115 check_watcher cw_yield; 1190 check_watcher yield_ev;
1116 1191
1117 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1118 { 1193 {
1119 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
1120 w.stop (); 1202 w.stop ();
1121 } 1203 }
1122 1204
1123 event_handler () 1205 event_handler ()
1124 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1125 { 1207 {
1126 } 1208 }
1127} event_handler; 1209} event_handler;
1128#endif 1210#endif
1129 1211
… …
1140 1222
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1144 1226
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1228
1147 if (r > 0) 1229 if (r > 0)
1148 { 1230 {
1149 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1150 return true; 1232 return true;
1151 } 1233 }
1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 { 1235 {
1154#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1155 if (display->is_local) 1237 if (display->is_local)
1156 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1157#endif 1239#endif
1158 } 1240 }
1159 else 1241 else
1160 { 1242 {
1161 pty_ev.stop (); 1243 pty_ev.stop ();
1162 1244
1163 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1164 destroy (); 1246 destroy ();
1165 } 1247 }
1166 1248
1167 return false; 1249 return false;
1168} 1250}
… …
1183} 1265}
1184 1266
1185void 1267void
1186rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1187{ 1269{
1188 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1189 recolour_cursor (); 1271 recolour_cursor ();
1190 1272
1191#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1192 hidden_pointer = 0; 1274 hidden_pointer = 0;
1193 1275
1194 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1195 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1196#endif 1278#endif
1197} 1279}
1198 1280
1199#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1200void 1282void
1201rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1202{ 1284{
1203 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1204 return; 1286 return;
1205 1287
1206 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1207 XFlush (display->display); 1289 XFlush (dpy);
1208 1290
1209 hidden_pointer = 1; 1291 hidden_pointer = 1;
1210} 1292}
1211 1293
1212void 1294void
… …
1285 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1286 (32 + x + 1), 1368 (32 + x + 1),
1287 (32 + y + 1)); 1369 (32 + y + 1));
1288} 1370}
1289 1371
1290#ifdef USING_W11LIB
1291void
1292rxvt_W11_process_x_event (XEvent *ev)
1293{
1294 rxvt_t *r = rxvt_get_r ();
1295
1296 x_cb (*ev);
1297}
1298#endif
1299
1300/*{{{ process an X event */ 1372/*{{{ process an X event */
1301void 1373void
1302rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1303{ 1375{
1304 make_current (); 1376 make_current ();
1305 1377
1306 dDisp; 1378 dLocal (Display *, dpy);
1307 1379
1308 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1309 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return; 1383 return;
… …
1316 unsigned int unused_mask; 1388 unsigned int unused_mask;
1317 1389
1318 switch (ev.type) 1390 switch (ev.type)
1319 { 1391 {
1320 case KeyPress: 1392 case KeyPress:
1321#if ISO_14755 1393 key_press (ev.xkey);
1322 if (!(iso14755buf & ISO_14755_52))
1323#endif
1324 lookup_key (ev.xkey);
1325
1326 break; 1394 break;
1327 1395
1328 case KeyRelease: 1396 case KeyRelease:
1329 { 1397 key_release (ev.xkey);
1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1331 KeySym keysym;
1332
1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1334#endif
1335
1336#if ENABLE_FRILLS || ISO_14755
1337 // ISO 14755 support
1338 if (iso14755buf)
1339 if (iso14755buf & ISO_14755_52)
1340 {
1341# if ENABLE_OVERLAY
1342 scr_overlay_off ();
1343# endif
1344# if ISO_14755
1345 // iso14755 part 5.2 handling: release time
1346 // first: controls
1347 if ((ev.xkey.state & ControlMask)
1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1350 {
1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1352 commit_iso14755 ();
1353 goto skip_switch;
1354 }
1355
1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1357 if (i[0] == keysym)
1358 {
1359 iso14755buf = ISO_14755_51 | i[1];
1360 commit_iso14755 ();
1361 goto skip_switch;
1362 }
1363
1364 scr_bell ();
1365# endif
1366 iso14755buf = 0;
1367 break;
1368 }
1369 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374 if (iso14755buf & ISO_14755_51)
1375 commit_iso14755 ();
1376#if ISO_14755
1377 else if (iso14755buf & ISO_14755_STARTED)
1378 {
1379 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1380
1381 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1382 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1383 }
1384# endif
1385 else
1386 iso14755buf = 0;
1387 }
1388#endif
1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1395 if (!(ev.xkey.state & ControlMask))
1396 slip_wheel_ev.stop ();
1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1398 mouse_slip_wheel_speed = 0;
1399#endif
1400 break; 1398 break;
1401 }
1402 1399
1403 case ButtonPress: 1400 case ButtonPress:
1404 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1405 break; 1402 break;
1406 1403
… …
1408 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1409 break; 1406 break;
1410 1407
1411 case ClientMessage: 1408 case ClientMessage:
1412 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414 { 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 {
1415 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)))
1416 destroy (); 1419 destroy ();
1420 }
1417#if ENABLE_EWMH 1421#if ENABLE_EWMH
1418 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])
1419 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &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 }
1422#endif 1437#endif
1423 } 1438 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1433#ifdef OFFIX_DND
1434 /* OffiX Dnd (drag 'n' drop) protocol */
1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436 && (ev.xclient.data.l[0] == DndFile
1437 || ev.xclient.data.l[0] == DndDir
1438 || ev.xclient.data.l[0] == DndLink))
1439 {
1440 /* Get Dnd data */
1441 Atom ActualType;
1442 int ActualFormat;
1443 unsigned char *data;
1444 unsigned long Size, RemainingBytes;
1445
1446 XGetWindowProperty (disp, display->root,
1447 xa[XA_DNDSELECTION],
1448 0L, 1000000L,
1449 False, AnyPropertyType,
1450 &ActualType, &ActualFormat,
1451 &Size, &RemainingBytes,
1452 &data);
1453 set_string_property (XA_CUT_BUFFER0, data);
1454 XFree (data);
1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457 }
1458#endif /* OFFIX_DND */
1459 break; 1439 break;
1460 1440
1461 case MappingNotify: 1441 case MappingNotify:
1462 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1463 break; 1443 break;
… …
1486 break; 1466 break;
1487 } 1467 }
1488 break; 1468 break;
1489 1469
1490 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1491 focus_in (); 1474 focus_in ();
1492 break; 1475 break;
1493 1476
1494 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1495 focus_out (); 1481 focus_out ();
1496 break; 1482 break;
1497 1483
1498 case ConfigureNotify: 1484 case ConfigureNotify:
1499 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1500 { 1486 {
1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1502 ; 1488 ;
1503 1489
1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505 { 1491 {
1506 seen_resize = 1; 1492 seen_resize = 1;
1507 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
1508 } 1501 }
1509 1502
1510#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
1511 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1512 check_our_parents (); 1507 check_our_parents ();
1513#endif 1508#endif
1514 } 1509 }
1515 break; 1510 break;
1516 1511
1517 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1520 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1521 1517
1522 break; 1518 break;
1523 1519
1524 case SelectionClear: 1520 case SelectionClear:
1525 selection_clear (); 1521 selection_clear ();
… …
1561 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1562 { 1558 {
1563 do 1559 do
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1567 1563
1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569 1565
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1573 1569
1574 want_refresh = 1; 1570 want_refresh = 1;
1575 } 1571 }
1576 else 1572 else
1577 { 1573 {
1578 XEvent unused_event; 1574 XEvent unused_event;
1579 1575
1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1581 ; 1577 ;
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1583 ; 1579 ;
1584 1580
1585 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1586 { 1582 {
1587 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1588 scrollbar_show (0); 1584 scrollbar_show (0);
1589 } 1585 }
1590 1586
1591#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1592 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1593 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1594#endif 1590#endif
1595 } 1591 }
1596 break; 1592 break;
1597 1593
1598 case MotionNotify: 1594 case MotionNotify:
… …
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop 1606 ; // nop
1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1612 { 1608 {
1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1614 ; 1610 ;
1615 1611
1616 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1617 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1618 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1619 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1620 &ev.xbutton.state); 1616 &ev.xbutton.state);
1621#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1685#endif 1681#endif
1686 } 1682 }
1687 } 1683 }
1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689 { 1685 {
1690 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1691 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1692 ; 1688 ;
1693 1689
1694 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1695 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1696 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1697 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1698 &unused_mask); 1694 &unused_mask);
1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1703 scrollbar_show (1); 1699 scrollbar_show (1);
1704 } 1700 }
1705 break; 1701 break;
1706 } 1702 }
1707 1703
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1712 { 1706 {
1713 if (hidden_cursor) 1707 if (hidden_cursor)
1714 { 1708 {
1715 hidden_cursor = 0; 1709 hidden_cursor = 0;
1716 want_refresh = 1; 1710 want_refresh = 1;
1717 } 1711 }
1718 1712
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720 } 1714 }
1721#endif 1715#endif
1722 1716
1723#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 { 1719 {
1726 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1729 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1741 if (!focus) 1735 if (!focus)
1742 { 1736 {
1743 focus = 1; 1737 focus = 1;
1744 want_refresh = 1; 1738 want_refresh = 1;
1745 1739
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1741
1748#if USE_XIM 1742#if USE_XIM
1749 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1750 { 1744 {
1751 IMSetStatusPosition (); 1745 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1753 } 1747 }
1754#endif 1748#endif
1755#if CURSOR_BLINK 1749#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1752#endif
1759#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1761 { 1755 {
1762 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1763 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 }
1764 } 1771 }
1765#endif 1772#endif
1766 } 1773 }
1767} 1774}
1768 1775
… …
1788#if USE_XIM 1795#if USE_XIM
1789 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1791#endif 1798#endif
1792#if CURSOR_BLINK 1799#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1795 hidden_cursor = 0; 1802 hidden_cursor = 0;
1796#endif 1803#endif
1797#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1802 } 1809 }
1803#endif 1810#endif
1804 } 1811 }
1805} 1812}
1806 1813
1807#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
1808void 1828void
1809rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1830{
1811 make_current (); 1831 make_current ();
1812 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
1813 switch (ev.type) 1838 switch (ev.type)
1814 { 1839 {
1815 case PropertyNotify: 1840 case PropertyNotify:
1816 /* 1841 /*
1817 * 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,
… …
1821 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1822 return; 1847 return;
1823 1848
1824 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1825 case ReparentNotify: 1850 case ReparentNotify:
1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1827 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1828 break; 1853 break;
1829 } 1854 }
1855# endif
1830} 1856}
1831#endif 1857#endif
1832 1858
1833void 1859void
1834rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1843 /* 1869 /*
1844 * VT window processing of button press 1870 * VT window processing of button press
1845 */ 1871 */
1846 if (ev.window == vt) 1872 if (ev.window == vt)
1847 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1848#if ISO_14755 1877#if ISO_14755
1849 // 5.4 1878 // 5.4
1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851 { 1880 {
1852 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1894 else 1923 else
1895 { 1924 {
1896 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1898 1927
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1928 switch (ev.button)
1901 { 1929 {
1902 case Button1: 1930 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1935#else
1908 selection.rect = false; 1936 selection.rect = false;
1909#endif 1937#endif
1910 1938
1911 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1941 {
1914 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1916 else 1944 else
1917 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1918 } 1946 }
1919 else 1947 else
1920 { 1948 {
1921 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1950 MEvent.clicks++;
1923 else 1951 else
1924 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1925 1953
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1955 }
1928 1956
1929 MEvent.button = Button1; 1957 MEvent.button = Button1;
1930 break; 1958 break;
1931 1959
1932 case Button3: 1960 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1935 else 1963 else
1936 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1937 1965
1938 MEvent.button = Button3; 1966 MEvent.button = Button3;
1939 break; 1967 break;
1940 } 1968 }
1941 } 1969 }
1942 1970
1943 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1944 return; 1972 return;
1945 } 1973 }
1946 1974
… …
2100 2128
2101 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
2102 { 2130 {
2103 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
2104 scrollbar_show (0); 2132 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2133 }
2109 2134
2110#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2113#endif 2138#endif
2114 2139
2115 if (ev.window == vt) 2140 if (ev.window == vt)
2116 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2117#if ISO_14755 2145#if ISO_14755
2118 // 5.4 2146 // 5.4
2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2120 return; 2148 return;
2121#endif 2149#endif
2150
2122 if (reportmode) 2151 if (reportmode)
2123 { 2152 {
2124 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2125 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2126 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2150 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2151 && bypass_keystate 2180 && bypass_keystate
2152 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2153 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2154 2183
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2158 switch (ev.button) 2184 switch (ev.button)
2159 { 2185 {
2160 case Button1: 2186 case Button1:
2161 case Button3: 2187 case Button3:
2162 selection_make (ev.time); 2188 selection_make (ev.time);
2163 break; 2189 break;
2190
2164 case Button2: 2191 case Button2:
2165 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);
2166 break; 2194 break;
2195
2167#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2168 case Button4: 2197 case Button4:
2169 case Button5: 2198 case Button5:
2170 { 2199 {
2171 int i; 2200 int i;
… …
2173 2202
2174 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2175 2204
2176 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2177 i = 1; 2206 i = 1;
2178 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2179 i = nrow - 1; 2208 i = nrow - 1;
2180 else 2209 else
2181 i = 5; 2210 i = 5;
2182 2211
2183# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2206 } 2235 }
2207 } 2236 }
2208} 2237}
2209 2238
2210#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2211#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2212/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2213 2242
2214typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2215 2244
2216void 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)
2217{ 2246{
2218 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2219 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223 int i; 2252 int i;
2224 2253
2225 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2226 2255
2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2228 2257
2229 /* for convenience */ 2258 /* for convenience */
2230 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2444 * Do transparency updates if required 2473 * Do transparency updates if required
2445 */ 2474 */
2446int 2475int
2447rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2448{ 2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_parents_ev.stop ();
2480 check_our_parents_ev.start (NOW + .1);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2449 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2450 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
2451 Atom atype; 2490 Atom atype;
2452 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
2453 Window root, oldp, *list; 2492 Window root, oldp, *list;
2454 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
2455 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2456 dDisp; 2495 int sx, sy;
2496 Window cr;
2457 2497
2458 pchanged = 0; 2498 pchanged = 0;
2459 2499
2460 if (!OPTION (Opt_transparent)) 2500 if (!option (Opt_transparent))
2461 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
2462 2502
2463 XGetWindowAttributes (disp, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
2465 2505
2466 XGetWindowAttributes (disp, parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2467 2507
2468 if (rootdepth != wattr.depth) 2508 if (rootdepth != wattr.depth)
2469 { 2509 {
2470 if (am_transparent) 2510 if (am_transparent)
2471 { 2511 {
2472 pchanged = 1; 2512 pchanged = 1;
2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
2475 } 2515 }
2476 2516
2477 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
2478 } 2518 }
2479 2519
2480 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (disp, False); 2521 XSync (dpy, False);
2482 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2483 /* 2530 /*
2484 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
2487 */ 2534 */
2488 i = (xa[XA_XROOTPMAP_ID] 2535 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success); 2538 &nitems, &bytes_after, &prop) == Success);
2492 2539
2493 if (!i || prop == NULL) 2540 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID] 2541 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
2498 2545
2499 if (!i || prop == NULL 2546 if (!i || prop == NULL
2500#if TINTING 2547#if TINTING
2501 || !rs[Rs_color + Color_tint] 2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2502#endif 2553#endif
2503 ) 2554 )
2504 have_pixmap = 0; 2555 have_pixmap = 0;
2505 else 2556 else
2506 { 2557 {
… …
2509 XFree (prop); 2560 XFree (prop);
2510 } 2561 }
2511 2562
2512 if (have_pixmap) 2563 if (have_pixmap)
2513 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2514 /* 2687 /*
2515 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2516 */ 2689 */
2517 int sx, sy, nx, ny; 2690 int nx, ny;
2518 unsigned int nw, nh; 2691 unsigned int nw, nh;
2519 Window cr;
2520 XImage *image; 2692 XImage *image;
2521 GC gc;
2522 XGCValues gcvalue;
2523 2693
2524 XTranslateCoordinates (disp, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2528 nx = ny = 0; 2696 nx = ny = 0;
2529 2697
2530 if (sx < 0) 2698 if (sx < 0)
2531 { 2699 {
2532 nw += sx; 2700 nw += sx;
2533 nx = -sx; 2701 nx = -sx;
2534 sx = 0; 2702 sx = 0;
2535 } 2703 }
2536 2704
2537 if (sy < 0) 2705 if (sy < 0)
2538 { 2706 {
2539 nh += sy; 2707 nh += sy;
2540 ny = -sy; 2708 ny = -sy;
2541 sy = 0; 2709 sy = 0;
2542 } 2710 }
2543 2711
2544 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546 2714
2547 XSync (disp, False); 2715 XSync (dpy, False);
2548 allowedxerror = -1; 2716 allowedxerror = -1;
2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550 2718
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2553 allowedxerror = 0; 2721 allowedxerror = 0;
2554
2555 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2556 { 2751 {
2557 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2558 { 2753 {
2559 pchanged = 1; 2754 pchanged = 1;
2560 if (pixmap != None) 2755 if (pixmap != None)
2561 { 2756 {
2562 XFreePixmap (disp, pixmap); 2757 XFreePixmap (dpy, pixmap);
2563 pixmap = None; 2758 pixmap = None;
2564 } 2759 }
2565 } 2760 }
2566 2761
2567 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2568 } 2763 }
2569 else 2764 else
2570 { 2765 {
2571 if (pixmap != None)
2572 XFreePixmap (disp, pixmap);
2573
2574#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint))
2576 {
2577 unsigned short rm, gm, bm;
2578 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579
2580 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2581
2582 ShadeXImage (display, image, shade, rm, gm, bm);
2583 }
2584#endif
2585
2586 pixmap = XCreatePixmap (disp, vt,
2587 szHint.width, szHint.height, image->depth);
2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2589 XPutImage (disp, pixmap, gc, image, 0, 0,
2590 nx, ny, image->width, image->height);
2591 XFreeGC (disp, gc);
2592 XDestroyImage (image);
2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2594 XClearWindow (disp, parent[0]); 2767 XClearWindow (dpy, parent[0]);
2595 2768
2596 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2597 pchanged = 1; 2770 pchanged = 1;
2598 2771
2599 am_transparent = am_pixmap_trans = 1; 2772 am_transparent = am_pixmap_trans = 1;
2600 } 2773 }
2601 } 2774 }
2602 2775
2603 if (am_pixmap_trans) 2776 if (am_pixmap_trans)
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2605 else 2778 else
2606 { 2779 {
2607 unsigned int n; 2780 unsigned int n;
2608 /* 2781 /*
2609 * InheritPixmap transparency 2782 * InheritPixmap transparency
2610 */ 2783 */
2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612 { 2785 {
2613 oldp = parent[i]; 2786 oldp = parent[i];
2614 XQueryTree (disp, parent[i - 1], &root, 2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2615 &parent[i], &list, &n);
2616 XFree (list); 2788 XFree (list);
2617 2789
2618 if (parent[i] == display->root) 2790 if (parent[i] == display->root)
2619 { 2791 {
2620 if (oldp != None) 2792 if (oldp != None)
… …
2628 } 2800 }
2629 2801
2630 n = 0; 2802 n = 0;
2631 2803
2632 if (pchanged) 2804 if (pchanged)
2633 {
2634 for (; n < (unsigned int)i; n++) 2805 for (; n < (unsigned int)i; n++)
2635 { 2806 {
2636 XGetWindowAttributes (disp, parent[n], &wattr); 2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2638 { 2810 {
2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640 break; 2812 break;
2641 } 2813 }
2642 } 2814 }
2643 }
2644 2815
2645 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2646 { 2817 {
2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2649 am_transparent = 0; 2820 am_transparent = 0;
2650 /* XXX: also turn off Opt_transparent? */ 2821 /* XXX: also turn off Opt_transparent? */
2651 } 2822 }
2652 else 2823 else
2653 { 2824 {
2654#if WAIT_FOR_WM
2655 /* wait (an arbitrary period) for the WM to do its thing
2656 * needed for fvwm2.2.2 (and before?) */
2657 sleep (1);
2658#endif
2659 for (n = 0; n < (unsigned int)i; n++) 2825 for (n = 0; n < (unsigned int)i; n++)
2660 { 2826 {
2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2662 XClearWindow (disp, parent[n]); 2828 XClearWindow (dpy, parent[n]);
2663 } 2829 }
2664 2830
2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2666 am_transparent = 1; 2832 am_transparent = 1;
2667 } 2833 }
2668 2834
2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670 parent[i] = None; 2836 parent[i] = None;
2671 } 2837 }
2672 2838
2673 if (scrollBar.win) 2839 if (scrollBar.win)
2674 { 2840 {
2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2676 scrollBar.setIdle (); 2842 scrollBar.setIdle ();
2677 scrollbar_show (0); 2843 scrollbar_show (0);
2678 } 2844 }
2679 2845
2680 if (am_transparent) 2846 if (am_transparent)
… …
2682 want_refresh = want_full_refresh = 1; 2848 want_refresh = want_full_refresh = 1;
2683 if (am_pixmap_trans) 2849 if (am_pixmap_trans)
2684 flush (); 2850 flush ();
2685 } 2851 }
2686 2852
2687 return pchanged; 2853// return pchanged;
2688} 2854}
2689#endif 2855#endif
2690 2856
2691/*}}} */ 2857/*}}} */
2692 2858
… …
2743 if (ch == C0_LF) 2909 if (ch == C0_LF)
2744 nlines++; 2910 nlines++;
2745 2911
2746 refresh_count++; 2912 refresh_count++;
2747 2913
2748 if (!OPTION (Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2749 || (refresh_count >= refresh_limit * (nrow - 1))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2750 { 2916 {
2751 refreshnow = true; 2917 refreshnow = true;
2752 refresh_count = 0; 2918 refresh_count = 0;
2753 ch = NOCHAR; 2919 ch = NOCHAR;
… …
2793 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2794 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2795 */ 2961 */
2796 if (refreshnow) 2962 if (refreshnow)
2797 { 2963 {
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2965 refresh_limit++;
2800 else 2966 else
2801 { 2967 {
2802 flag = true; 2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2803 scr_refresh (refresh_type); 2970 scr_refresh ();
2804 want_refresh = 1; 2971 want_refresh = 1;
2805 } 2972 }
2806 } 2973 }
2807 2974
2808 } 2975 }
… …
2826 return flag; 2993 return flag;
2827} 2994}
2828 2995
2829// read the next character 2996// read the next character
2830wchar_t 2997wchar_t
2831rxvt_term::next_char () 2998rxvt_term::next_char () NOTHROW
2832{ 2999{
2833 while (cmdbuf_ptr < cmdbuf_endp) 3000 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 3001 {
2835 // assume 7-bit to be ascii ALWAYS 3002 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3003 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2857 return NOCHAR; 3024 return NOCHAR;
2858} 3025}
2859 3026
2860// read the next octet 3027// read the next octet
2861uint32_t 3028uint32_t
2862rxvt_term::next_octet () 3029rxvt_term::next_octet () NOTHROW
2863{ 3030{
2864 return cmdbuf_ptr < cmdbuf_endp 3031 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 3032 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 3033 : NOCHAR;
2867} 3034}
3035
3036static class out_of_input out_of_input;
2868 3037
2869/* rxvt_cmd_getc () - Return next input character */ 3038/* rxvt_cmd_getc () - Return next input character */
2870/* 3039/*
2871 * Return the next input character after first passing any keyboard input 3040 * Return the next input character after first passing any keyboard input
2872 * to the command. 3041 * to the command.
2873 */ 3042 */
2874wchar_t 3043wchar_t
2875rxvt_term::cmd_getc () 3044rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 3045{
2877 wchar_t c = next_char (); 3046 wchar_t c = next_char ();
2878 3047
2879 if (c == NOCHAR) 3048 if (c == NOCHAR)
2880 throw out_of_input; 3049 throw out_of_input;
2881 3050
2882 return c; 3051 return c;
2883} 3052}
2884 3053
2885uint32_t 3054uint32_t
2886rxvt_term::cmd_get8 () 3055rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 3056{
2888 uint32_t c = next_octet (); 3057 uint32_t c = next_octet ();
2889 3058
2890 if (c == NOCHAR) 3059 if (c == NOCHAR)
2891 throw out_of_input; 3060 throw out_of_input;
… …
3129 scr_charset_set (2, (unsigned int)cmd_getc ()); 3298 scr_charset_set (2, (unsigned int)cmd_getc ());
3130 break; 3299 break;
3131 case '+': 3300 case '+':
3132 scr_charset_set (3, (unsigned int)cmd_getc ()); 3301 scr_charset_set (3, (unsigned int)cmd_getc ());
3133 break; 3302 break;
3134#if ENABLE_FRILLS 3303#if !ENABLE_MINIMAL
3135 case '6': 3304 case '6':
3136 scr_backindex (); 3305 scr_backindex ();
3137 break; 3306 break;
3138#endif 3307#endif
3139 case '7': 3308 case '7':
3140 scr_cursor (SAVE); 3309 scr_cursor (SAVE);
3141 break; 3310 break;
3142 case '8': 3311 case '8':
3143 scr_cursor (RESTORE); 3312 scr_cursor (RESTORE);
3144 break; 3313 break;
3145#if ENABLE_FRILLS 3314#if !ENABLE_MINIMAL
3146 case '9': 3315 case '9':
3147 scr_forwardindex (); 3316 scr_forwardindex ();
3148 break; 3317 break;
3149#endif 3318#endif
3150 case '=': 3319 case '=':
… …
3312 ndef = get_byte_array_bit (csi_defaults, i); 3481 ndef = get_byte_array_bit (csi_defaults, i);
3313 for (p = 0; p < nargs; p++) 3482 for (p = 0; p < nargs; p++)
3314 if (arg[p] == -1) 3483 if (arg[p] == -1)
3315 arg[p] = ndef; 3484 arg[p] = ndef;
3316 3485
3317#ifdef DEBUG_CMD
3318 fprintf (stderr, "CSI ");
3319 for (p = 0; p < nargs; p++)
3320 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3321 fprintf (stderr, "%c\n", ch);
3322#endif
3323
3324 /* 3486 /*
3325 * private mode handling 3487 * private mode handling
3326 */ 3488 */
3327 if (priv) 3489 if (priv)
3328 { 3490 {
3329 switch (priv) 3491 switch (priv)
3330 { 3492 {
3331 case '>': 3493 case '>':
3332 if (ch == CSI_DA) /* secondary device attributes */ 3494 if (ch == CSI_DA) /* secondary device attributes */
3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3495 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3501 // that we do not support xterm mouse reporting (should be 95 when we do).
3502 //
3503 tt_printf ("\033[>%d;94;0c", 'U');
3504 }
3334 break; 3505 break;
3335 case '?': 3506 case '?':
3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3337 process_terminal_mode (ch, priv, nargs, arg); 3508 process_terminal_mode (ch, priv, nargs, arg);
3338 break; 3509 break;
… …
3464 break; 3635 break;
3465 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
3466 scr_report_position (); 3637 scr_report_position ();
3467 break; 3638 break;
3468 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
3469 if (OPTION (Opt_insecure)) 3640 if (option (Opt_insecure))
3470 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3471 break; 3642 break;
3472 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
3473 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3474 break; 3645 break;
… …
3541 break; 3712 break;
3542 case CSI_75: 3713 case CSI_75:
3543 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3544 break; 3715 break;
3545 3716
3546#if ENABLE_FRILLS 3717#if !ENABLE_MINIMAL
3547 case CSI_74: 3718 case CSI_74:
3548 process_window_ops (arg, nargs); 3719 process_window_ops (arg, nargs);
3549 break; 3720 break;
3550#endif 3721#endif
3551 3722
… …
3558 break; 3729 break;
3559 } 3730 }
3560} 3731}
3561/*}}} */ 3732/*}}} */
3562 3733
3563#if ENABLE_FRILLS 3734#if !ENABLE_MINIMAL
3564/* ARGSUSED */ 3735/* ARGSUSED */
3565void 3736void
3566rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3737rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567{ 3738{
3568 int x, y; 3739 int x, y;
3569 XWindowAttributes wattr; 3740 XWindowAttributes wattr;
3570 Window wdummy; 3741 Window wdummy;
3571 dDisp; 3742
3743 dLocal (Display *, dpy);
3572 3744
3573 if (nargs == 0) 3745 if (nargs == 0)
3574 return; 3746 return;
3575 3747
3576 switch (args[0]) 3748 switch (args[0])
3577 { 3749 {
3578 /* 3750 /*
3579 * commands 3751 * commands
3580 */ 3752 */
3581 case 1: /* deiconify window */ 3753 case 1: /* deiconify window */
3582 XMapWindow (disp, parent[0]); 3754 XMapWindow (dpy, parent[0]);
3583 break; 3755 break;
3584 case 2: /* iconify window */ 3756 case 2: /* iconify window */
3585 XIconifyWindow (disp, parent[0], display->screen); 3757 XIconifyWindow (dpy, parent[0], display->screen);
3586 break; 3758 break;
3587 case 3: /* set position (pixels) */ 3759 case 3: /* set position (pixels) */
3588 XMoveWindow (disp, parent[0], args[1], args[2]); 3760 XMoveWindow (dpy, parent[0], args[1], args[2]);
3589 break; 3761 break;
3590 case 4: /* set size (pixels) */ 3762 case 4: /* set size (pixels) */
3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592 break; 3764 break;
3593 case 5: /* raise window */ 3765 case 5: /* raise window */
3594 XRaiseWindow (disp, parent[0]); 3766 XRaiseWindow (dpy, parent[0]);
3595 break; 3767 break;
3596 case 6: /* lower window */ 3768 case 6: /* lower window */
3597 XLowerWindow (disp, parent[0]); 3769 XLowerWindow (dpy, parent[0]);
3598 break; 3770 break;
3599 case 7: /* refresh window */ 3771 case 7: /* refresh window */
3600 scr_touch (true); 3772 scr_touch (true);
3601 break; 3773 break;
3602 case 8: /* set size (chars) */ 3774 case 8: /* set size (chars) */
… …
3609 if (args[0] >= 24) /* set height (chars) */ 3781 if (args[0] >= 24) /* set height (chars) */
3610 set_widthheight ((unsigned int)width, 3782 set_widthheight ((unsigned int)width,
3611 (unsigned int) (args[1] * fheight)); 3783 (unsigned int) (args[1] * fheight));
3612 break; 3784 break;
3613 3785
3614
3615 /* 3786 /*
3616 * reports - some output format copied from XTerm 3787 * reports - some output format copied from XTerm
3617 */ 3788 */
3618 case 11: /* report window state */ 3789 case 11: /* report window state */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3790 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621 break; 3792 break;
3622 case 13: /* report window position */ 3793 case 13: /* report window position */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3794 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 XTranslateCoordinates (disp, parent[0], wattr.root, 3795 XTranslateCoordinates (dpy, parent[0], wattr.root,
3625 -wattr.border_width, -wattr.border_width, 3796 -wattr.border_width, -wattr.border_width,
3626 &x, &y, &wdummy); 3797 &x, &y, &wdummy);
3627 tt_printf ("\033[3;%d;%dt", x, y); 3798 tt_printf ("\033[3;%d;%dt", x, y);
3628 break; 3799 break;
3629 case 14: /* report window size (pixels) */ 3800 case 14: /* report window size (pixels) */
3630 XGetWindowAttributes (disp, parent[0], &wattr); 3801 XGetWindowAttributes (dpy, parent[0], &wattr);
3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632 break; 3803 break;
3633 case 18: /* report text area size (chars) */ 3804 case 18: /* report text area size (chars) */
3634 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3805 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635 break; 3806 break;
… …
3637 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3808 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638 break; 3809 break;
3639 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3640 { 3811 {
3641 char *s; 3812 char *s;
3642 XGetIconName (disp, parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644 XFree (s); 3815 XFree (s);
3645 } 3816 }
3646 break; 3817 break;
3647 case 21: /* report window title */ 3818 case 21: /* report window title */
3648 { 3819 {
3649 char *s; 3820 char *s;
3650 XFetchName (disp, parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652 XFree (s); 3823 XFree (s);
3653 } 3824 }
3654 break; 3825 break;
3655 } 3826 }
3656} 3827}
… …
3683 seen_esc = true; 3854 seen_esc = true;
3684 continue; 3855 continue;
3685 } 3856 }
3686 else if (ch == C0_BEL || ch == CHAR_ST) 3857 else if (ch == C0_BEL || ch == CHAR_ST)
3687 break; 3858 break;
3859 else if (ch == C0_SYN)
3860 ch = cmd_get8 ();
3688 else if (ch < 0x20) 3861 else if (ch < 0x20)
3689 return NULL; /* other control character - exit */ 3862 return NULL; /* other control character - exit */
3690 3863
3691 seen_esc = false; 3864 seen_esc = false;
3692 3865
3693 if (n >= STRING_MAX - 1) 3866 if (n >= STRING_MAX - 1)
3694 // stop at some sane length 3867 // stop at some sane length
3695 return NULL; 3868 return NULL;
3696 3869
3697 if (ch == C0_SYN)
3698 string[n++] = cmd_get8 ();
3699 else
3700 string[n++] = ch; 3870 string[n++] = ch;
3701 } 3871 }
3702 3872
3703 string[n++] = '\0'; 3873 string[n++] = '\0';
3704 3874
3705 ends_how = (ch == 0x5c ? C0_ESC : ch); 3875 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3756void 3926void
3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3927rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758{ 3928{
3759 if (str[0] == '?' && !str[1]) 3929 if (str[0] == '?' && !str[1])
3760 { 3930 {
3761 unsigned short r, g, b; 3931 rgba c;
3762 pix_colors_focused[color].get (display, r, g, b); 3932 pix_colors_focused[color].get (c);
3933
3934#if XFT
3935 if (c.a != rgba::MAX_CC)
3936 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3937 else
3938#endif
3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3939 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764 } 3940 }
3765 else 3941 else
3766 set_window_color (color, str); 3942 set_window_color (color, str);
3767} 3943}
3768 3944
… …
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3946 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3947 */
3772void 3948void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3949rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3950{
3775 int changed = 0;
3776 int color; 3951 int color;
3777 char *buf, *name; 3952 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3953 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3954 int saveop = op;
3780 dDisp; 3955
3956 dLocal (Display *, dpy);
3781 3957
3782 assert (str != NULL); 3958 assert (str != NULL);
3959
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return;
3962
3783 switch (op) 3963 switch (op)
3784 { 3964 {
3785 case XTerm_name: 3965 case XTerm_name:
3786 set_title (str); 3966 set_title (str);
3787 /* FALLTHROUGH */ 3967 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3981 unsigned long bytes_after;
3802 unsigned char *value = 0; 3982 unsigned char *value = 0;
3803 const char *str = ""; 3983 const char *str = "";
3804 3984
3805 if (prop 3985 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3986 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3987 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3988 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3989 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3990 && actual_type != None
3811 && actual_format == 8) 3991 && actual_format == 8)
3812 str = (const char *)(value); 3992 str = (const char *)(value);
3813 3993
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3994 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3995
3816 XFree (value); 3996 XFree (value);
3817 } 3997 }
3818 else 3998 else
3819 { 3999 {
… …
3823 { 4003 {
3824 *eq = 0; 4004 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 4005 set_utf8_property (display->atom (str), eq + 1);
3826 } 4006 }
3827 else 4007 else
3828 XDeleteProperty (disp, parent[0], 4008 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 4009 display->atom (str));
3830 } 4010 }
3831 break; 4011 break;
3832 4012
3833 case XTerm_Color: 4013 case XTerm_Color:
… …
3843 break; 4023 break;
3844 4024
3845 if ((buf = strchr (name, ';')) != NULL) 4025 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 4026 *buf++ = '\0';
3847 4027
3848 if (name[0] == '?' && !name[1]) 4028 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 4029 }
3857 break; 4030 break;
3858 case XTerm_Color00: 4031 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4032 process_color_seq (op, Color_fg, str, resp);
3860 break; 4033 break;
3861 case XTerm_Color01: 4034 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4035 process_color_seq (op, Color_bg, str, resp);
3863 break; 4036 break;
3864#ifndef NO_CURSORCOLOR 4037#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 4038 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4039 process_color_seq (op, Color_cursor, str, resp);
3867 break; 4040 break;
3868#endif 4041#endif
3869 case XTerm_Color_pointer_fg: 4042 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4043 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 4044 break;
3872 case XTerm_Color_pointer_bg: 4045 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4046 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 4047 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 4048#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 4049 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4050 process_color_seq (op, Color_RV, str, resp);
3878 break; 4051 break;
3879 case Rxvt_Color_BD: 4052 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 4053 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 4054 process_color_seq (op, Color_BD, str, resp);
3882 break; 4055 break;
3883 case Rxvt_Color_UL: 4056 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 4057 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 4058 process_color_seq (op, Color_UL, str, resp);
3886 break; 4059 break;
3887 case URxvt_Color_IT: 4060 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4061 process_color_seq (op, Color_IT, str, resp);
3889 break; 4062 break;
3890#endif 4063#endif
3891#if TRANSPARENT && TINTING 4064#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint: 4065 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4066 process_color_seq (op, Color_tint, str, resp);
4067
3894 check_our_parents (); 4068 check_our_parents ();
4069
3895 if (am_transparent) 4070 if (am_transparent)
3896 want_full_refresh = want_refresh = 1; 4071 want_full_refresh = want_refresh = 1;
4072
3897 break; 4073 break;
3898#endif 4074#endif
3899 4075
3900 case Rxvt_Pixmap: 4076 case Rxvt_Pixmap:
4077 {
3901 if (*str != ';') 4078 if (*str != ';')
3902 { 4079 {
3903#if XPM_BACKGROUND 4080#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 4081 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 4082 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 4083 scr_touch (true);
3907#endif 4084#endif
3908 } 4085 }
3909 4086
4087 int changed = 0;
4088
3910 while ((str = strchr (str, ';')) != NULL) 4089 while ((str = strchr (str, ';')) != NULL)
3911 { 4090 {
3912 str++; 4091 str++;
3913#if XPM_BACKGROUND 4092#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 4093 changed += scale_pixmap (str);
3915#endif 4094#endif
3916 } 4095 }
3917 4096
3918 if (changed) 4097 if (changed)
3919 { 4098 {
3920#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 4100 resize_pixmap ();
3922 scr_touch (true); 4101 scr_touch (true);
3923#endif 4102#endif
3924 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
4109 }
3925 break; 4110 break;
3926 4111
3927 case Rxvt_restoreFG: 4112 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
3929 break; 4114 break;
… …
3955 case URxvt_italicFont: 4140 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 4141 case URxvt_boldItalicFont:
3957#endif 4142#endif
3958 if (query) 4143 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 4144 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 4146 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 4147 resp);
3963 else 4148 else
3964 { 4149 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3968 allocated.push_back ((void *)res); 4153 allocated.push_back ((void *)res);
3969 set_fonts (); 4154 set_fonts ();
3970 } 4155 }
3971 break; 4156 break;
3972 4157
3973#if ENABLE_FRILLS 4158 case URxvt_version:
4159 if (query)
4160 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4161 op,
4162 rs[Rs_name], VERSION[0], VERSION[2],
4163 resp);
4164 break;
4165
4166#if !ENABLE_MINIMAL
3974 case URxvt_locale: 4167 case URxvt_locale:
3975 if (query) 4168 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3977 else 4170 else
3978 { 4171 {
3979 set_locale (str); 4172 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 4173 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 4174 init_xlocale ();
3982 } 4175 }
3983 break; 4176 break;
3984 4177
3985 case URxvt_view_up: 4178 case URxvt_view_up:
… …
3996 break; 4189 break;
3997#endif 4190#endif
3998 4191
3999#if ENABLE_PERL 4192#if ENABLE_PERL
4000 case URxvt_perl: 4193 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4002 ; // no responses yet 4195 ; // no responses yet
4003 break; 4196 break;
4004#endif 4197#endif
4005 } 4198 }
4006} 4199}
… …
4038 return state; 4231 return state;
4039} 4232}
4040 4233
4041/* we're not using priv _yet_ */ 4234/* we're not using priv _yet_ */
4042void 4235void
4043rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4236rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044{ 4237{
4045 unsigned int i, j; 4238 unsigned int i, j;
4046 int state; 4239 int state;
4047 4240
4048 static const struct 4241 static const struct
… …
4122 scr_touch (true); 4315 scr_touch (true);
4123 break; 4316 break;
4124#endif 4317#endif
4125 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4126 case 1049: 4319 case 1049:
4127 if (OPTION (Opt_secondaryScreen)) 4320 if (option (Opt_secondaryScreen))
4128 if (mode == 0) 4321 if (mode == 0)
4129 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
4130 else if (mode == 1) 4323 else if (mode == 1)
4131 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
4132 break; 4325 break;
… …
4197 break; 4390 break;
4198 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
4199 set_option (Opt_scrollTtyKeypress, state); 4392 set_option (Opt_scrollTtyKeypress, state);
4200 break; 4393 break;
4201 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
4202 if (OPTION (Opt_secondaryScreen)) 4395 if (option (Opt_secondaryScreen))
4203 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
4204 scr_erase_screen (2); 4397 scr_erase_screen (2);
4205 scr_change_screen (state); 4398 scr_change_screen (state);
4206 break; 4399 break;
4207 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
4208 scr_change_screen (state); 4401 scr_change_screen (state);
4209 if (OPTION (Opt_secondaryScreen)) 4402 if (option (Opt_secondaryScreen))
4210 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
4211 scr_erase_screen (2); 4404 scr_erase_screen (2);
4212 break; 4405 break;
4213 default: 4406 default:
4214 break; 4407 break;
… …
4342 scr_color (Color_bg, Color_bg); 4535 scr_color (Color_bg, Color_bg);
4343 break; 4536 break;
4344 4537
4345 //case 50: // not variable spacing 4538 //case 50: // not variable spacing
4346 4539
4347#if ENABLE_FRILLS 4540#if !ENABLE_MINIMAL
4348 case 90: 4541 case 90:
4349 case 91: /* set bright fg color */ 4542 case 91: /* set bright fg color */
4350 case 92: 4543 case 92:
4351 case 93: 4544 case 93:
4352 case 94: 4545 case 94:
… …
4417rxvt_term::tt_write (const char *data, unsigned int len) 4610rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4611{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4612 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4613 return;
4421 4614
4422 if (pty.pty < 0) 4615 if (pty->pty < 0)
4423 return; 4616 return;
4424 4617
4425 if (v_buflen == 0) 4618 if (v_buflen == 0)
4426 { 4619 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4620 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4621
4429 if ((unsigned int)written == len) 4622 if ((unsigned int)written == len)
4430 return; 4623 return;
4431 4624
4432 data += written; 4625 data += written;
… …
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4634 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4635}
4443 4636
4444void rxvt_term::pty_write () 4637void rxvt_term::pty_write ()
4445{ 4638{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4639 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4640
4448 if (written > 0) 4641 if (written > 0)
4449 { 4642 {
4450 v_buflen -= written; 4643 v_buflen -= written;
4451 4644

Diff Legend

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