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.316 by root, Thu Dec 7 20:59:59 2006 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);
905 { 909 {
906 const char ch = C0_ESC; 910 const char ch = C0_ESC;
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
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); 914 tt_write (kbuf, (unsigned int)len);
921} 915}
922/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
923 993
924#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
925unsigned int 995unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 997{
1006 while (l->is_longer () && row < end_row); 1076 while (l->is_longer () && row < end_row);
1007 } 1077 }
1008 while (row < end_row); 1078 while (row < end_row);
1009 } 1079 }
1010 1080
1011 scr_refresh (refresh_type); 1081 scr_refresh ();
1012 scrollbar_show (1); 1082 scrollbar_show (1);
1013#ifdef USE_XIM 1083#ifdef USE_XIM
1014 IMSendSpot (); 1084 IMSendSpot ();
1015#endif 1085#endif
1016 } 1086 }
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1115{
1046 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1117 want_refresh = 1;
1048 1118
1049 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1120}
1051#endif 1121#endif
1052 1122
1053#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1054void 1124void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1139{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1142 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1143 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1145 }
1077} 1146}
1078#endif 1147#endif
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1152{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1154 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1156 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1158 }
1091} 1159}
1092#endif 1160#endif
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1169 {
1102 if (view_start == top_row || view_start == 0) 1170 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1104 1172
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1173 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1175 }
1109} 1176}
1110#endif 1177#endif
1111 1178
1112#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1113static struct event_handler 1180static struct event_handler
1114{ 1181{
1115 check_watcher cw_yield; 1182 check_watcher yield_ev;
1116 1183
1117 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1118 { 1185 {
1119 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1120 w.stop (); 1194 w.stop ();
1121 } 1195 }
1122 1196
1123 event_handler () 1197 event_handler ()
1124 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1125 { 1199 {
1126 } 1200 }
1127} event_handler; 1201} event_handler;
1128#endif 1202#endif
1129 1203
1140 1214
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1144 1218
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1220
1147 if (r > 0) 1221 if (r > 0)
1148 { 1222 {
1149 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1150 return true; 1224 return true;
1151 } 1225 }
1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 { 1227 {
1154#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1155 if (display->is_local) 1229 if (display->is_local)
1156 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1157#endif 1231#endif
1158 } 1232 }
1159 else 1233 else
1160 { 1234 {
1161 pty_ev.stop (); 1235 pty_ev.stop ();
1183} 1257}
1184 1258
1185void 1259void
1186rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1187{ 1261{
1188 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1189 recolour_cursor (); 1263 recolour_cursor ();
1190 1264
1191#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1192 hidden_pointer = 0; 1266 hidden_pointer = 0;
1193 1267
1201rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1202{ 1276{
1203 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1204 return; 1278 return;
1205 1279
1206 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1207 XFlush (display->display); 1281 XFlush (dpy);
1208 1282
1209 hidden_pointer = 1; 1283 hidden_pointer = 1;
1210} 1284}
1211 1285
1212void 1286void
1285 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1286 (32 + x + 1), 1360 (32 + x + 1),
1287 (32 + y + 1)); 1361 (32 + y + 1));
1288} 1362}
1289 1363
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 */ 1364/*{{{ process an X event */
1301void 1365void
1302rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1303{ 1367{
1304 make_current (); 1368 make_current ();
1305 1369
1306 dDisp; 1370 dLocal (Display *, dpy);
1307 1371
1308 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1309 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return; 1375 return;
1316 unsigned int unused_mask; 1380 unsigned int unused_mask;
1317 1381
1318 switch (ev.type) 1382 switch (ev.type)
1319 { 1383 {
1320 case KeyPress: 1384 case KeyPress:
1321#if ISO_14755 1385 key_press (ev.xkey);
1322 if (!(iso14755buf & ISO_14755_52))
1323#endif
1324 lookup_key (ev.xkey);
1325
1326 break; 1386 break;
1327 1387
1328 case KeyRelease: 1388 case KeyRelease:
1329 { 1389 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; 1390 break;
1401 }
1402 1391
1403 case ButtonPress: 1392 case ButtonPress:
1404 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1405 break; 1394 break;
1406 1395
1408 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1409 break; 1398 break;
1410 1399
1411 case ClientMessage: 1400 case ClientMessage:
1412 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1411 destroy ();
1412 }
1417#if ENABLE_EWMH 1413#if ENABLE_EWMH
1418 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1422#endif 1429#endif
1423 } 1430 }
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; 1431 break;
1460 1432
1461 case MappingNotify: 1433 case MappingNotify:
1462 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1463 break; 1435 break;
1486 break; 1458 break;
1487 } 1459 }
1488 break; 1460 break;
1489 1461
1490 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1491 focus_in (); 1464 focus_in ();
1492 break; 1465 break;
1493 1466
1494 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1495 focus_out (); 1469 focus_out ();
1496 break; 1470 break;
1497 1471
1498 case ConfigureNotify: 1472 case ConfigureNotify:
1499 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1500 { 1474 {
1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1502 ; 1476 ;
1503 1477
1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505 { 1479 {
1506 seen_resize = 1; 1480 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508 } 1482 }
1509 1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1511 if (OPTION (Opt_transparent)) 1487 if (OPTION (Opt_transparent))
1512 check_our_parents (); 1488 check_our_parents ();
1513#endif 1489#endif
1514 } 1490 }
1515 break; 1491 break;
1516 1492
1517 case PropertyNotify: 1493 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519 && ev.xproperty.state == PropertyNewValue) 1496 && ev.xproperty.state == PropertyNewValue)
1520 selection_property (ev.xproperty.window, ev.xproperty.atom); 1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1521 1498
1522 break; 1499 break;
1523 1500
1524 case SelectionClear: 1501 case SelectionClear:
1525 selection_clear (); 1502 selection_clear ();
1561 if (ev.xany.window == vt) 1538 if (ev.xany.window == vt)
1562 { 1539 {
1563 do 1540 do
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1567 1544
1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569 1546
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1573 1550
1574 want_refresh = 1; 1551 want_refresh = 1;
1575 } 1552 }
1576 else 1553 else
1577 { 1554 {
1578 XEvent unused_event; 1555 XEvent unused_event;
1579 1556
1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1581 ; 1558 ;
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1583 ; 1560 ;
1584 1561
1585 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1586 { 1563 {
1587 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1588 scrollbar_show (0); 1565 scrollbar_show (0);
1589 } 1566 }
1590 1567
1591#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1592 if (am_transparent && ev.xany.window == parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1593 XClearWindow (disp, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1594#endif 1571#endif
1595 } 1572 }
1596 break; 1573 break;
1597 1574
1598 case MotionNotify: 1575 case MotionNotify:
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop 1587 ; // nop
1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1612 { 1589 {
1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1614 ; 1591 ;
1615 1592
1616 XQueryPointer (disp, vt, 1593 XQueryPointer (dpy, vt,
1617 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1618 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1619 &ev.xbutton.x, &ev.xbutton.y, 1596 &ev.xbutton.x, &ev.xbutton.y,
1620 &ev.xbutton.state); 1597 &ev.xbutton.state);
1621#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
1685#endif 1662#endif
1686 } 1663 }
1687 } 1664 }
1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689 { 1666 {
1690 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1691 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1692 ; 1669 ;
1693 1670
1694 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1695 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1696 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1697 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1698 &unused_mask); 1675 &unused_mask);
1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1703 scrollbar_show (1); 1680 scrollbar_show (1);
1704 } 1681 }
1705 break; 1682 break;
1706 } 1683 }
1707 1684
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 { 1687 {
1713 if (hidden_cursor) 1688 if (hidden_cursor)
1714 { 1689 {
1715 hidden_cursor = 0; 1690 hidden_cursor = 0;
1716 want_refresh = 1; 1691 want_refresh = 1;
1717 } 1692 }
1718 1693
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720 } 1695 }
1721#endif 1696#endif
1722 1697
1723#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 if (!focus) 1716 if (!focus)
1742 { 1717 {
1743 focus = 1; 1718 focus = 1;
1744 want_refresh = 1; 1719 want_refresh = 1;
1745 1720
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1722
1748#if USE_XIM 1723#if USE_XIM
1749 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1750 { 1725 {
1751 IMSetStatusPosition (); 1726 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1753 } 1728 }
1754#endif 1729#endif
1755#if CURSOR_BLINK 1730#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1733#endif
1759#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1761 { 1736 {
1762 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1802 } 1777 }
1803#endif 1778#endif
1804 } 1779 }
1805} 1780}
1806 1781
1807#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1808void 1796void
1809rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1798{
1811 make_current (); 1799 make_current ();
1812 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1813 switch (ev.type) 1806 switch (ev.type)
1814 { 1807 {
1815 case PropertyNotify: 1808 case PropertyNotify:
1816 /* 1809 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1825 case ReparentNotify: 1818 case ReparentNotify:
1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1827 want_refresh = want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1828 break; 1821 break;
1829 } 1822 }
1823# endif
1830} 1824}
1831#endif 1825#endif
1832 1826
1833void 1827void
1834rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1843 /* 1837 /*
1844 * VT window processing of button press 1838 * VT window processing of button press
1845 */ 1839 */
1846 if (ev.window == vt) 1840 if (ev.window == vt)
1847 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1848#if ISO_14755 1845#if ISO_14755
1849 // 5.4 1846 // 5.4
1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851 { 1848 {
1852 iso14755_54 (ev.x, ev.y); 1849 iso14755_54 (ev.x, ev.y);
1894 else 1891 else
1895 { 1892 {
1896 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1898 1895
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1896 switch (ev.button)
1901 { 1897 {
1902 case Button1: 1898 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1903#else
1908 selection.rect = false; 1904 selection.rect = false;
1909#endif 1905#endif
1910 1906
1911 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1909 {
1914 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1916 else 1912 else
1917 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1918 } 1914 }
1919 else 1915 else
1920 { 1916 {
1921 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1918 MEvent.clicks++;
1923 else 1919 else
1924 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1925 1921
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1923 }
1928 1924
1929 MEvent.button = Button1; 1925 MEvent.button = Button1;
1930 break; 1926 break;
1931 1927
1932 case Button3: 1928 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1935 else 1931 else
1936 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1937 1933
1938 MEvent.button = Button3; 1934 MEvent.button = Button3;
1939 break; 1935 break;
1940 } 1936 }
1941 } 1937 }
1942 1938
1943 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1944 return; 1940 return;
1945 } 1941 }
1946 1942
2100 2096
2101 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2102 { 2098 {
2103 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2104 scrollbar_show (0); 2100 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2101 }
2109 2102
2110#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
2113#endif 2106#endif
2114 2107
2115 if (ev.window == vt) 2108 if (ev.window == vt)
2116 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2117#if ISO_14755 2113#if ISO_14755
2118 // 5.4 2114 // 5.4
2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2120 return; 2116 return;
2121#endif 2117#endif
2118
2122 if (reportmode) 2119 if (reportmode)
2123 { 2120 {
2124 /* mouse report from vt window */ 2121 /* mouse report from vt window */
2125 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
2126 if (ev.button >= 4) 2123 if (ev.button >= 4)
2150 if (priv_modes & PrivMode_mouse_report 2147 if (priv_modes & PrivMode_mouse_report
2151 && bypass_keystate 2148 && bypass_keystate
2152 && ev.button == Button1 && MEvent.clicks <= 1) 2149 && ev.button == Button1 && MEvent.clicks <= 1)
2153 selection_extend (ev.x, ev.y, 0); 2150 selection_extend (ev.x, ev.y, 0);
2154 2151
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2158 switch (ev.button) 2152 switch (ev.button)
2159 { 2153 {
2160 case Button1: 2154 case Button1:
2161 case Button3: 2155 case Button3:
2162 selection_make (ev.time); 2156 selection_make (ev.time);
2163 break; 2157 break;
2158
2164 case Button2: 2159 case Button2:
2165 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2166 break; 2162 break;
2163
2167#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
2168 case Button4: 2165 case Button4:
2169 case Button5: 2166 case Button5:
2170 { 2167 {
2171 int i; 2168 int i;
2211#if TINTING 2208#if TINTING
2212/* taken from aterm-0.4.2 */ 2209/* taken from aterm-0.4.2 */
2213 2210
2214typedef uint32_t RUINT32T; 2211typedef uint32_t RUINT32T;
2215 2212
2216void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2217{ 2214{
2218 int sh_r, sh_g, sh_b; 2215 int sh_r, sh_g, sh_b;
2219 RUINT32T mask_r, mask_g, mask_b; 2216 RUINT32T mask_r, mask_g, mask_b;
2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223 int i; 2220 int i;
2224 2221
2225 Visual *visual = display->visual; 2222 Visual *visual = term->visual;
2226 2223
2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2228 2225
2229 /* for convenience */ 2226 /* for convenience */
2230 mask_r = visual->red_mask; 2227 mask_r = visual->red_mask;
2451 Atom atype; 2448 Atom atype;
2452 unsigned char *prop = NULL; 2449 unsigned char *prop = NULL;
2453 Window root, oldp, *list; 2450 Window root, oldp, *list;
2454 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
2455 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
2456 dDisp;
2457 2453
2458 pchanged = 0; 2454 pchanged = 0;
2459 2455
2460 if (!OPTION (Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2461 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2462 2458
2463 XGetWindowAttributes (disp, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2465 2461
2466 XGetWindowAttributes (disp, parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2467 2463
2468 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2469 { 2465 {
2470 if (am_transparent) 2466 if (am_transparent)
2471 { 2467 {
2472 pchanged = 1; 2468 pchanged = 1;
2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2475 } 2471 }
2476 2472
2477 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2478 } 2474 }
2479 2475
2480 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (disp, False); 2477 XSync (dpy, False);
2482 2478
2483 /* 2479 /*
2484 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2487 */ 2483 */
2488 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2492 2488
2493 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2498 2494
2499 if (!i || prop == NULL 2495 if (!i || prop == NULL
2500#if TINTING 2496#if TINTING
2501 || !rs[Rs_color + Color_tint] 2497 || !ISSET_PIXCOLOR (Color_tint)
2502#endif 2498#endif
2503 ) 2499 )
2504 have_pixmap = 0; 2500 have_pixmap = 0;
2505 else 2501 else
2506 { 2502 {
2519 Window cr; 2515 Window cr;
2520 XImage *image; 2516 XImage *image;
2521 GC gc; 2517 GC gc;
2522 XGCValues gcvalue; 2518 XGCValues gcvalue;
2523 2519
2524 XTranslateCoordinates (disp, parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2528 nx = ny = 0; 2524 nx = ny = 0;
2529 2525
2542 } 2538 }
2543 2539
2544 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546 2542
2547 XSync (disp, False); 2543 XSync (dpy, False);
2548 allowedxerror = -1; 2544 allowedxerror = -1;
2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550 2546
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2553 allowedxerror = 0; 2549 allowedxerror = 0;
2554 2550
2557 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2558 { 2554 {
2559 pchanged = 1; 2555 pchanged = 1;
2560 if (pixmap != None) 2556 if (pixmap != None)
2561 { 2557 {
2562 XFreePixmap (disp, pixmap); 2558 XFreePixmap (dpy, pixmap);
2563 pixmap = None; 2559 pixmap = None;
2564 } 2560 }
2565 } 2561 }
2566 2562
2567 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2568 } 2564 }
2569 else 2565 else
2570 { 2566 {
2571 if (pixmap != None) 2567 if (pixmap != None)
2572 XFreePixmap (disp, pixmap); 2568 XFreePixmap (dpy, pixmap);
2573 2569
2574#if TINTING 2570#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2576 { 2572 {
2577 unsigned short rm, gm, bm;
2578 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579 2574
2575 rgba c;
2580 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused [Color_tint].get (c);
2581 2577
2582 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583 } 2579 }
2584#endif 2580#endif
2585 2581
2586 pixmap = XCreatePixmap (disp, vt, 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2587 szHint.width, szHint.height, image->depth);
2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2589 XPutImage (disp, pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2590 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2591 XFreeGC (disp, gc); 2586 XFreeGC (dpy, gc);
2592 XDestroyImage (image); 2587 XDestroyImage (image);
2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2594 XClearWindow (disp, parent[0]); 2589 XClearWindow (dpy, parent[0]);
2595 2590
2596 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2597 pchanged = 1; 2592 pchanged = 1;
2598 2593
2599 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2600 } 2595 }
2601 } 2596 }
2602 2597
2603 if (am_pixmap_trans) 2598 if (am_pixmap_trans)
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2605 else 2600 else
2606 { 2601 {
2607 unsigned int n; 2602 unsigned int n;
2608 /* 2603 /*
2609 * InheritPixmap transparency 2604 * InheritPixmap transparency
2610 */ 2605 */
2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612 { 2607 {
2613 oldp = parent[i]; 2608 oldp = parent[i];
2614 XQueryTree (disp, parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2615 &parent[i], &list, &n);
2616 XFree (list); 2610 XFree (list);
2617 2611
2618 if (parent[i] == display->root) 2612 if (parent[i] == display->root)
2619 { 2613 {
2620 if (oldp != None) 2614 if (oldp != None)
2628 } 2622 }
2629 2623
2630 n = 0; 2624 n = 0;
2631 2625
2632 if (pchanged) 2626 if (pchanged)
2633 {
2634 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2635 { 2628 {
2636 XGetWindowAttributes (disp, parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2638 { 2632 {
2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640 break; 2634 break;
2641 } 2635 }
2642 } 2636 }
2643 }
2644 2637
2645 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2646 { 2639 {
2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2649 am_transparent = 0; 2642 am_transparent = 0;
2650 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2651 } 2644 }
2652 else 2645 else
2653 { 2646 {
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++) 2647 for (n = 0; n < (unsigned int)i; n++)
2660 { 2648 {
2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2662 XClearWindow (disp, parent[n]); 2650 XClearWindow (dpy, parent[n]);
2663 } 2651 }
2664 2652
2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2666 am_transparent = 1; 2654 am_transparent = 1;
2667 } 2655 }
2668 2656
2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670 parent[i] = None; 2658 parent[i] = None;
2671 } 2659 }
2672 2660
2673 if (scrollBar.win) 2661 if (scrollBar.win)
2674 { 2662 {
2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2676 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2677 scrollbar_show (0); 2665 scrollbar_show (0);
2678 } 2666 }
2679 2667
2680 if (am_transparent) 2668 if (am_transparent)
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2787 refresh_limit++;
2800 else 2788 else
2801 { 2789 {
2802 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2803 scr_refresh (refresh_type); 2792 scr_refresh ();
2804 want_refresh = 1; 2793 want_refresh = 1;
2805 } 2794 }
2806 } 2795 }
2807 2796
2808 } 2797 }
2826 return flag; 2815 return flag;
2827} 2816}
2828 2817
2829// read the next character 2818// read the next character
2830wchar_t 2819wchar_t
2831rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2832{ 2821{
2833 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 2823 {
2835 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2857 return NOCHAR; 2846 return NOCHAR;
2858} 2847}
2859 2848
2860// read the next octet 2849// read the next octet
2861uint32_t 2850uint32_t
2862rxvt_term::next_octet () 2851rxvt_term::next_octet () NOTHROW
2863{ 2852{
2864 return cmdbuf_ptr < cmdbuf_endp 2853 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 2854 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 2855 : NOCHAR;
2867} 2856}
2857
2858static class out_of_input out_of_input;
2868 2859
2869/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2870/* 2861/*
2871 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2872 * to the command. 2863 * to the command.
2873 */ 2864 */
2874wchar_t 2865wchar_t
2875rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 2867{
2877 wchar_t c = next_char (); 2868 wchar_t c = next_char ();
2878 2869
2879 if (c == NOCHAR) 2870 if (c == NOCHAR)
2880 throw out_of_input; 2871 throw out_of_input;
2881 2872
2882 return c; 2873 return c;
2883} 2874}
2884 2875
2885uint32_t 2876uint32_t
2886rxvt_term::cmd_get8 () 2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 2878{
2888 uint32_t c = next_octet (); 2879 uint32_t c = next_octet ();
2889 2880
2890 if (c == NOCHAR) 2881 if (c == NOCHAR)
2891 throw out_of_input; 2882 throw out_of_input;
3129 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
3130 break; 3121 break;
3131 case '+': 3122 case '+':
3132 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
3133 break; 3124 break;
3134#if ENABLE_FRILLS 3125#if !ENABLE_MINIMAL
3135 case '6': 3126 case '6':
3136 scr_backindex (); 3127 scr_backindex ();
3137 break; 3128 break;
3138#endif 3129#endif
3139 case '7': 3130 case '7':
3140 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
3141 break; 3132 break;
3142 case '8': 3133 case '8':
3143 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
3144 break; 3135 break;
3145#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3146 case '9': 3137 case '9':
3147 scr_forwardindex (); 3138 scr_forwardindex ();
3148 break; 3139 break;
3149#endif 3140#endif
3150 case '=': 3141 case '=':
3312 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
3313 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
3314 if (arg[p] == -1) 3305 if (arg[p] == -1)
3315 arg[p] = ndef; 3306 arg[p] = ndef;
3316 3307
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 /* 3308 /*
3325 * private mode handling 3309 * private mode handling
3326 */ 3310 */
3327 if (priv) 3311 if (priv)
3328 { 3312 {
3329 switch (priv) 3313 switch (priv)
3330 { 3314 {
3331 case '>': 3315 case '>':
3332 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
3334 break; 3327 break;
3335 case '?': 3328 case '?':
3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3337 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
3338 break; 3331 break;
3541 break; 3534 break;
3542 case CSI_75: 3535 case CSI_75:
3543 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3544 break; 3537 break;
3545 3538
3546#if ENABLE_FRILLS 3539#if !ENABLE_MINIMAL
3547 case CSI_74: 3540 case CSI_74:
3548 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3549 break; 3542 break;
3550#endif 3543#endif
3551 3544
3558 break; 3551 break;
3559 } 3552 }
3560} 3553}
3561/*}}} */ 3554/*}}} */
3562 3555
3563#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3564/* ARGSUSED */ 3557/* ARGSUSED */
3565void 3558void
3566rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567{ 3560{
3568 int x, y; 3561 int x, y;
3569 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3570 Window wdummy; 3563 Window wdummy;
3571 dDisp; 3564
3565 dLocal (Display *, dpy);
3572 3566
3573 if (nargs == 0) 3567 if (nargs == 0)
3574 return; 3568 return;
3575 3569
3576 switch (args[0]) 3570 switch (args[0])
3577 { 3571 {
3578 /* 3572 /*
3579 * commands 3573 * commands
3580 */ 3574 */
3581 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3582 XMapWindow (disp, parent[0]); 3576 XMapWindow (dpy, parent[0]);
3583 break; 3577 break;
3584 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3585 XIconifyWindow (disp, parent[0], display->screen); 3579 XIconifyWindow (dpy, parent[0], display->screen);
3586 break; 3580 break;
3587 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3588 XMoveWindow (disp, parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3589 break; 3583 break;
3590 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592 break; 3586 break;
3593 case 5: /* raise window */ 3587 case 5: /* raise window */
3594 XRaiseWindow (disp, parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3595 break; 3589 break;
3596 case 6: /* lower window */ 3590 case 6: /* lower window */
3597 XLowerWindow (disp, parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3598 break; 3592 break;
3599 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3600 scr_touch (true); 3594 scr_touch (true);
3601 break; 3595 break;
3602 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3609 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3610 set_widthheight ((unsigned int)width, 3604 set_widthheight ((unsigned int)width,
3611 (unsigned int) (args[1] * fheight)); 3605 (unsigned int) (args[1] * fheight));
3612 break; 3606 break;
3613 3607
3614
3615 /* 3608 /*
3616 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3617 */ 3610 */
3618 case 11: /* report window state */ 3611 case 11: /* report window state */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621 break; 3614 break;
3622 case 13: /* report window position */ 3615 case 13: /* report window position */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 XTranslateCoordinates (disp, parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3625 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3626 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3627 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3628 break; 3621 break;
3629 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3630 XGetWindowAttributes (disp, parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632 break; 3625 break;
3633 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3634 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635 break; 3628 break;
3637 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638 break; 3631 break;
3639 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3640 { 3633 {
3641 char *s; 3634 char *s;
3642 XGetIconName (disp, parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644 XFree (s); 3637 XFree (s);
3645 } 3638 }
3646 break; 3639 break;
3647 case 21: /* report window title */ 3640 case 21: /* report window title */
3648 { 3641 {
3649 char *s; 3642 char *s;
3650 XFetchName (disp, parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652 XFree (s); 3645 XFree (s);
3653 } 3646 }
3654 break; 3647 break;
3655 } 3648 }
3683 seen_esc = true; 3676 seen_esc = true;
3684 continue; 3677 continue;
3685 } 3678 }
3686 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3687 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3688 else if (ch < 0x20) 3683 else if (ch < 0x20)
3689 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3690 3685
3691 seen_esc = false; 3686 seen_esc = false;
3692 3687
3693 if (n >= STRING_MAX - 1) 3688 if (n >= STRING_MAX - 1)
3694 // stop at some sane length 3689 // stop at some sane length
3695 return NULL; 3690 return NULL;
3696 3691
3697 if (ch == C0_SYN)
3698 string[n++] = cmd_get8 ();
3699 else
3700 string[n++] = ch; 3692 string[n++] = ch;
3701 } 3693 }
3702 3694
3703 string[n++] = '\0'; 3695 string[n++] = '\0';
3704 3696
3705 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
3756void 3748void
3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758{ 3750{
3759 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3760 { 3752 {
3761 unsigned short r, g, b; 3753 rgba c;
3762 pix_colors_focused[color].get (display, r, g, b); 3754 pix_colors_focused[color].get (c);
3755
3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764 } 3762 }
3765 else 3763 else
3766 set_window_color (color, str); 3764 set_window_color (color, str);
3767} 3765}
3768 3766
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3769 */
3772void 3770void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3772{
3775 int changed = 0;
3776 int color; 3773 int color;
3777 char *buf, *name; 3774 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3776 int saveop = op;
3780 dDisp; 3777
3778 dLocal (Display *, dpy);
3781 3779
3782 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3783 switch (op) 3785 switch (op)
3784 { 3786 {
3785 case XTerm_name: 3787 case XTerm_name:
3786 set_title (str); 3788 set_title (str);
3787 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
3801 unsigned long bytes_after; 3803 unsigned long bytes_after;
3802 unsigned char *value = 0; 3804 unsigned char *value = 0;
3803 const char *str = ""; 3805 const char *str = "";
3804 3806
3805 if (prop 3807 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3812 && actual_type != None
3811 && actual_format == 8) 3813 && actual_format == 8)
3812 str = (const char *)(value); 3814 str = (const char *)(value);
3813 3815
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3817
3816 XFree (value); 3818 XFree (value);
3817 } 3819 }
3818 else 3820 else
3819 { 3821 {
3823 { 3825 {
3824 *eq = 0; 3826 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3827 set_utf8_property (display->atom (str), eq + 1);
3826 } 3828 }
3827 else 3829 else
3828 XDeleteProperty (disp, parent[0], 3830 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3831 display->atom (str));
3830 } 3832 }
3831 break; 3833 break;
3832 3834
3833 case XTerm_Color: 3835 case XTerm_Color:
3843 break; 3845 break;
3844 3846
3845 if ((buf = strchr (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3848 *buf++ = '\0';
3847 3849
3848 if (name[0] == '?' && !name[1]) 3850 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 } 3851 }
3857 break; 3852 break;
3858 case XTerm_Color00: 3853 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (op, Color_fg, str, resp);
3860 break; 3855 break;
3861 case XTerm_Color01: 3856 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3857 process_color_seq (op, Color_bg, str, resp);
3863 break; 3858 break;
3864#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3862 break;
3868#endif 3863#endif
3869 case XTerm_Color_pointer_fg: 3864 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3866 break;
3872 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3869 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (op, Color_RV, str, resp);
3878 break; 3873 break;
3879 case Rxvt_Color_BD: 3874 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3875 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3876 process_color_seq (op, Color_BD, str, resp);
3882 break; 3877 break;
3883 case Rxvt_Color_UL: 3878 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3879 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3880 process_color_seq (op, Color_UL, str, resp);
3886 break; 3881 break;
3887 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (op, Color_IT, str, resp);
3889 break; 3884 break;
3890#endif 3885#endif
3891#if TRANSPARENT && TINTING 3886#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint: 3887 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3888 process_color_seq (op, Color_tint, str, resp);
3889
3894 check_our_parents (); 3890 check_our_parents ();
3891
3895 if (am_transparent) 3892 if (am_transparent)
3896 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3894
3897 break; 3895 break;
3898#endif 3896#endif
3899 3897
3900 case Rxvt_Pixmap: 3898 case Rxvt_Pixmap:
3899 {
3901 if (*str != ';') 3900 if (*str != ';')
3902 { 3901 {
3903#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3905 scr_touch (true);
3907#endif 3906#endif
3908 } 3907 }
3909 3908
3909 int changed = 0;
3910
3910 while ((str = strchr (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3911 { 3912 {
3912 str++; 3913 str++;
3913#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3915#endif 3916#endif
3916 } 3917 }
3917 3918
3918 if (changed) 3919 if (changed)
3919 { 3920 {
3920#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3922 resize_pixmap ();
3922 scr_touch (true); 3923 scr_touch (true);
3923#endif 3924#endif
3924 } 3925 }
3926 }
3925 break; 3927 break;
3926 3928
3927 case Rxvt_restoreFG: 3929 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3929 break; 3931 break;
3968 allocated.push_back ((void *)res); 3970 allocated.push_back ((void *)res);
3969 set_fonts (); 3971 set_fonts ();
3970 } 3972 }
3971 break; 3973 break;
3972 3974
3973#if ENABLE_FRILLS 3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
3974 case URxvt_locale: 3984 case URxvt_locale:
3975 if (query) 3985 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3977 else 3987 else
3978 { 3988 {
3979 set_locale (str); 3989 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3990 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3991 init_xlocale ();
3982 } 3992 }
3983 break; 3993 break;
3984 3994
3985 case URxvt_view_up: 3995 case URxvt_view_up:
3996 break; 4006 break;
3997#endif 4007#endif
3998 4008
3999#if ENABLE_PERL 4009#if ENABLE_PERL
4000 case URxvt_perl: 4010 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4002 ; // no responses yet 4012 ; // no responses yet
4003 break; 4013 break;
4004#endif 4014#endif
4005 } 4015 }
4006} 4016}
4038 return state; 4048 return state;
4039} 4049}
4040 4050
4041/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
4042void 4052void
4043rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044{ 4054{
4045 unsigned int i, j; 4055 unsigned int i, j;
4046 int state; 4056 int state;
4047 4057
4048 static const struct 4058 static const struct
4342 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
4343 break; 4353 break;
4344 4354
4345 //case 50: // not variable spacing 4355 //case 50: // not variable spacing
4346 4356
4347#if ENABLE_FRILLS 4357#if !ENABLE_MINIMAL
4348 case 90: 4358 case 90:
4349 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
4350 case 92: 4360 case 92:
4351 case 93: 4361 case 93:
4352 case 94: 4362 case 94:
4417rxvt_term::tt_write (const char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4428{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4430 return;
4421 4431
4422 if (pty.pty < 0) 4432 if (pty->pty < 0)
4423 return; 4433 return;
4424 4434
4425 if (v_buflen == 0) 4435 if (v_buflen == 0)
4426 { 4436 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4438
4429 if ((unsigned int)written == len) 4439 if ((unsigned int)written == len)
4430 return; 4440 return;
4431 4441
4432 data += written; 4442 data += written;
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4452}
4443 4453
4444void rxvt_term::pty_write () 4454void rxvt_term::pty_write ()
4445{ 4455{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4457
4448 if (written > 0) 4458 if (written > 0)
4449 { 4459 {
4450 v_buflen -= written; 4460 v_buflen -= written;
4451 4461

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines