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.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.198 by root, Sat Feb 19 01:07:58 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
52 52
53#ifdef KEYSYM_RESOURCE 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 54# include "keyboard.h"
55#endif 55#endif
56 56
57#include <cwchar>
58#include <csignal> 57#include <csignal>
59 58
60/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
61 60
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 119 XK_Print, 0x2399,
121 120
122 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
124 0, 131 0,
125}; 132};
126 133
127void 134void
128rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
279 * 286 *
280 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
281 */ 288 */
282 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
285 292
286 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
287 { 294 {
288 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
513 else 520 else
514 strcpy (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
515 break; 522 break;
516#endif 523#endif
517#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
518 case XK_Delete: 535 case XK_Delete:
519 strcpy (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
520 break; 537 break;
521#endif 538#endif
522 case XK_Tab: 539 case XK_Tab:
… …
625#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
626 case XK_KP_Begin: 643 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
628 break; 645 break;
629 646
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 647#endif
638 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
… …
673 break; 683 break;
674 684
675 case XK_Find: 685 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
677 break; 687 break;
688
689#ifdef XK_KP_End
690 case XK_KP_Insert:
691 /* allow shift to override */
692 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
693 {
694 strcpy (kbuf, "\033Op");
695 break;
696 }
697 /* FALLTHROUGH */
698#endif
678 case XK_Insert: 699 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
680 break; 701 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 703 case DXK_Remove:
… …
1182 1203
1183/*{{{ process an X event */ 1204/*{{{ process an X event */
1184void 1205void
1185rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
1186{ 1207{
1208 dDisp;
1209
1187 SET_R (this); 1210 SET_R (this);
1188 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
1189 1212
1190#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1307 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1308 break; 1331 break;
1309 1332
1310 case ClientMessage: 1333 case ClientMessage:
1311 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1314#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1320 { 1354 {
1321 /* Get Dnd data */ 1355 /* Get Dnd data */
1322 Atom ActualType; 1356 Atom ActualType;
1323 int ActualFormat; 1357 int ActualFormat;
1324 unsigned char *data; 1358 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1326 1360
1327 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1363 0L, 1000000L,
1330 False, AnyPropertyType, 1364 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1333 &data); 1367 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1368 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1369 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1372 }
1339#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1340 break; 1374 break;
1341 1375
1342 case MappingNotify: 1376 case MappingNotify:
… …
1367 break; 1401 break;
1368 } 1402 }
1369 break; 1403 break;
1370 1404
1371 case FocusIn: 1405 case FocusIn:
1372 if (!TermWin.focus) 1406 focus_in ();
1373 {
1374 TermWin.focus = 1;
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394
1395 }
1396 break; 1407 break;
1397 1408
1398 case FocusOut: 1409 case FocusOut:
1399 if (TermWin.focus) 1410 focus_out ();
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break; 1411 break;
1428 1412
1429 case ConfigureNotify: 1413 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1431 { 1415 {
… …
1435 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 } 1423 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1441 1425
1442 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1443 { 1427 {
1444 seen_resize = 1; 1428 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
… …
1497 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1498 { 1482 {
1499 do 1483 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1503 1487
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1489
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1509 1493
1510 scr_refresh (refresh_type); 1494 scr_refresh (refresh_type);
1511 } 1495 }
1512 else 1496 else
1513 { 1497 {
1514 XEvent unused_event; 1498 XEvent unused_event;
1515 1499
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1501 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1503 ;
1520 1504
1521 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1522 { 1506 {
1523 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
… …
1528 menubar_expose (); 1512 menubar_expose ();
1529#endif 1513#endif
1530 1514
1531#ifdef TRANSPARENT 1515#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1517 XClearWindow (disp, ev.xany.window);
1534#endif 1518#endif
1535 } 1519 }
1536 break; 1520 break;
1537 1521
1538 case MotionNotify: 1522 case MotionNotify:
… …
1552 1536
1553 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1554 { 1538 {
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1540 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1558 ; 1542 ;
1559 1543
1560 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1561 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1547 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1548 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
… …
1629#endif 1613#endif
1630 } 1614 }
1631 } 1615 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1617 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1619 MotionNotify, &ev))
1636 ; 1620 ;
1637 1621
1638 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1625 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1626 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1645 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1646 refresh_limit = 0; 1630 refresh_limit = 0;
1647 scrollbar_show (1); 1631 scrollbar_show (1);
1648 } 1632 }
1649 break; 1633 break;
1634 }
1635}
1636
1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1650 } 1695 }
1651} 1696}
1652 1697
1653#if TRANSPARENT 1698#if TRANSPARENT
1654void 1699void
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2129 int i;
2085 2130
2086 Visual* visual = display->visual; 2131 Visual *visual = display->visual;
2087 2132
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2134
2090 /* for convenience */ 2135 /* for convenience */
2091 mask_r = visual->red_mask; 2136 mask_r = visual->red_mask;
… …
2312 Atom atype; 2357 Atom atype;
2313 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2359 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2317 2363
2318 pchanged = 0; 2364 pchanged = 0;
2319 2365
2320 if (!(options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
2322 2368
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
2325 2371
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2327 2373
2328 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
2329 { 2375 {
2330 if (am_transparent) 2376 if (am_transparent)
2331 { 2377 {
2332 pchanged = 1; 2378 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
2335 } 2381 }
2336 2382
2337 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
2338 } 2384 }
2339 2385
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2387 XSync (disp, False);
2342 2388
2343 /* 2389 /*
2344 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
2347 */ 2393 */
2348 i = (xa[XA_XROOTPMAP_ID] 2394 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2397 &nitems, &bytes_after, &prop) == Success);
2352 2398
2353 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2400 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2358 2404
2359 if (!i || prop == NULL 2405 if (!i || prop == NULL
2360#if TINTING 2406#if TINTING
… …
2379 Window cr; 2425 Window cr;
2380 XImage *image; 2426 XImage *image;
2381 GC gc; 2427 GC gc;
2382 XGCValues gcvalue; 2428 XGCValues gcvalue;
2383 2429
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2434 nx = ny = 0;
2389 2435
… …
2402 } 2448 }
2403 2449
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406 2452
2407 XSync (display->display, False); 2453 XSync (disp, False);
2408 allowedxerror = -1; 2454 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2456
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2459 allowedxerror = 0;
2414 2460
… …
2417 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
2418 { 2464 {
2419 pchanged = 1; 2465 pchanged = 1;
2420 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
2421 { 2467 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
2423 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
2424 } 2470 }
2425 } 2471 }
2426 2472
2427 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
2428 } 2474 }
2429 else 2475 else
2430 { 2476 {
2431 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2433 2479
2434#if TINTING 2480#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2481 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2482 {
2437 unsigned short rm, gm, bm; 2483 unsigned short rm, gm, bm;
… …
2441 2487
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2488 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2489 }
2444#endif 2490#endif
2445 2491
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2447 szHint.width, szHint.height, image->depth); 2493 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2496 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2498 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2500 XClearWindow (disp, TermWin.parent[0]);
2455 2501
2456 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2503 pchanged = 1;
2458 2504
2459 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
2460 } 2506 }
2461 } 2507 }
2462 2508
2463 if (am_pixmap_trans) 2509 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2465 else 2511 else
2466 { 2512 {
2467 unsigned int n; 2513 unsigned int n;
2468 /* 2514 /*
2469 * InheritPixmap transparency 2515 * InheritPixmap transparency
2470 */ 2516 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2472 { 2518 {
2473 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
2476 XFree (list); 2522 XFree (list);
2477 2523
2478 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
2479 { 2525 {
… …
2491 2537
2492 if (pchanged) 2538 if (pchanged)
2493 { 2539 {
2494 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
2495 { 2541 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2544 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2500 break; 2546 break;
2501 } 2547 }
2502 } 2548 }
2503 } 2549 }
2504 2550
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2506 { 2552 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2555 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
2511 } 2557 }
2512 else 2558 else
2513 { 2559 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2562 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2563 sleep (1);
2518#endif 2564#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2520 { 2566 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2568 XClearWindow (disp, TermWin.parent[n]);
2523 } 2569 }
2524 2570
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2526 am_transparent = 1; 2572 am_transparent = 1;
2527 } 2573 }
2528 2574
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
2531 } 2577 }
2532 2578
2533 if (scrollBar.win) 2579 if (scrollBar.win)
2534 { 2580 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2582 scrollBar.setIdle ();
2537 scrollbar_show (0); 2583 scrollbar_show (0);
2538 } 2584 }
2539 2585
2540 if (am_transparent) 2586 if (am_transparent)
… …
2578 // some window managers resize the window early, and these programs 2624 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2625 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2626 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2627 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2628 // resized.
2583 if (seen_resize) 2629 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2630 kill (-cmd_pid, SIGWINCH);
2585 } 2631 }
2586 2632
2587 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
… …
3174 { 3220 {
3175 switch (priv) 3221 switch (priv)
3176 { 3222 {
3177 case '>': 3223 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3226 break;
3181 case '?': 3227 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3230 break;
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3460{
3415 int x, y; 3461 int x, y;
3416 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
3417 Window wdummy; 3463 Window wdummy;
3464 dDisp;
3418 3465
3419 if (nargs == 0) 3466 if (nargs == 0)
3420 return; 3467 return;
3421 3468
3422 switch (args[0]) 3469 switch (args[0])
3423 { 3470 {
3424 /* 3471 /*
3425 * commands 3472 * commands
3426 */ 3473 */
3427 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
3429 break; 3476 break;
3430 case 2: /* iconify window */ 3477 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3479 break;
3434 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3436 break; 3482 break;
3437 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3485 break;
3440 case 5: /* raise window */ 3486 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
3442 break; 3488 break;
3443 case 6: /* lower window */ 3489 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
3445 break; 3491 break;
3446 case 7: /* refresh window */ 3492 case 7: /* refresh window */
3447 scr_touch (true); 3493 scr_touch (true);
3448 break; 3494 break;
3449 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
3461 3507
3462 /* 3508 /*
3463 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
3464 */ 3510 */
3465 case 11: /* report window state */ 3511 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3514 break;
3469 case 13: /* report window position */ 3515 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3521 break;
3476 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3525 break;
3480 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3482 break; 3528 break;
… …
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3485 break; 3531 break;
3486 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3487 { 3533 {
3488 char *s; 3534 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3537 XFree (s);
3492 } 3538 }
3493 break; 3539 break;
3494 case 21: /* report window title */ 3540 case 21: /* report window title */
3495 { 3541 {
3496 char *s; 3542 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3545 XFree (s);
3500 } 3546 }
3501 break; 3547 break;
3502 } 3548 }
… …
3644 int changed = 0; 3690 int changed = 0;
3645 int color; 3691 int color;
3646 char *buf, *name; 3692 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3693 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3694 int saveop = op;
3695 dDisp;
3649 3696
3650 assert (str != NULL); 3697 assert (str != NULL);
3651 switch (op) 3698 switch (op)
3652 { 3699 {
3653 case XTerm_name: 3700 case XTerm_name:
… …
3669 unsigned long bytes_after; 3716 unsigned long bytes_after;
3670 unsigned char *value = 0; 3717 unsigned char *value = 0;
3671 const char *str = ""; 3718 const char *str = "";
3672 3719
3673 if (prop 3720 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3721 && XGetWindowProperty (disp, TermWin.parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3722 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3723 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3724 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3725 && actual_type != None
3679 && actual_format == 8) 3726 && actual_format == 8)
… …
3691 { 3738 {
3692 *eq = 0; 3739 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3740 set_utf8_property (display->atom (str), eq + 1);
3694 } 3741 }
3695 else 3742 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3743 XDeleteProperty (disp, TermWin.parent[0],
3697 display->atom (str)); 3744 display->atom (str));
3698 } 3745 }
3699 break; 3746 break;
3700 3747
3701 case XTerm_Color: 3748 case XTerm_Color:

Diff Legend

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