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.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.309 by root, Mon Feb 20 22:42:00 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306 int valid_keysym; 309 int valid_keysym;
307 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
308 316
309 /* 317 /*
310 * 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
311 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
312 * 320 *
… …
903 tt_write (&ch, 1); 911 tt_write (&ch, 1);
904 } 912 }
905 913
906 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
907} 915}
908/*}}} */ 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}
909 993
910#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
911unsigned int 995unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 997{
… …
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 } 1175 }
1092} 1176}
1093#endif 1177#endif
1094 1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
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
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1095bool 1204bool
1096rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1097{ 1206{
1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099 1208
… …
1114 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1115 return true; 1224 return true;
1116 } 1225 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1227 {
1119#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1120 if (display->is_local) 1229 if (display->is_local)
1121 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1122#endif 1231#endif
1123 } 1232 }
1124 else 1233 else
1125 { 1234 {
1126 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1148} 1257}
1149 1258
1150void 1259void
1151rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1152{ 1261{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1263 recolour_cursor ();
1155 1264
1156#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1266 hidden_pointer = 0;
1158 1267
… …
1166rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1167{ 1276{
1168 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1169 return; 1278 return;
1170 1279
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1281 XFlush (dpy);
1173 1282
1174 hidden_pointer = 1; 1283 hidden_pointer = 1;
1175} 1284}
1176 1285
1177void 1286void
… …
1256void 1365void
1257rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1258{ 1367{
1259 make_current (); 1368 make_current ();
1260 1369
1261 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1262 1371
1263 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1375 return;
… …
1271 unsigned int unused_mask; 1380 unsigned int unused_mask;
1272 1381
1273 switch (ev.type) 1382 switch (ev.type)
1274 { 1383 {
1275 case KeyPress: 1384 case KeyPress:
1276#if ISO_14755 1385 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1386 break;
1282 1387
1283 case KeyRelease: 1388 case KeyRelease:
1284 { 1389 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1390 break;
1356 }
1357 1391
1358 case ButtonPress: 1392 case ButtonPress:
1359 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1360 break; 1394 break;
1361 1395
… …
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1377 destroy (); 1411 destroy ();
1378 } 1412 }
1379#if ENABLE_EWMH 1413#if ENABLE_EWMH
1380 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])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1417 &ev);
1384#endif 1418#endif
1385 } 1419 }
1386 } 1420 }
… …
1434 break; 1468 break;
1435 1469
1436 case ConfigureNotify: 1470 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1438 { 1472 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1474 ;
1441 1475
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1477 {
1444 seen_resize = 1; 1478 seen_resize = 1;
… …
1502 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1503 { 1537 {
1504 do 1538 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1542
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1544
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1514 1548
1515 want_refresh = 1; 1549 want_refresh = 1;
1516 } 1550 }
1517 else 1551 else
1518 { 1552 {
1519 XEvent unused_event; 1553 XEvent unused_event;
1520 1554
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1556 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1558 ;
1525 1559
1526 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1527 { 1561 {
1528 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1529 scrollbar_show (0); 1563 scrollbar_show (0);
1530 } 1564 }
1531 1565
1532#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1535#endif 1569#endif
1536 } 1570 }
1537 break; 1571 break;
1538 1572
1539 case MotionNotify: 1573 case MotionNotify:
… …
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1585 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1587 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1589 ;
1556 1590
1557 XQueryPointer (xdisp, vt, 1591 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1595 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1626#endif 1660#endif
1627 } 1661 }
1628 } 1662 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1664 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1633 ; 1667 ;
1634 1668
1635 XQueryPointer (xdisp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1673 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1644 scrollbar_show (1); 1678 scrollbar_show (1);
1645 } 1679 }
1646 break; 1680 break;
1647 } 1681 }
1648 1682
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1685 {
1654 if (hidden_cursor) 1686 if (hidden_cursor)
1655 { 1687 {
… …
1682 if (!focus) 1714 if (!focus)
1683 { 1715 {
1684 focus = 1; 1716 focus = 1;
1685 want_refresh = 1; 1717 want_refresh = 1;
1686 1718
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1720
1689#if USE_XIM 1721#if USE_XIM
1690 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1691 { 1723 {
1692 IMSetStatusPosition (); 1724 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1694 } 1726 }
1695#endif 1727#endif
1696#if CURSOR_BLINK 1728#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
… …
2401 pchanged = 0; 2433 pchanged = 0;
2402 2434
2403 if (!OPTION (Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2405 2437
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2408 2440
2409 XGetWindowAttributes (xdisp, parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2410 2442
2411 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2412 { 2444 {
2413 if (am_transparent) 2445 if (am_transparent)
2414 { 2446 {
2415 pchanged = 1; 2447 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2418 } 2450 }
2419 2451
2420 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2421 } 2453 }
2422 2454
2423 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False); 2456 XSync (dpy, False);
2425 2457
2426 /* 2458 /*
2427 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2430 */ 2462 */
2431 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2435 2467
2436 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2441 2473
2442 if (!i || prop == NULL 2474 if (!i || prop == NULL
2443#if TINTING 2475#if TINTING
… …
2462 Window cr; 2494 Window cr;
2463 XImage *image; 2495 XImage *image;
2464 GC gc; 2496 GC gc;
2465 XGCValues gcvalue; 2497 XGCValues gcvalue;
2466 2498
2467 XTranslateCoordinates (xdisp, parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2471 nx = ny = 0; 2503 nx = ny = 0;
2472 2504
… …
2485 } 2517 }
2486 2518
2487 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489 2521
2490 XSync (xdisp, False); 2522 XSync (dpy, False);
2491 allowedxerror = -1; 2523 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493 2525
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2496 allowedxerror = 0; 2528 allowedxerror = 0;
2497 2529
… …
2500 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2501 { 2533 {
2502 pchanged = 1; 2534 pchanged = 1;
2503 if (pixmap != None) 2535 if (pixmap != None)
2504 { 2536 {
2505 XFreePixmap (xdisp, pixmap); 2537 XFreePixmap (dpy, pixmap);
2506 pixmap = None; 2538 pixmap = None;
2507 } 2539 }
2508 } 2540 }
2509 2541
2510 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2511 } 2543 }
2512 else 2544 else
2513 { 2545 {
2514 if (pixmap != None) 2546 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap); 2547 XFreePixmap (dpy, pixmap);
2516 2548
2517#if TINTING 2549#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2519 { 2551 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2524 2556
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 } 2558 }
2527#endif 2559#endif
2528 2560
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc); 2565 XFreeGC (dpy, gc);
2534 XDestroyImage (image); 2566 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]); 2568 XClearWindow (dpy, parent[0]);
2537 2569
2538 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1; 2571 pchanged = 1;
2540 2572
2541 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2542 } 2574 }
2543 } 2575 }
2544 2576
2545 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547 else 2579 else
2548 { 2580 {
2549 unsigned int n; 2581 unsigned int n;
2550 /* 2582 /*
2551 * InheritPixmap transparency 2583 * InheritPixmap transparency
2552 */ 2584 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 { 2586 {
2555 oldp = parent[i]; 2587 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list); 2589 XFree (list);
2558 2590
2559 if (parent[i] == display->root) 2591 if (parent[i] == display->root)
2560 { 2592 {
2561 if (oldp != None) 2593 if (oldp != None)
… …
2571 n = 0; 2603 n = 0;
2572 2604
2573 if (pchanged) 2605 if (pchanged)
2574 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2575 { 2607 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2577 2609
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 { 2611 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break; 2613 break;
2582 } 2614 }
2583 } 2615 }
2584 2616
2585 if (n > (sizeof (parent) / sizeof (parent[0]))) 2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 { 2618 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0; 2621 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2591 } 2623 }
2592 else 2624 else
2593 { 2625 {
2594 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2595 { 2627 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]); 2629 XClearWindow (dpy, parent[n]);
2598 } 2630 }
2599 2631
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2601 am_transparent = 1; 2633 am_transparent = 1;
2602 } 2634 }
2603 2635
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None; 2637 parent[i] = None;
2606 } 2638 }
2607 2639
2608 if (scrollBar.win) 2640 if (scrollBar.win)
2609 { 2641 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2612 scrollbar_show (0); 2644 scrollbar_show (0);
2613 } 2645 }
2614 2646
2615 if (am_transparent) 2647 if (am_transparent)
… …
3506{ 3538{
3507 int x, y; 3539 int x, y;
3508 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
3509 Window wdummy; 3541 Window wdummy;
3510 3542
3511 dLocal (Display *, xdisp); 3543 dLocal (Display *, dpy);
3512 3544
3513 if (nargs == 0) 3545 if (nargs == 0)
3514 return; 3546 return;
3515 3547
3516 switch (args[0]) 3548 switch (args[0])
3517 { 3549 {
3518 /* 3550 /*
3519 * commands 3551 * commands
3520 */ 3552 */
3521 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3554 XMapWindow (dpy, parent[0]);
3523 break; 3555 break;
3524 case 2: /* iconify window */ 3556 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3557 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3558 break;
3527 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3561 break;
3530 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3564 break;
3533 case 5: /* raise window */ 3565 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
3535 break; 3567 break;
3536 case 6: /* lower window */ 3568 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3569 XLowerWindow (dpy, parent[0]);
3538 break; 3570 break;
3539 case 7: /* refresh window */ 3571 case 7: /* refresh window */
3540 scr_touch (true); 3572 scr_touch (true);
3541 break; 3573 break;
3542 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
… …
3553 3585
3554 /* 3586 /*
3555 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
3556 */ 3588 */
3557 case 11: /* report window state */ 3589 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3592 break;
3561 case 13: /* report window position */ 3593 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3599 break;
3568 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3603 break;
3572 case 18: /* report text area size (chars) */ 3604 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3606 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3609 break;
3578 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3579 { 3611 {
3580 char *s; 3612 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3615 XFree (s);
3584 } 3616 }
3585 break; 3617 break;
3586 case 21: /* report window title */ 3618 case 21: /* report window title */
3587 { 3619 {
3588 char *s; 3620 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s); 3623 XFree (s);
3592 } 3624 }
3593 break; 3625 break;
3594 } 3626 }
… …
3720 int color; 3752 int color;
3721 char *buf, *name; 3753 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3755 int saveop = op;
3724 3756
3725 dLocal (Display *, xdisp); 3757 dLocal (Display *, dpy);
3726 3758
3727 assert (str != NULL); 3759 assert (str != NULL);
3728 switch (op) 3760 switch (op)
3729 { 3761 {
3730 case XTerm_name: 3762 case XTerm_name:
… …
3746 unsigned long bytes_after; 3778 unsigned long bytes_after;
3747 unsigned char *value = 0; 3779 unsigned char *value = 0;
3748 const char *str = ""; 3780 const char *str = "";
3749 3781
3750 if (prop 3782 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3783 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3787 && actual_type != None
3756 && actual_format == 8) 3788 && actual_format == 8)
… …
3768 { 3800 {
3769 *eq = 0; 3801 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3771 } 3803 }
3772 else 3804 else
3773 XDeleteProperty (xdisp, parent[0], 3805 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3806 display->atom (str));
3775 } 3807 }
3776 break; 3808 break;
3777 3809
3778 case XTerm_Color: 3810 case XTerm_Color:

Diff Legend

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