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.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 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);
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{
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
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1175 }
1106} 1176}
1107#endif 1177#endif
1108 1178
1109#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1110static struct event_handler 1180static struct event_handler
1111{ 1181{
1112 check_watcher cw_yield; 1182 check_watcher yield_ev;
1113 1183
1114 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1115 { 1185 {
1116 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
1117 w.stop (); 1194 w.stop ();
1118 } 1195 }
1119 1196
1120 event_handler () 1197 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1122 { 1199 {
1123 } 1200 }
1124} event_handler; 1201} event_handler;
1125#endif 1202#endif
1126 1203
1146 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1147 return true; 1224 return true;
1148 } 1225 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1227 {
1151#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1152 if (display->is_local) 1229 if (display->is_local)
1153 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1154#endif 1231#endif
1155 } 1232 }
1156 else 1233 else
1157 { 1234 {
1158 pty_ev.stop (); 1235 pty_ev.stop ();
1180} 1257}
1181 1258
1182void 1259void
1183rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1184{ 1261{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1263 recolour_cursor ();
1187 1264
1188#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1266 hidden_pointer = 0;
1190 1267
1198rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1199{ 1276{
1200 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1201 return; 1278 return;
1202 1279
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1281 XFlush (dpy);
1205 1282
1206 hidden_pointer = 1; 1283 hidden_pointer = 1;
1207} 1284}
1208 1285
1209void 1286void
1282 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1283 (32 + x + 1), 1360 (32 + x + 1),
1284 (32 + y + 1)); 1361 (32 + y + 1));
1285} 1362}
1286 1363
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1364/*{{{ process an X event */
1298void 1365void
1299rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1300{ 1367{
1301 make_current (); 1368 make_current ();
1302 1369
1303 dDisp; 1370 dLocal (Display *, dpy);
1304 1371
1305 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1375 return;
1313 unsigned int unused_mask; 1380 unsigned int unused_mask;
1314 1381
1315 switch (ev.type) 1382 switch (ev.type)
1316 { 1383 {
1317 case KeyPress: 1384 case KeyPress:
1318#if ISO_14755 1385 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1386 break;
1324 1387
1325 case KeyRelease: 1388 case KeyRelease:
1326 { 1389 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1390 break;
1398 }
1399 1391
1400 case ButtonPress: 1392 case ButtonPress:
1401 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1402 break; 1394 break;
1403 1395
1405 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1406 break; 1398 break;
1407 1399
1408 case ClientMessage: 1400 case ClientMessage:
1409 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 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 {
1412 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)))
1413 destroy (); 1411 destroy ();
1412 }
1414#if ENABLE_EWMH 1413#if ENABLE_EWMH
1415 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])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &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 }
1419#endif 1429#endif
1420 } 1430 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1431 break;
1457 1432
1458 case MappingNotify: 1433 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1435 break;
1483 break; 1458 break;
1484 } 1459 }
1485 break; 1460 break;
1486 1461
1487 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1466 focus_in ();
1489 break; 1467 break;
1490 1468
1491 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1473 focus_out ();
1493 break; 1474 break;
1494 1475
1495 case ConfigureNotify: 1476 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1497 { 1478 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1480 ;
1500 1481
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1483 {
1503 seen_resize = 1; 1484 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1486 }
1506 1487
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1508 if (OPTION (Opt_transparent)) 1491 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1492 check_our_parents ();
1510#endif 1493#endif
1511 } 1494 }
1512 break; 1495 break;
1513 1496
1514 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1502
1519 break; 1503 break;
1520 1504
1521 case SelectionClear: 1505 case SelectionClear:
1522 selection_clear (); 1506 selection_clear ();
1558 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1559 { 1543 {
1560 do 1544 do
1561 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1562 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564 1548
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566 1550
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1570 1554
1571 want_refresh = 1; 1555 want_refresh = 1;
1572 } 1556 }
1573 else 1557 else
1574 { 1558 {
1575 XEvent unused_event; 1559 XEvent unused_event;
1576 1560
1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578 ; 1562 ;
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580 ; 1564 ;
1581 1565
1582 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1583 { 1567 {
1584 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1585 scrollbar_show (0); 1569 scrollbar_show (0);
1586 } 1570 }
1587 1571
1588#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1589 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1591#endif 1575#endif
1592 } 1576 }
1593 break; 1577 break;
1594 1578
1595 case MotionNotify: 1579 case MotionNotify:
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop 1591 ; // nop
1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609 { 1593 {
1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611 ; 1595 ;
1612 1596
1613 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1614 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1615 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1616 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1617 &ev.xbutton.state); 1601 &ev.xbutton.state);
1618#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
1682#endif 1666#endif
1683 } 1667 }
1684 } 1668 }
1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686 { 1670 {
1687 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1689 ; 1673 ;
1690 1674
1691 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1692 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1693 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1694 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1695 &unused_mask); 1679 &unused_mask);
1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1700 scrollbar_show (1); 1684 scrollbar_show (1);
1701 } 1685 }
1702 break; 1686 break;
1703 } 1687 }
1704 1688
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 { 1691 {
1710 if (hidden_cursor) 1692 if (hidden_cursor)
1711 { 1693 {
1712 hidden_cursor = 0; 1694 hidden_cursor = 0;
1713 want_refresh = 1; 1695 want_refresh = 1;
1714 } 1696 }
1715 1697
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1699 }
1718#endif 1700#endif
1719 1701
1720#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 if (!focus) 1720 if (!focus)
1739 { 1721 {
1740 focus = 1; 1722 focus = 1;
1741 want_refresh = 1; 1723 want_refresh = 1;
1742 1724
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744 1726
1745#if USE_XIM 1727#if USE_XIM
1746 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1747 { 1729 {
1748 IMSetStatusPosition (); 1730 IMSetPosition ();
1749 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1750 } 1732 }
1751#endif 1733#endif
1752#if CURSOR_BLINK 1734#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1737#endif
1756#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1758 { 1740 {
1759 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1799 } 1781 }
1800#endif 1782#endif
1801 } 1783 }
1802} 1784}
1803 1785
1804#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1805void 1800void
1806rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1807{ 1802{
1808 make_current (); 1803 make_current ();
1809 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1810 switch (ev.type) 1810 switch (ev.type)
1811 { 1811 {
1812 case PropertyNotify: 1812 case PropertyNotify:
1813 /* 1813 /*
1814 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
1822 case ReparentNotify: 1822 case ReparentNotify:
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1825 break; 1825 break;
1826 } 1826 }
1827# endif
1827} 1828}
1828#endif 1829#endif
1829 1830
1830void 1831void
1831rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
1840 /* 1841 /*
1841 * VT window processing of button press 1842 * VT window processing of button press
1842 */ 1843 */
1843 if (ev.window == vt) 1844 if (ev.window == vt)
1844 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1845#if ISO_14755 1849#if ISO_14755
1846 // 5.4 1850 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 { 1852 {
1849 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
1891 else 1895 else
1892 { 1896 {
1893 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1894 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1895 1899
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897 switch (ev.button) 1900 switch (ev.button)
1898 { 1901 {
1899 case Button1: 1902 case Button1:
1900 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1902#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1904#else 1907#else
1905 selection.rect = false; 1908 selection.rect = false;
1906#endif 1909#endif
1907 1910
1908 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910 { 1913 {
1911 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1912 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1913 else 1916 else
1914 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1915 } 1918 }
1916 else 1919 else
1917 { 1920 {
1918 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1919 MEvent.clicks++; 1922 MEvent.clicks++;
1920 else 1923 else
1921 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1922 1925
1923 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1924 } 1927 }
1925 1928
1926 MEvent.button = Button1; 1929 MEvent.button = Button1;
1927 break; 1930 break;
1928 1931
1929 case Button3: 1932 case Button3:
1930 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1931 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1932 else 1935 else
1933 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1934 1937
1935 MEvent.button = Button3; 1938 MEvent.button = Button3;
1936 break; 1939 break;
1937 } 1940 }
1938 } 1941 }
1939 1942
1940 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1941 return; 1944 return;
1942 } 1945 }
1943 1946
2106 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2107#endif 2110#endif
2108 2111
2109 if (ev.window == vt) 2112 if (ev.window == vt)
2110 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2111#if ISO_14755 2117#if ISO_14755
2112 // 5.4 2118 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return; 2120 return;
2115#endif 2121#endif
2122
2116 if (reportmode) 2123 if (reportmode)
2117 { 2124 {
2118 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2119 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2120 if (ev.button >= 4) 2127 if (ev.button >= 4)
2144 if (priv_modes & PrivMode_mouse_report 2151 if (priv_modes & PrivMode_mouse_report
2145 && bypass_keystate 2152 && bypass_keystate
2146 && ev.button == Button1 && MEvent.clicks <= 1) 2153 && ev.button == Button1 && MEvent.clicks <= 1)
2147 selection_extend (ev.x, ev.y, 0); 2154 selection_extend (ev.x, ev.y, 0);
2148 2155
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2152 switch (ev.button) 2156 switch (ev.button)
2153 { 2157 {
2154 case Button1: 2158 case Button1:
2155 case Button3: 2159 case Button3:
2156 selection_make (ev.time); 2160 selection_make (ev.time);
2157 break; 2161 break;
2162
2158 case Button2: 2163 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2166 break;
2167
2161#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2162 case Button4: 2169 case Button4:
2163 case Button5: 2170 case Button5:
2164 { 2171 {
2165 int i; 2172 int i;
2205#if TINTING 2212#if TINTING
2206/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2207 2214
2208typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2209 2216
2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2211{ 2218{
2212 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2213 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i; 2224 int i;
2218 2225
2219 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2220 2227
2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222 2229
2223 /* for convenience */ 2230 /* for convenience */
2224 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
2445 Atom atype; 2452 Atom atype;
2446 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2447 Window root, oldp, *list; 2454 Window root, oldp, *list;
2448 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2449 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2451 2457
2452 pchanged = 0; 2458 pchanged = 0;
2453 2459
2454 if (!OPTION (Opt_transparent)) 2460 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2456 2462
2457 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2459 2465
2460 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2461 2467
2462 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2463 { 2469 {
2464 if (am_transparent) 2470 if (am_transparent)
2465 { 2471 {
2466 pchanged = 1; 2472 pchanged = 1;
2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2469 } 2475 }
2470 2476
2471 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2472 } 2478 }
2473 2479
2474 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (disp, False); 2481 XSync (dpy, False);
2476 2482
2477 /* 2483 /*
2478 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2481 */ 2487 */
2482 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2486 2492
2487 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2492 2498
2493 if (!i || prop == NULL 2499 if (!i || prop == NULL
2494#if TINTING 2500#if TINTING
2495 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2496#endif 2502#endif
2497 ) 2503 )
2498 have_pixmap = 0; 2504 have_pixmap = 0;
2499 else 2505 else
2500 { 2506 {
2513 Window cr; 2519 Window cr;
2514 XImage *image; 2520 XImage *image;
2515 GC gc; 2521 GC gc;
2516 XGCValues gcvalue; 2522 XGCValues gcvalue;
2517 2523
2518 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2522 nx = ny = 0; 2528 nx = ny = 0;
2523 2529
2536 } 2542 }
2537 2543
2538 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540 2546
2541 XSync (disp, False); 2547 XSync (dpy, False);
2542 allowedxerror = -1; 2548 allowedxerror = -1;
2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544 2550
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2547 allowedxerror = 0; 2553 allowedxerror = 0;
2548 2554
2551 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2552 { 2558 {
2553 pchanged = 1; 2559 pchanged = 1;
2554 if (pixmap != None) 2560 if (pixmap != None)
2555 { 2561 {
2556 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2557 pixmap = None; 2563 pixmap = None;
2558 } 2564 }
2559 } 2565 }
2560 2566
2561 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2562 } 2568 }
2563 else 2569 else
2564 { 2570 {
2565 if (pixmap != None) 2571 if (pixmap != None)
2566 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2567 2573
2568#if TINTING 2574#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2570 { 2576 {
2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573 2578
2579 rgba c;
2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2575 2581
2576 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 } 2583 }
2578#endif 2584#endif
2579 2585
2580 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 szHint.width, szHint.height, image->depth);
2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2583 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2584 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2585 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2586 XDestroyImage (image); 2591 XDestroyImage (image);
2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2588 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2589 2594
2590 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2591 pchanged = 1; 2596 pchanged = 1;
2592 2597
2593 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2594 } 2599 }
2595 } 2600 }
2596 2601
2597 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2599 else 2604 else
2600 { 2605 {
2601 unsigned int n; 2606 unsigned int n;
2602 /* 2607 /*
2603 * InheritPixmap transparency 2608 * InheritPixmap transparency
2604 */ 2609 */
2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606 { 2611 {
2607 oldp = parent[i]; 2612 oldp = parent[i];
2608 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2609 &parent[i], &list, &n);
2610 XFree (list); 2614 XFree (list);
2611 2615
2612 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2613 { 2617 {
2614 if (oldp != None) 2618 if (oldp != None)
2622 } 2626 }
2623 2627
2624 n = 0; 2628 n = 0;
2625 2629
2626 if (pchanged) 2630 if (pchanged)
2627 {
2628 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2629 { 2632 {
2630 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 { 2636 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break; 2638 break;
2635 } 2639 }
2636 } 2640 }
2637 }
2638 2641
2639 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2640 { 2643 {
2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2643 am_transparent = 0; 2646 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2645 } 2648 }
2646 else 2649 else
2647 { 2650 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2654 { 2652 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2657 } 2655 }
2658 2656
2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2660 am_transparent = 1; 2658 am_transparent = 1;
2661 } 2659 }
2662 2660
2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664 parent[i] = None; 2662 parent[i] = None;
2665 } 2663 }
2666 2664
2667 if (scrollBar.win) 2665 if (scrollBar.win)
2668 { 2666 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2671 scrollbar_show (0); 2669 scrollbar_show (0);
2672 } 2670 }
2673 2671
2674 if (am_transparent) 2672 if (am_transparent)
2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793 refresh_limit++; 2791 refresh_limit++;
2794 else 2792 else
2795 { 2793 {
2796 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2797 scr_refresh (); 2796 scr_refresh ();
2798 want_refresh = 1; 2797 want_refresh = 1;
2799 } 2798 }
2800 } 2799 }
2801 2800
2820 return flag; 2819 return flag;
2821} 2820}
2822 2821
2823// read the next character 2822// read the next character
2824wchar_t 2823wchar_t
2825rxvt_term::next_char () 2824rxvt_term::next_char () NOTHROW
2826{ 2825{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2826 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2827 {
2829 // assume 7-bit to be ascii ALWAYS 2828 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2851 return NOCHAR; 2850 return NOCHAR;
2852} 2851}
2853 2852
2854// read the next octet 2853// read the next octet
2855uint32_t 2854uint32_t
2856rxvt_term::next_octet () 2855rxvt_term::next_octet () NOTHROW
2857{ 2856{
2858 return cmdbuf_ptr < cmdbuf_endp 2857 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2858 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2859 : NOCHAR;
2861} 2860}
2861
2862static class out_of_input out_of_input;
2862 2863
2863/* rxvt_cmd_getc () - Return next input character */ 2864/* rxvt_cmd_getc () - Return next input character */
2864/* 2865/*
2865 * Return the next input character after first passing any keyboard input 2866 * Return the next input character after first passing any keyboard input
2866 * to the command. 2867 * to the command.
2867 */ 2868 */
2868wchar_t 2869wchar_t
2869rxvt_term::cmd_getc () 2870rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2871{
2871 wchar_t c = next_char (); 2872 wchar_t c = next_char ();
2872 2873
2873 if (c == NOCHAR) 2874 if (c == NOCHAR)
2874 throw out_of_input; 2875 throw out_of_input;
2875 2876
2876 return c; 2877 return c;
2877} 2878}
2878 2879
2879uint32_t 2880uint32_t
2880rxvt_term::cmd_get8 () 2881rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2882{
2882 uint32_t c = next_octet (); 2883 uint32_t c = next_octet ();
2883 2884
2884 if (c == NOCHAR) 2885 if (c == NOCHAR)
2885 throw out_of_input; 2886 throw out_of_input;
3123 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3124 break; 3125 break;
3125 case '+': 3126 case '+':
3126 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3127 break; 3128 break;
3128#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3129 case '6': 3130 case '6':
3130 scr_backindex (); 3131 scr_backindex ();
3131 break; 3132 break;
3132#endif 3133#endif
3133 case '7': 3134 case '7':
3134 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3135 break; 3136 break;
3136 case '8': 3137 case '8':
3137 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3138 break; 3139 break;
3139#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3140 case '9': 3141 case '9':
3141 scr_forwardindex (); 3142 scr_forwardindex ();
3142 break; 3143 break;
3143#endif 3144#endif
3144 case '=': 3145 case '=':
3306 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3307 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3308 if (arg[p] == -1) 3309 if (arg[p] == -1)
3309 arg[p] = ndef; 3310 arg[p] = ndef;
3310 3311
3311#ifdef DEBUG_CMD
3312 fprintf (stderr, "CSI ");
3313 for (p = 0; p < nargs; p++)
3314 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315 fprintf (stderr, "%c\n", ch);
3316#endif
3317
3318 /* 3312 /*
3319 * private mode handling 3313 * private mode handling
3320 */ 3314 */
3321 if (priv) 3315 if (priv)
3322 { 3316 {
3323 switch (priv) 3317 switch (priv)
3324 { 3318 {
3325 case '>': 3319 case '>':
3326 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3328 break; 3331 break;
3329 case '?': 3332 case '?':
3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3332 break; 3335 break;
3535 break; 3538 break;
3536 case CSI_75: 3539 case CSI_75:
3537 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3538 break; 3541 break;
3539 3542
3540#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3541 case CSI_74: 3544 case CSI_74:
3542 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3543 break; 3546 break;
3544#endif 3547#endif
3545 3548
3552 break; 3555 break;
3553 } 3556 }
3554} 3557}
3555/*}}} */ 3558/*}}} */
3556 3559
3557#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3558/* ARGSUSED */ 3561/* ARGSUSED */
3559void 3562void
3560rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561{ 3564{
3562 int x, y; 3565 int x, y;
3563 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3564 Window wdummy; 3567 Window wdummy;
3565 dDisp; 3568
3569 dLocal (Display *, dpy);
3566 3570
3567 if (nargs == 0) 3571 if (nargs == 0)
3568 return; 3572 return;
3569 3573
3570 switch (args[0]) 3574 switch (args[0])
3571 { 3575 {
3572 /* 3576 /*
3573 * commands 3577 * commands
3574 */ 3578 */
3575 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3576 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3577 break; 3581 break;
3578 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3579 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3580 break; 3584 break;
3581 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3582 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3583 break; 3587 break;
3584 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3590 break;
3587 case 5: /* raise window */ 3591 case 5: /* raise window */
3588 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3589 break; 3593 break;
3590 case 6: /* lower window */ 3594 case 6: /* lower window */
3591 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3592 break; 3596 break;
3593 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3594 scr_touch (true); 3598 scr_touch (true);
3595 break; 3599 break;
3596 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
3603 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3604 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3605 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3606 break; 3610 break;
3607 3611
3608
3609 /* 3612 /*
3610 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3611 */ 3614 */
3612 case 11: /* report window state */ 3615 case 11: /* report window state */
3613 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615 break; 3618 break;
3616 case 13: /* report window position */ 3619 case 13: /* report window position */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3619 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3620 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3621 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3622 break; 3625 break;
3623 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626 break; 3629 break;
3627 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3628 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629 break; 3632 break;
3631 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632 break; 3635 break;
3633 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3634 { 3637 {
3635 char *s; 3638 char *s;
3636 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s); 3641 XFree (s);
3639 } 3642 }
3640 break; 3643 break;
3641 case 21: /* report window title */ 3644 case 21: /* report window title */
3642 { 3645 {
3643 char *s; 3646 char *s;
3644 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s); 3649 XFree (s);
3647 } 3650 }
3648 break; 3651 break;
3649 } 3652 }
3677 seen_esc = true; 3680 seen_esc = true;
3678 continue; 3681 continue;
3679 } 3682 }
3680 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3681 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3682 else if (ch < 0x20) 3687 else if (ch < 0x20)
3683 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3684 3689
3685 seen_esc = false; 3690 seen_esc = false;
3686 3691
3687 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3688 // stop at some sane length 3693 // stop at some sane length
3689 return NULL; 3694 return NULL;
3690 3695
3691 if (ch == C0_SYN)
3692 string[n++] = cmd_get8 ();
3693 else
3694 string[n++] = ch; 3696 string[n++] = ch;
3695 } 3697 }
3696 3698
3697 string[n++] = '\0'; 3699 string[n++] = '\0';
3698 3700
3699 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
3750void 3752void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{ 3754{
3753 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3754 { 3756 {
3755 unsigned short r, g, b; 3757 rgba c;
3756 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758 } 3766 }
3759 else 3767 else
3760 set_window_color (color, str); 3768 set_window_color (color, str);
3761} 3769}
3762 3770
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3773 */
3766void 3774void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3775rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3776{
3769 int changed = 0;
3770 int color; 3777 int color;
3771 char *buf, *name; 3778 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3780 int saveop = op;
3774 dDisp; 3781
3782 dLocal (Display *, dpy);
3775 3783
3776 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3777 switch (op) 3789 switch (op)
3778 { 3790 {
3779 case XTerm_name: 3791 case XTerm_name:
3780 set_title (str); 3792 set_title (str);
3781 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
3795 unsigned long bytes_after; 3807 unsigned long bytes_after;
3796 unsigned char *value = 0; 3808 unsigned char *value = 0;
3797 const char *str = ""; 3809 const char *str = "";
3798 3810
3799 if (prop 3811 if (prop
3800 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3801 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3802 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3803 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3804 && actual_type != None 3816 && actual_type != None
3805 && actual_format == 8) 3817 && actual_format == 8)
3806 str = (const char *)(value); 3818 str = (const char *)(value);
3807 3819
3808 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3809 3821
3810 XFree (value); 3822 XFree (value);
3811 } 3823 }
3812 else 3824 else
3813 { 3825 {
3817 { 3829 {
3818 *eq = 0; 3830 *eq = 0;
3819 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3820 } 3832 }
3821 else 3833 else
3822 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3823 display->atom (str)); 3835 display->atom (str));
3824 } 3836 }
3825 break; 3837 break;
3826 3838
3827 case XTerm_Color: 3839 case XTerm_Color:
3837 break; 3849 break;
3838 3850
3839 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3840 *buf++ = '\0'; 3852 *buf++ = '\0';
3841 3853
3842 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3843 {
3844 unsigned short r, g, b;
3845 pix_colors_focused[color].get (display, r, g, b);
3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847 }
3848 else
3849 set_window_color (color, name);
3850 } 3855 }
3851 break; 3856 break;
3852 case XTerm_Color00: 3857 case XTerm_Color00:
3853 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3854 break; 3859 break;
3855 case XTerm_Color01: 3860 case XTerm_Color01:
3856 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3857 break; 3862 break;
3858#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3861 break; 3866 break;
3862#endif 3867#endif
3863 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3864 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3870 break;
3866 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3873 break;
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3872 break; 3877 break;
3873 case Rxvt_Color_BD: 3878 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3879 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3880 process_color_seq (op, Color_BD, str, resp);
3876 break; 3881 break;
3877 case Rxvt_Color_UL: 3882 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3883 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3884 process_color_seq (op, Color_UL, str, resp);
3880 break; 3885 break;
3881 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3883 break; 3888 break;
3884#endif 3889#endif
3885#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3886 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3888 check_our_parents (); 3894 check_our_parents ();
3895
3889 if (am_transparent) 3896 if (am_transparent)
3890 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3898
3891 break; 3899 break;
3892#endif 3900#endif
3893 3901
3894 case Rxvt_Pixmap: 3902 case Rxvt_Pixmap:
3903 {
3895 if (*str != ';') 3904 if (*str != ';')
3896 { 3905 {
3897#if XPM_BACKGROUND 3906#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3907 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3908 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3909 scr_touch (true);
3901#endif 3910#endif
3902 } 3911 }
3903 3912
3913 int changed = 0;
3914
3904 while ((str = strchr (str, ';')) != NULL) 3915 while ((str = strchr (str, ';')) != NULL)
3905 { 3916 {
3906 str++; 3917 str++;
3907#if XPM_BACKGROUND 3918#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3919 changed += scale_pixmap (str);
3909#endif 3920#endif
3910 } 3921 }
3911 3922
3912 if (changed) 3923 if (changed)
3913 { 3924 {
3914#ifdef XPM_BACKGROUND 3925#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3926 resize_pixmap ();
3916 scr_touch (true); 3927 scr_touch (true);
3917#endif 3928#endif
3918 } 3929 }
3930 }
3919 break; 3931 break;
3920 3932
3921 case Rxvt_restoreFG: 3933 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3934 set_window_color (Color_fg, str);
3923 break; 3935 break;
3962 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
3963 set_fonts (); 3975 set_fonts ();
3964 } 3976 }
3965 break; 3977 break;
3966 3978
3967#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
3968 case URxvt_locale: 3988 case URxvt_locale:
3969 if (query) 3989 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3971 else 3991 else
3972 { 3992 {
3973 set_locale (str); 3993 set_locale (str);
3974 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3995 init_xlocale ();
3990 break; 4010 break;
3991#endif 4011#endif
3992 4012
3993#if ENABLE_PERL 4013#if ENABLE_PERL
3994 case URxvt_perl: 4014 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3996 ; // no responses yet 4016 ; // no responses yet
3997 break; 4017 break;
3998#endif 4018#endif
3999 } 4019 }
4000} 4020}
4032 return state; 4052 return state;
4033} 4053}
4034 4054
4035/* we're not using priv _yet_ */ 4055/* we're not using priv _yet_ */
4036void 4056void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4057rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 4058{
4039 unsigned int i, j; 4059 unsigned int i, j;
4040 int state; 4060 int state;
4041 4061
4042 static const struct 4062 static const struct
4336 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4337 break; 4357 break;
4338 4358
4339 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4340 4360
4341#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4342 case 90: 4362 case 90:
4343 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4344 case 92: 4364 case 92:
4345 case 93: 4365 case 93:
4346 case 94: 4366 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines