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.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.326 by root, Sat Jun 9 13:04:27 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 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// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 309 int valid_keysym;
308 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
309 316
310 /* 317 /*
311 * 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
312 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
313 * 320 *
461 { 468 {
462 switch (keysym) 469 switch (keysym)
463 { 470 {
464 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
465 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
466 selection_request (ev.time, Sel_Primary); 473 selection_request (ev.time);
467 return; 474 return;
468#if TODO 475#if TODO
469 /* rxvt extras */ 476 /* rxvt extras */
470 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
471 change_font (FONT_UP); 478 change_font (FONT_UP);
490 { 497 {
491 commit_iso14755 (); 498 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
493# if ISO_14755 500# if ISO_14755
494 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
495# endif 510# endif
496 return; 511 return;
497 } 512 }
498 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
499 { 514 {
870 return; 885 return;
871 886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
920 1001
921#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922unsigned int 1003unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 1005{
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1183 }
1103} 1184}
1104#endif 1185#endif
1105 1186
1106#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1107static struct event_handler 1188static struct event_handler
1108{ 1189{
1109 check_watcher cw_yield; 1190 check_watcher yield_ev;
1110 1191
1111 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1112 { 1193 {
1113 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1114 w.stop (); 1202 w.stop ();
1115 } 1203 }
1116 1204
1117 event_handler () 1205 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1119 { 1207 {
1120 } 1208 }
1121} event_handler; 1209} event_handler;
1122#endif 1210#endif
1123 1211
1143 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1144 return true; 1232 return true;
1145 } 1233 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1235 {
1148#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1149 if (display->is_local) 1237 if (display->is_local)
1150 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1151#endif 1239#endif
1152 } 1240 }
1153 else 1241 else
1154 { 1242 {
1155 pty_ev.stop (); 1243 pty_ev.stop ();
1156 1244
1157 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1158 destroy (); 1246 destroy ();
1159 } 1247 }
1160 1248
1161 return false; 1249 return false;
1162} 1250}
1177} 1265}
1178 1266
1179void 1267void
1180rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1181{ 1269{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1271 recolour_cursor ();
1184 1272
1185#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1274 hidden_pointer = 0;
1187 1275
1188 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1278#endif
1191} 1279}
1192 1280
1193#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1194void 1282void
1195rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1196{ 1284{
1197 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1198 return; 1286 return;
1199 1287
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1289 XFlush (dpy);
1202 1290
1203 hidden_pointer = 1; 1291 hidden_pointer = 1;
1204} 1292}
1205 1293
1206void 1294void
1279 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1280 (32 + x + 1), 1368 (32 + x + 1),
1281 (32 + y + 1)); 1369 (32 + y + 1));
1282} 1370}
1283 1371
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1372/*{{{ process an X event */
1295void 1373void
1296rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1297{ 1375{
1298 make_current (); 1376 make_current ();
1299 1377
1300 dDisp; 1378 dLocal (Display *, dpy);
1301 1379
1302 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1383 return;
1310 unsigned int unused_mask; 1388 unsigned int unused_mask;
1311 1389
1312 switch (ev.type) 1390 switch (ev.type)
1313 { 1391 {
1314 case KeyPress: 1392 case KeyPress:
1315#if ISO_14755 1393 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1394 break;
1321 1395
1322 case KeyRelease: 1396 case KeyRelease:
1323 { 1397 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1398 break;
1395 }
1396 1399
1397 case ButtonPress: 1400 case ButtonPress:
1398 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1399 break; 1402 break;
1400 1403
1402 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1403 break; 1406 break;
1404 1407
1405 case ClientMessage: 1408 case ClientMessage:
1406 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410 destroy (); 1419 destroy ();
1420 }
1411#if ENABLE_EWMH 1421#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1416#endif 1437#endif
1417 } 1438 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break; 1439 break;
1454 1440
1455 case MappingNotify: 1441 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1443 break;
1480 break; 1466 break;
1481 } 1467 }
1482 break; 1468 break;
1483 1469
1484 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1485 focus_in (); 1474 focus_in ();
1486 break; 1475 break;
1487 1476
1488 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1489 focus_out (); 1481 focus_out ();
1490 break; 1482 break;
1491 1483
1492 case ConfigureNotify: 1484 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1494 { 1486 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1488 ;
1497 1489
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1491 {
1500 seen_resize = 1; 1492 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1502 } 1501 }
1503 1502
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 1504
1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1507 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1508 check_our_parents (); 1507 check_our_parents ();
1509#endif 1508#endif
1510 } 1509 }
1511 break; 1510 break;
1512 1511
1513 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1517
1518 break; 1518 break;
1519 1519
1520 case SelectionClear: 1520 case SelectionClear:
1521 selection_clear (); 1521 selection_clear ();
1557 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1558 { 1558 {
1559 do 1559 do
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1563
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1565
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1569 1569
1570 want_refresh = 1; 1570 want_refresh = 1;
1571 } 1571 }
1572 else 1572 else
1573 { 1573 {
1574 XEvent unused_event; 1574 XEvent unused_event;
1575 1575
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1577 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1579 ;
1580 1580
1581 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1582 { 1582 {
1583 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1584 scrollbar_show (0); 1584 scrollbar_show (0);
1585 } 1585 }
1586 1586
1587#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1590#endif 1590#endif
1591 } 1591 }
1592 break; 1592 break;
1593 1593
1594 case MotionNotify: 1594 case MotionNotify:
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1606 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1608 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1610 ;
1611 1611
1612 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1616 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1681#endif 1681#endif
1682 } 1682 }
1683 } 1683 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685 { 1685 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1688 ; 1688 ;
1689 1689
1690 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1694 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_show (1); 1699 scrollbar_show (1);
1700 } 1700 }
1701 break; 1701 break;
1702 } 1702 }
1703 1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1706 {
1709 if (hidden_cursor) 1707 if (hidden_cursor)
1710 { 1708 {
1711 hidden_cursor = 0; 1709 hidden_cursor = 0;
1712 want_refresh = 1; 1710 want_refresh = 1;
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 } 1714 }
1717#endif 1715#endif
1718 1716
1719#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 { 1719 {
1722 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1725 if (hidden_pointer) 1723 if (hidden_pointer)
1737 if (!focus) 1735 if (!focus)
1738 { 1736 {
1739 focus = 1; 1737 focus = 1;
1740 want_refresh = 1; 1738 want_refresh = 1;
1741 1739
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 1741
1744#if USE_XIM 1742#if USE_XIM
1745 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1746 { 1744 {
1747 IMSetStatusPosition (); 1745 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1749 } 1747 }
1750#endif 1748#endif
1751#if CURSOR_BLINK 1749#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif 1752#endif
1755#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1757 { 1755 {
1758 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1759 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1760 } 1771 }
1761#endif 1772#endif
1762 } 1773 }
1763} 1774}
1764 1775
1784#if USE_XIM 1795#if USE_XIM
1785 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1787#endif 1798#endif
1788#if CURSOR_BLINK 1799#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1791 hidden_cursor = 0; 1802 hidden_cursor = 0;
1792#endif 1803#endif
1793#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
1798 } 1809 }
1799#endif 1810#endif
1800 } 1811 }
1801} 1812}
1802 1813
1803#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1804void 1828void
1805rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1806{ 1830{
1807 make_current (); 1831 make_current ();
1808 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1809 switch (ev.type) 1838 switch (ev.type)
1810 { 1839 {
1811 case PropertyNotify: 1840 case PropertyNotify:
1812 /* 1841 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1818 return; 1847 return;
1819 1848
1820 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1821 case ReparentNotify: 1850 case ReparentNotify:
1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1823 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1824 break; 1853 break;
1825 } 1854 }
1855# endif
1826} 1856}
1827#endif 1857#endif
1828 1858
1829void 1859void
1830rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1839 /* 1869 /*
1840 * VT window processing of button press 1870 * VT window processing of button press
1841 */ 1871 */
1842 if (ev.window == vt) 1872 if (ev.window == vt)
1843 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1844#if ISO_14755 1877#if ISO_14755
1845 // 5.4 1878 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1880 {
1848 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
1890 else 1923 else
1891 { 1924 {
1892 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1894 1927
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1928 switch (ev.button)
1897 { 1929 {
1898 case Button1: 1930 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1935#else
1904 selection.rect = false; 1936 selection.rect = false;
1905#endif 1937#endif
1906 1938
1907 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1941 {
1910 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1912 else 1944 else
1913 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1914 } 1946 }
1915 else 1947 else
1916 { 1948 {
1917 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1950 MEvent.clicks++;
1919 else 1951 else
1920 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1921 1953
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1955 }
1924 1956
1925 MEvent.button = Button1; 1957 MEvent.button = Button1;
1926 break; 1958 break;
1927 1959
1928 case Button3: 1960 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1931 else 1963 else
1932 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1933 1965
1934 MEvent.button = Button3; 1966 MEvent.button = Button3;
1935 break; 1967 break;
1936 } 1968 }
1937 } 1969 }
1938 1970
1939 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1940 return; 1972 return;
1941 } 1973 }
1942 1974
2105 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2106#endif 2138#endif
2107 2139
2108 if (ev.window == vt) 2140 if (ev.window == vt)
2109 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2110#if ISO_14755 2145#if ISO_14755
2111 // 5.4 2146 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2148 return;
2114#endif 2149#endif
2150
2115 if (reportmode) 2151 if (reportmode)
2116 { 2152 {
2117 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2155 if (ev.button >= 4)
2143 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2180 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2147 2183
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2184 switch (ev.button)
2152 { 2185 {
2153 case Button1: 2186 case Button1:
2154 case Button3: 2187 case Button3:
2155 selection_make (ev.time); 2188 selection_make (ev.time);
2156 break; 2189 break;
2157 2190
2158 case Button2: 2191 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2167 break; 2194 break;
2168 2195
2169#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2170 case Button4: 2197 case Button4:
2171 case Button5: 2198 case Button5:
2175 2202
2176 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2177 2204
2178 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2179 i = 1; 2206 i = 1;
2180 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2181 i = nrow - 1; 2208 i = nrow - 1;
2182 else 2209 else
2183 i = 5; 2210 i = 5;
2184 2211
2185# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2208 } 2235 }
2209 } 2236 }
2210} 2237}
2211 2238
2212#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2213#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2214/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2215 2242
2216typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2217 2244
2218void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2219{ 2246{
2220 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2221 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2222 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2223 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2224 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2225 int i; 2252 int i;
2226 2253
2227 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2228 2255
2229 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2230 2257
2231 /* for convenience */ 2258 /* for convenience */
2232 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
2446 * Do transparency updates if required 2473 * Do transparency updates if required
2447 */ 2474 */
2448int 2475int
2449rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2450{ 2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_parents_ev.stop ();
2480 check_our_parents_ev.start (NOW + .1);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2451 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2452 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
2453 Atom atype; 2490 Atom atype;
2454 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
2455 Window root, oldp, *list; 2492 Window root, oldp, *list;
2456 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
2457 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2458 dDisp; 2495 int sx, sy;
2496 Window cr;
2459 2497
2460 pchanged = 0; 2498 pchanged = 0;
2461 2499
2462 if (!OPTION (Opt_transparent)) 2500 if (!option (Opt_transparent))
2463 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
2464 2502
2465 XGetWindowAttributes (disp, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2466 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
2467 2505
2468 XGetWindowAttributes (disp, parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2469 2507
2470 if (rootdepth != wattr.depth) 2508 if (rootdepth != wattr.depth)
2471 { 2509 {
2472 if (am_transparent) 2510 if (am_transparent)
2473 { 2511 {
2474 pchanged = 1; 2512 pchanged = 1;
2475 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2476 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
2477 } 2515 }
2478 2516
2479 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
2480 } 2518 }
2481 2519
2482 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2483 XSync (disp, False); 2521 XSync (dpy, False);
2484 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2485 /* 2530 /*
2486 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
2487 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
2488 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
2489 */ 2534 */
2490 i = (xa[XA_XROOTPMAP_ID] 2535 i = (xa[XA_XROOTPMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success); 2538 &nitems, &bytes_after, &prop) == Success);
2494 2539
2495 if (!i || prop == NULL) 2540 if (!i || prop == NULL)
2496 i = (xa[XA_ESETROOT_PMAP_ID] 2541 i = (xa[XA_ESETROOT_PMAP_ID]
2497 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2498 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2499 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
2500 2545
2501 if (!i || prop == NULL 2546 if (!i || prop == NULL
2502#if TINTING 2547#if TINTING
2503 || !rs[Rs_color + Color_tint] 2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2504#endif 2553#endif
2505 ) 2554 )
2506 have_pixmap = 0; 2555 have_pixmap = 0;
2507 else 2556 else
2508 { 2557 {
2511 XFree (prop); 2560 XFree (prop);
2512 } 2561 }
2513 2562
2514 if (have_pixmap) 2563 if (have_pixmap)
2515 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2516 /* 2687 /*
2517 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2518 */ 2689 */
2519 int sx, sy, nx, ny; 2690 int nx, ny;
2520 unsigned int nw, nh; 2691 unsigned int nw, nh;
2521 Window cr;
2522 XImage *image; 2692 XImage *image;
2523 GC gc;
2524 XGCValues gcvalue;
2525 2693
2526 XTranslateCoordinates (disp, parent[0], display->root,
2527 0, 0, &sx, &sy, &cr);
2528 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2529 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2530 nx = ny = 0; 2696 nx = ny = 0;
2531 2697
2532 if (sx < 0) 2698 if (sx < 0)
2533 { 2699 {
2534 nw += sx; 2700 nw += sx;
2535 nx = -sx; 2701 nx = -sx;
2536 sx = 0; 2702 sx = 0;
2537 } 2703 }
2538 2704
2539 if (sy < 0) 2705 if (sy < 0)
2540 { 2706 {
2541 nh += sy; 2707 nh += sy;
2542 ny = -sy; 2708 ny = -sy;
2543 sy = 0; 2709 sy = 0;
2544 } 2710 }
2545 2711
2546 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2547 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2548 2714
2549 XSync (disp, False); 2715 XSync (dpy, False);
2550 allowedxerror = -1; 2716 allowedxerror = -1;
2551 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2552 2718
2553 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2554 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2555 allowedxerror = 0; 2721 allowedxerror = 0;
2556
2557 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2558 { 2751 {
2559 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2560 { 2753 {
2561 pchanged = 1; 2754 pchanged = 1;
2562 if (pixmap != None) 2755 if (pixmap != None)
2563 { 2756 {
2564 XFreePixmap (disp, pixmap); 2757 XFreePixmap (dpy, pixmap);
2565 pixmap = None; 2758 pixmap = None;
2566 } 2759 }
2567 } 2760 }
2568 2761
2569 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2570 } 2763 }
2571 else 2764 else
2572 { 2765 {
2573 if (pixmap != None)
2574 XFreePixmap (disp, pixmap);
2575
2576#if TINTING
2577 if (ISSET_PIXCOLOR (Color_tint))
2578 {
2579 unsigned short rm, gm, bm;
2580 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2581
2582 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2583
2584 ShadeXImage (display, image, shade, rm, gm, bm);
2585 }
2586#endif
2587
2588 pixmap = XCreatePixmap (disp, vt,
2589 szHint.width, szHint.height, image->depth);
2590 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2591 XPutImage (disp, pixmap, gc, image, 0, 0,
2592 nx, ny, image->width, image->height);
2593 XFreeGC (disp, gc);
2594 XDestroyImage (image);
2595 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2596 XClearWindow (disp, parent[0]); 2767 XClearWindow (dpy, parent[0]);
2597 2768
2598 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2599 pchanged = 1; 2770 pchanged = 1;
2600 2771
2601 am_transparent = am_pixmap_trans = 1; 2772 am_transparent = am_pixmap_trans = 1;
2602 } 2773 }
2603 } 2774 }
2604 2775
2605 if (am_pixmap_trans) 2776 if (am_pixmap_trans)
2606 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2607 else 2778 else
2608 { 2779 {
2609 unsigned int n; 2780 unsigned int n;
2610 /* 2781 /*
2611 * InheritPixmap transparency 2782 * InheritPixmap transparency
2612 */ 2783 */
2613 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2614 { 2785 {
2615 oldp = parent[i]; 2786 oldp = parent[i];
2616 XQueryTree (disp, parent[i - 1], &root, 2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2617 &parent[i], &list, &n);
2618 XFree (list); 2788 XFree (list);
2619 2789
2620 if (parent[i] == display->root) 2790 if (parent[i] == display->root)
2621 { 2791 {
2622 if (oldp != None) 2792 if (oldp != None)
2630 } 2800 }
2631 2801
2632 n = 0; 2802 n = 0;
2633 2803
2634 if (pchanged) 2804 if (pchanged)
2635 {
2636 for (; n < (unsigned int)i; n++) 2805 for (; n < (unsigned int)i; n++)
2637 { 2806 {
2638 XGetWindowAttributes (disp, parent[n], &wattr); 2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2639 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2640 { 2810 {
2641 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2642 break; 2812 break;
2643 } 2813 }
2644 } 2814 }
2645 }
2646 2815
2647 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2648 { 2817 {
2649 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2650 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2651 am_transparent = 0; 2820 am_transparent = 0;
2652 /* XXX: also turn off Opt_transparent? */ 2821 /* XXX: also turn off Opt_transparent? */
2653 } 2822 }
2654 else 2823 else
2655 { 2824 {
2656#if WAIT_FOR_WM
2657 /* wait (an arbitrary period) for the WM to do its thing
2658 * needed for fvwm2.2.2 (and before?) */
2659 sleep (1);
2660#endif
2661 for (n = 0; n < (unsigned int)i; n++) 2825 for (n = 0; n < (unsigned int)i; n++)
2662 { 2826 {
2663 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2664 XClearWindow (disp, parent[n]); 2828 XClearWindow (dpy, parent[n]);
2665 } 2829 }
2666 2830
2667 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2668 am_transparent = 1; 2832 am_transparent = 1;
2669 } 2833 }
2670 2834
2671 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2672 parent[i] = None; 2836 parent[i] = None;
2673 } 2837 }
2674 2838
2675 if (scrollBar.win) 2839 if (scrollBar.win)
2676 { 2840 {
2677 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2678 scrollBar.setIdle (); 2842 scrollBar.setIdle ();
2679 scrollbar_show (0); 2843 scrollbar_show (0);
2680 } 2844 }
2681 2845
2682 if (am_transparent) 2846 if (am_transparent)
2684 want_refresh = want_full_refresh = 1; 2848 want_refresh = want_full_refresh = 1;
2685 if (am_pixmap_trans) 2849 if (am_pixmap_trans)
2686 flush (); 2850 flush ();
2687 } 2851 }
2688 2852
2689 return pchanged; 2853// return pchanged;
2690} 2854}
2691#endif 2855#endif
2692 2856
2693/*}}} */ 2857/*}}} */
2694 2858
2745 if (ch == C0_LF) 2909 if (ch == C0_LF)
2746 nlines++; 2910 nlines++;
2747 2911
2748 refresh_count++; 2912 refresh_count++;
2749 2913
2750 if (!OPTION (Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2751 || (refresh_count >= refresh_limit * (nrow - 1))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2752 { 2916 {
2753 refreshnow = true; 2917 refreshnow = true;
2754 refresh_count = 0; 2918 refresh_count = 0;
2755 ch = NOCHAR; 2919 ch = NOCHAR;
2795 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2796 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2797 */ 2961 */
2798 if (refreshnow) 2962 if (refreshnow)
2799 { 2963 {
2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2801 refresh_limit++; 2965 refresh_limit++;
2802 else 2966 else
2803 { 2967 {
2804 flag = true; 2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2805 scr_refresh (); 2970 scr_refresh ();
2806 want_refresh = 1; 2971 want_refresh = 1;
2807 } 2972 }
2808 } 2973 }
2809 2974
3133 scr_charset_set (2, (unsigned int)cmd_getc ()); 3298 scr_charset_set (2, (unsigned int)cmd_getc ());
3134 break; 3299 break;
3135 case '+': 3300 case '+':
3136 scr_charset_set (3, (unsigned int)cmd_getc ()); 3301 scr_charset_set (3, (unsigned int)cmd_getc ());
3137 break; 3302 break;
3138#if ENABLE_FRILLS 3303#if !ENABLE_MINIMAL
3139 case '6': 3304 case '6':
3140 scr_backindex (); 3305 scr_backindex ();
3141 break; 3306 break;
3142#endif 3307#endif
3143 case '7': 3308 case '7':
3144 scr_cursor (SAVE); 3309 scr_cursor (SAVE);
3145 break; 3310 break;
3146 case '8': 3311 case '8':
3147 scr_cursor (RESTORE); 3312 scr_cursor (RESTORE);
3148 break; 3313 break;
3149#if ENABLE_FRILLS 3314#if !ENABLE_MINIMAL
3150 case '9': 3315 case '9':
3151 scr_forwardindex (); 3316 scr_forwardindex ();
3152 break; 3317 break;
3153#endif 3318#endif
3154 case '=': 3319 case '=':
3316 ndef = get_byte_array_bit (csi_defaults, i); 3481 ndef = get_byte_array_bit (csi_defaults, i);
3317 for (p = 0; p < nargs; p++) 3482 for (p = 0; p < nargs; p++)
3318 if (arg[p] == -1) 3483 if (arg[p] == -1)
3319 arg[p] = ndef; 3484 arg[p] = ndef;
3320 3485
3321#ifdef DEBUG_CMD
3322 fprintf (stderr, "CSI ");
3323 for (p = 0; p < nargs; p++)
3324 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3325 fprintf (stderr, "%c\n", ch);
3326#endif
3327
3328 /* 3486 /*
3329 * private mode handling 3487 * private mode handling
3330 */ 3488 */
3331 if (priv) 3489 if (priv)
3332 { 3490 {
3333 switch (priv) 3491 switch (priv)
3334 { 3492 {
3335 case '>': 3493 case '>':
3336 if (ch == CSI_DA) /* secondary device attributes */ 3494 if (ch == CSI_DA) /* secondary device attributes */
3337 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3495 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3501 // that we do not support xterm mouse reporting (should be 95 when we do).
3502 //
3503 tt_printf ("\033[>%d;94;0c", 'U');
3504 }
3338 break; 3505 break;
3339 case '?': 3506 case '?':
3340 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3341 process_terminal_mode (ch, priv, nargs, arg); 3508 process_terminal_mode (ch, priv, nargs, arg);
3342 break; 3509 break;
3468 break; 3635 break;
3469 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
3470 scr_report_position (); 3637 scr_report_position ();
3471 break; 3638 break;
3472 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
3473 if (OPTION (Opt_insecure)) 3640 if (option (Opt_insecure))
3474 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3475 break; 3642 break;
3476 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
3477 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3478 break; 3645 break;
3545 break; 3712 break;
3546 case CSI_75: 3713 case CSI_75:
3547 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3548 break; 3715 break;
3549 3716
3550#if ENABLE_FRILLS 3717#if !ENABLE_MINIMAL
3551 case CSI_74: 3718 case CSI_74:
3552 process_window_ops (arg, nargs); 3719 process_window_ops (arg, nargs);
3553 break; 3720 break;
3554#endif 3721#endif
3555 3722
3562 break; 3729 break;
3563 } 3730 }
3564} 3731}
3565/*}}} */ 3732/*}}} */
3566 3733
3567#if ENABLE_FRILLS 3734#if !ENABLE_MINIMAL
3568/* ARGSUSED */ 3735/* ARGSUSED */
3569void 3736void
3570rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3737rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3571{ 3738{
3572 int x, y; 3739 int x, y;
3573 XWindowAttributes wattr; 3740 XWindowAttributes wattr;
3574 Window wdummy; 3741 Window wdummy;
3575 dDisp; 3742
3743 dLocal (Display *, dpy);
3576 3744
3577 if (nargs == 0) 3745 if (nargs == 0)
3578 return; 3746 return;
3579 3747
3580 switch (args[0]) 3748 switch (args[0])
3581 { 3749 {
3582 /* 3750 /*
3583 * commands 3751 * commands
3584 */ 3752 */
3585 case 1: /* deiconify window */ 3753 case 1: /* deiconify window */
3586 XMapWindow (disp, parent[0]); 3754 XMapWindow (dpy, parent[0]);
3587 break; 3755 break;
3588 case 2: /* iconify window */ 3756 case 2: /* iconify window */
3589 XIconifyWindow (disp, parent[0], display->screen); 3757 XIconifyWindow (dpy, parent[0], display->screen);
3590 break; 3758 break;
3591 case 3: /* set position (pixels) */ 3759 case 3: /* set position (pixels) */
3592 XMoveWindow (disp, parent[0], args[1], args[2]); 3760 XMoveWindow (dpy, parent[0], args[1], args[2]);
3593 break; 3761 break;
3594 case 4: /* set size (pixels) */ 3762 case 4: /* set size (pixels) */
3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3596 break; 3764 break;
3597 case 5: /* raise window */ 3765 case 5: /* raise window */
3598 XRaiseWindow (disp, parent[0]); 3766 XRaiseWindow (dpy, parent[0]);
3599 break; 3767 break;
3600 case 6: /* lower window */ 3768 case 6: /* lower window */
3601 XLowerWindow (disp, parent[0]); 3769 XLowerWindow (dpy, parent[0]);
3602 break; 3770 break;
3603 case 7: /* refresh window */ 3771 case 7: /* refresh window */
3604 scr_touch (true); 3772 scr_touch (true);
3605 break; 3773 break;
3606 case 8: /* set size (chars) */ 3774 case 8: /* set size (chars) */
3613 if (args[0] >= 24) /* set height (chars) */ 3781 if (args[0] >= 24) /* set height (chars) */
3614 set_widthheight ((unsigned int)width, 3782 set_widthheight ((unsigned int)width,
3615 (unsigned int) (args[1] * fheight)); 3783 (unsigned int) (args[1] * fheight));
3616 break; 3784 break;
3617 3785
3618
3619 /* 3786 /*
3620 * reports - some output format copied from XTerm 3787 * reports - some output format copied from XTerm
3621 */ 3788 */
3622 case 11: /* report window state */ 3789 case 11: /* report window state */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3790 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3625 break; 3792 break;
3626 case 13: /* report window position */ 3793 case 13: /* report window position */
3627 XGetWindowAttributes (disp, parent[0], &wattr); 3794 XGetWindowAttributes (dpy, parent[0], &wattr);
3628 XTranslateCoordinates (disp, parent[0], wattr.root, 3795 XTranslateCoordinates (dpy, parent[0], wattr.root,
3629 -wattr.border_width, -wattr.border_width, 3796 -wattr.border_width, -wattr.border_width,
3630 &x, &y, &wdummy); 3797 &x, &y, &wdummy);
3631 tt_printf ("\033[3;%d;%dt", x, y); 3798 tt_printf ("\033[3;%d;%dt", x, y);
3632 break; 3799 break;
3633 case 14: /* report window size (pixels) */ 3800 case 14: /* report window size (pixels) */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3801 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3636 break; 3803 break;
3637 case 18: /* report text area size (chars) */ 3804 case 18: /* report text area size (chars) */
3638 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3805 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3639 break; 3806 break;
3641 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3808 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3642 break; 3809 break;
3643 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3644 { 3811 {
3645 char *s; 3812 char *s;
3646 XGetIconName (disp, parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3647 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3815 XFree (s);
3649 } 3816 }
3650 break; 3817 break;
3651 case 21: /* report window title */ 3818 case 21: /* report window title */
3652 { 3819 {
3653 char *s; 3820 char *s;
3654 XFetchName (disp, parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3655 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3656 XFree (s); 3823 XFree (s);
3657 } 3824 }
3658 break; 3825 break;
3659 } 3826 }
3660} 3827}
3687 seen_esc = true; 3854 seen_esc = true;
3688 continue; 3855 continue;
3689 } 3856 }
3690 else if (ch == C0_BEL || ch == CHAR_ST) 3857 else if (ch == C0_BEL || ch == CHAR_ST)
3691 break; 3858 break;
3859 else if (ch == C0_SYN)
3860 ch = cmd_get8 ();
3692 else if (ch < 0x20) 3861 else if (ch < 0x20)
3693 return NULL; /* other control character - exit */ 3862 return NULL; /* other control character - exit */
3694 3863
3695 seen_esc = false; 3864 seen_esc = false;
3696 3865
3697 if (n >= STRING_MAX - 1) 3866 if (n >= STRING_MAX - 1)
3698 // stop at some sane length 3867 // stop at some sane length
3699 return NULL; 3868 return NULL;
3700 3869
3701 if (ch == C0_SYN)
3702 string[n++] = cmd_get8 ();
3703 else
3704 string[n++] = ch; 3870 string[n++] = ch;
3705 } 3871 }
3706 3872
3707 string[n++] = '\0'; 3873 string[n++] = '\0';
3708 3874
3709 ends_how = (ch == 0x5c ? C0_ESC : ch); 3875 ends_how = (ch == 0x5c ? C0_ESC : ch);
3760void 3926void
3761rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3927rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3762{ 3928{
3763 if (str[0] == '?' && !str[1]) 3929 if (str[0] == '?' && !str[1])
3764 { 3930 {
3765 unsigned short r, g, b; 3931 rgba c;
3766 pix_colors_focused[color].get (display, r, g, b); 3932 pix_colors_focused[color].get (c);
3933
3934#if XFT
3935 if (c.a != rgba::MAX_CC)
3936 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3937 else
3938#endif
3767 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3939 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3768 } 3940 }
3769 else 3941 else
3770 set_window_color (color, str); 3942 set_window_color (color, str);
3771} 3943}
3772 3944
3778{ 3950{
3779 int color; 3951 int color;
3780 char *buf, *name; 3952 char *buf, *name;
3781 bool query = str[0] == '?' && !str[1]; 3953 bool query = str[0] == '?' && !str[1];
3782 int saveop = op; 3954 int saveop = op;
3783 dDisp; 3955
3956 dLocal (Display *, dpy);
3784 3957
3785 assert (str != NULL); 3958 assert (str != NULL);
3959
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return;
3962
3786 switch (op) 3963 switch (op)
3787 { 3964 {
3788 case XTerm_name: 3965 case XTerm_name:
3789 set_title (str); 3966 set_title (str);
3790 /* FALLTHROUGH */ 3967 /* FALLTHROUGH */
3804 unsigned long bytes_after; 3981 unsigned long bytes_after;
3805 unsigned char *value = 0; 3982 unsigned char *value = 0;
3806 const char *str = ""; 3983 const char *str = "";
3807 3984
3808 if (prop 3985 if (prop
3809 && XGetWindowProperty (disp, parent[0], 3986 && XGetWindowProperty (dpy, parent[0],
3810 prop, 0, 1<<16, 0, AnyPropertyType, 3987 prop, 0, 1<<16, 0, AnyPropertyType,
3811 &actual_type, &actual_format, 3988 &actual_type, &actual_format,
3812 &nitems, &bytes_after, &value) == Success 3989 &nitems, &bytes_after, &value) == Success
3813 && actual_type != None 3990 && actual_type != None
3814 && actual_format == 8) 3991 && actual_format == 8)
3815 str = (const char *)(value); 3992 str = (const char *)(value);
3816 3993
3817 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3994 tt_printf ("\033]%d;%s%c", op, str, resp);
3818 3995
3819 XFree (value); 3996 XFree (value);
3820 } 3997 }
3821 else 3998 else
3822 { 3999 {
3826 { 4003 {
3827 *eq = 0; 4004 *eq = 0;
3828 set_utf8_property (display->atom (str), eq + 1); 4005 set_utf8_property (display->atom (str), eq + 1);
3829 } 4006 }
3830 else 4007 else
3831 XDeleteProperty (disp, parent[0], 4008 XDeleteProperty (dpy, parent[0],
3832 display->atom (str)); 4009 display->atom (str));
3833 } 4010 }
3834 break; 4011 break;
3835 4012
3836 case XTerm_Color: 4013 case XTerm_Color:
3846 break; 4023 break;
3847 4024
3848 if ((buf = strchr (name, ';')) != NULL) 4025 if ((buf = strchr (name, ';')) != NULL)
3849 *buf++ = '\0'; 4026 *buf++ = '\0';
3850 4027
3851 if (name[0] == '?' && !name[1]) 4028 process_color_seq (op, color, name, resp);
3852 {
3853 unsigned short r, g, b;
3854 pix_colors_focused[color].get (display, r, g, b);
3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3856 }
3857 else
3858 set_window_color (color, name);
3859 } 4029 }
3860 break; 4030 break;
3861 case XTerm_Color00: 4031 case XTerm_Color00:
3862 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4032 process_color_seq (op, Color_fg, str, resp);
3863 break; 4033 break;
3864 case XTerm_Color01: 4034 case XTerm_Color01:
3865 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4035 process_color_seq (op, Color_bg, str, resp);
3866 break; 4036 break;
3867#ifndef NO_CURSORCOLOR 4037#ifndef NO_CURSORCOLOR
3868 case XTerm_Color_cursor: 4038 case XTerm_Color_cursor:
3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4039 process_color_seq (op, Color_cursor, str, resp);
3870 break; 4040 break;
3871#endif 4041#endif
3872 case XTerm_Color_pointer_fg: 4042 case XTerm_Color_pointer_fg:
3873 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4043 process_color_seq (op, Color_pointer_fg, str, resp);
3874 break; 4044 break;
3875 case XTerm_Color_pointer_bg: 4045 case XTerm_Color_pointer_bg:
3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4046 process_color_seq (op, Color_pointer_bg, str, resp);
3877 break; 4047 break;
3878#ifndef NO_BOLD_UNDERLINE_REVERSE 4048#ifndef NO_BOLD_UNDERLINE_REVERSE
3879 case XTerm_Color_RV: 4049 case XTerm_Color_RV:
3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4050 process_color_seq (op, Color_RV, str, resp);
3881 break; 4051 break;
3882 case Rxvt_Color_BD: 4052 case Rxvt_Color_BD:
3883 case URxvt_Color_BD: 4053 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp); 4054 process_color_seq (op, Color_BD, str, resp);
3885 break; 4055 break;
3886 case Rxvt_Color_UL: 4056 case Rxvt_Color_UL:
3887 case URxvt_Color_UL: 4057 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp); 4058 process_color_seq (op, Color_UL, str, resp);
3889 break; 4059 break;
3890 case URxvt_Color_IT: 4060 case URxvt_Color_IT:
3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4061 process_color_seq (op, Color_IT, str, resp);
3892 break; 4062 break;
3893#endif 4063#endif
3894#if TRANSPARENT && TINTING 4064#if TRANSPARENT && TINTING
3895 case URxvt_Color_tint: 4065 case URxvt_Color_tint:
3896 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4066 process_color_seq (op, Color_tint, str, resp);
4067
3897 check_our_parents (); 4068 check_our_parents ();
4069
3898 if (am_transparent) 4070 if (am_transparent)
3899 want_full_refresh = want_refresh = 1; 4071 want_full_refresh = want_refresh = 1;
4072
3900 break; 4073 break;
3901#endif 4074#endif
3902 4075
3903 case Rxvt_Pixmap: 4076 case Rxvt_Pixmap:
3904 { 4077 {
3926#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3927 resize_pixmap (); 4100 resize_pixmap ();
3928 scr_touch (true); 4101 scr_touch (true);
3929#endif 4102#endif
3930 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
3931 } 4109 }
3932 break; 4110 break;
3933 4111
3934 case Rxvt_restoreFG: 4112 case Rxvt_restoreFG:
3935 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
3962 case URxvt_italicFont: 4140 case URxvt_italicFont:
3963 case URxvt_boldItalicFont: 4141 case URxvt_boldItalicFont:
3964#endif 4142#endif
3965 if (query) 4143 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", saveop, 4144 tt_printf ("\33]%d;%-.250s%c", saveop,
3967 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3968 ? fontset[op - URxvt_font]->fontdesc : "", 4146 ? fontset[op - URxvt_font]->fontdesc : "",
3969 resp); 4147 resp);
3970 else 4148 else
3971 { 4149 {
3972 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
3975 allocated.push_back ((void *)res); 4153 allocated.push_back ((void *)res);
3976 set_fonts (); 4154 set_fonts ();
3977 } 4155 }
3978 break; 4156 break;
3979 4157
3980#if ENABLE_FRILLS 4158 case URxvt_version:
4159 if (query)
4160 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4161 op,
4162 rs[Rs_name], VERSION[0], VERSION[2],
4163 resp);
4164 break;
4165
4166#if !ENABLE_MINIMAL
3981 case URxvt_locale: 4167 case URxvt_locale:
3982 if (query) 4168 if (query)
3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3984 else 4170 else
3985 { 4171 {
3986 set_locale (str); 4172 set_locale (str);
3987 pty->set_utf8_mode (enc_utf8); 4173 pty->set_utf8_mode (enc_utf8);
3988 init_xlocale (); 4174 init_xlocale ();
4003 break; 4189 break;
4004#endif 4190#endif
4005 4191
4006#if ENABLE_PERL 4192#if ENABLE_PERL
4007 case URxvt_perl: 4193 case URxvt_perl:
4008 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4009 ; // no responses yet 4195 ; // no responses yet
4010 break; 4196 break;
4011#endif 4197#endif
4012 } 4198 }
4013} 4199}
4129 scr_touch (true); 4315 scr_touch (true);
4130 break; 4316 break;
4131#endif 4317#endif
4132 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4133 case 1049: 4319 case 1049:
4134 if (OPTION (Opt_secondaryScreen)) 4320 if (option (Opt_secondaryScreen))
4135 if (mode == 0) 4321 if (mode == 0)
4136 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
4137 else if (mode == 1) 4323 else if (mode == 1)
4138 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
4139 break; 4325 break;
4204 break; 4390 break;
4205 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
4206 set_option (Opt_scrollTtyKeypress, state); 4392 set_option (Opt_scrollTtyKeypress, state);
4207 break; 4393 break;
4208 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
4209 if (OPTION (Opt_secondaryScreen)) 4395 if (option (Opt_secondaryScreen))
4210 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
4211 scr_erase_screen (2); 4397 scr_erase_screen (2);
4212 scr_change_screen (state); 4398 scr_change_screen (state);
4213 break; 4399 break;
4214 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
4215 scr_change_screen (state); 4401 scr_change_screen (state);
4216 if (OPTION (Opt_secondaryScreen)) 4402 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
4218 scr_erase_screen (2); 4404 scr_erase_screen (2);
4219 break; 4405 break;
4220 default: 4406 default:
4221 break; 4407 break;
4349 scr_color (Color_bg, Color_bg); 4535 scr_color (Color_bg, Color_bg);
4350 break; 4536 break;
4351 4537
4352 //case 50: // not variable spacing 4538 //case 50: // not variable spacing
4353 4539
4354#if ENABLE_FRILLS 4540#if !ENABLE_MINIMAL
4355 case 90: 4541 case 90:
4356 case 91: /* set bright fg color */ 4542 case 91: /* set bright fg color */
4357 case 92: 4543 case 92:
4358 case 93: 4544 case 93:
4359 case 94: 4545 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines