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.197 by root, Thu Feb 17 15:07:48 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)
… …
1322 Atom ActualType; 1345 Atom ActualType;
1323 int ActualFormat; 1346 int ActualFormat;
1324 unsigned char *data; 1347 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1326 1349
1327 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1352 0L, 1000000L,
1330 False, AnyPropertyType, 1353 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1333 &data); 1356 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1357 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1358 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1361 }
1339#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1340 break; 1363 break;
1341 1364
1342 case MappingNotify: 1365 case MappingNotify:
… …
1435 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 } 1462 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1441 1464
1442 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1443 { 1466 {
1444 seen_resize = 1; 1467 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
… …
1497 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1498 { 1521 {
1499 do 1522 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1503 1526
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1528
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1509 1532
1510 scr_refresh (refresh_type); 1533 scr_refresh (refresh_type);
1511 } 1534 }
1512 else 1535 else
1513 { 1536 {
1514 XEvent unused_event; 1537 XEvent unused_event;
1515 1538
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1540 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1542 ;
1520 1543
1521 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1522 { 1545 {
1523 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1528 menubar_expose (); 1551 menubar_expose ();
1529#endif 1552#endif
1530 1553
1531#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1556 XClearWindow (disp, ev.xany.window);
1534#endif 1557#endif
1535 } 1558 }
1536 break; 1559 break;
1537 1560
1538 case MotionNotify: 1561 case MotionNotify:
… …
1552 1575
1553 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1554 { 1577 {
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1579 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1558 ; 1581 ;
1559 1582
1560 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1561 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1586 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1587 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
… …
1629#endif 1652#endif
1630 } 1653 }
1631 } 1654 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1656 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1636 ; 1659 ;
1637 1660
1638 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1664 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1665 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2107 int i;
2085 2108
2086 Visual* visual = display->visual; 2109 Visual *visual = display->visual;
2087 2110
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2112
2090 /* for convenience */ 2113 /* for convenience */
2091 mask_r = visual->red_mask; 2114 mask_r = visual->red_mask;
… …
2312 Atom atype; 2335 Atom atype;
2313 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2337 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2317 2341
2318 pchanged = 0; 2342 pchanged = 0;
2319 2343
2320 if (!(options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2322 2346
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
2325 2349
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2327 2351
2328 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
2329 { 2353 {
2330 if (am_transparent) 2354 if (am_transparent)
2331 { 2355 {
2332 pchanged = 1; 2356 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
2335 } 2359 }
2336 2360
2337 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
2338 } 2362 }
2339 2363
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2365 XSync (disp, False);
2342 2366
2343 /* 2367 /*
2344 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
2347 */ 2371 */
2348 i = (xa[XA_XROOTPMAP_ID] 2372 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
2352 2376
2353 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
2358 2382
2359 if (!i || prop == NULL 2383 if (!i || prop == NULL
2360#if TINTING 2384#if TINTING
… …
2379 Window cr; 2403 Window cr;
2380 XImage *image; 2404 XImage *image;
2381 GC gc; 2405 GC gc;
2382 XGCValues gcvalue; 2406 XGCValues gcvalue;
2383 2407
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2412 nx = ny = 0;
2389 2413
… …
2402 } 2426 }
2403 2427
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406 2430
2407 XSync (display->display, False); 2431 XSync (disp, False);
2408 allowedxerror = -1; 2432 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2434
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2437 allowedxerror = 0;
2414 2438
… …
2417 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2418 { 2442 {
2419 pchanged = 1; 2443 pchanged = 1;
2420 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2421 { 2445 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2423 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2424 } 2448 }
2425 } 2449 }
2426 2450
2427 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2428 } 2452 }
2429 else 2453 else
2430 { 2454 {
2431 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2433 2457
2434#if TINTING 2458#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2460 {
2437 unsigned short rm, gm, bm; 2461 unsigned short rm, gm, bm;
… …
2441 2465
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2467 }
2444#endif 2468#endif
2445 2469
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2447 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2476 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2478 XClearWindow (disp, TermWin.parent[0]);
2455 2479
2456 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2481 pchanged = 1;
2458 2482
2459 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2460 } 2484 }
2461 } 2485 }
2462 2486
2463 if (am_pixmap_trans) 2487 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2465 else 2489 else
2466 { 2490 {
2467 unsigned int n; 2491 unsigned int n;
2468 /* 2492 /*
2469 * InheritPixmap transparency 2493 * InheritPixmap transparency
2470 */ 2494 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2472 { 2496 {
2473 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2476 XFree (list); 2500 XFree (list);
2477 2501
2478 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2479 { 2503 {
… …
2491 2515
2492 if (pchanged) 2516 if (pchanged)
2493 { 2517 {
2494 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2495 { 2519 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2522 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2500 break; 2524 break;
2501 } 2525 }
2502 } 2526 }
2503 } 2527 }
2504 2528
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2506 { 2530 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2533 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2511 } 2535 }
2512 else 2536 else
2513 { 2537 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2541 sleep (1);
2518#endif 2542#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2520 { 2544 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2546 XClearWindow (disp, TermWin.parent[n]);
2523 } 2547 }
2524 2548
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2526 am_transparent = 1; 2550 am_transparent = 1;
2527 } 2551 }
2528 2552
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2531 } 2555 }
2532 2556
2533 if (scrollBar.win) 2557 if (scrollBar.win)
2534 { 2558 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2560 scrollBar.setIdle ();
2537 scrollbar_show (0); 2561 scrollbar_show (0);
2538 } 2562 }
2539 2563
2540 if (am_transparent) 2564 if (am_transparent)
… …
2578 // some window managers resize the window early, and these programs 2602 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2603 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2604 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2605 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2606 // resized.
2583 if (seen_resize) 2607 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2608 kill (-cmd_pid, SIGWINCH);
2585 } 2609 }
2586 2610
2587 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
… …
3174 { 3198 {
3175 switch (priv) 3199 switch (priv)
3176 { 3200 {
3177 case '>': 3201 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3204 break;
3181 case '?': 3205 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3208 break;
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3438{
3415 int x, y; 3439 int x, y;
3416 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3417 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3418 3443
3419 if (nargs == 0) 3444 if (nargs == 0)
3420 return; 3445 return;
3421 3446
3422 switch (args[0]) 3447 switch (args[0])
3423 { 3448 {
3424 /* 3449 /*
3425 * commands 3450 * commands
3426 */ 3451 */
3427 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3429 break; 3454 break;
3430 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3457 break;
3434 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3436 break; 3460 break;
3437 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3463 break;
3440 case 5: /* raise window */ 3464 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3442 break; 3466 break;
3443 case 6: /* lower window */ 3467 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3445 break; 3469 break;
3446 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3447 scr_touch (true); 3471 scr_touch (true);
3448 break; 3472 break;
3449 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3461 3485
3462 /* 3486 /*
3463 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3464 */ 3488 */
3465 case 11: /* report window state */ 3489 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3492 break;
3469 case 13: /* report window position */ 3493 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3499 break;
3476 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3503 break;
3480 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3482 break; 3506 break;
… …
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3485 break; 3509 break;
3486 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3487 { 3511 {
3488 char *s; 3512 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3515 XFree (s);
3492 } 3516 }
3493 break; 3517 break;
3494 case 21: /* report window title */ 3518 case 21: /* report window title */
3495 { 3519 {
3496 char *s; 3520 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3523 XFree (s);
3500 } 3524 }
3501 break; 3525 break;
3502 } 3526 }
… …
3644 int changed = 0; 3668 int changed = 0;
3645 int color; 3669 int color;
3646 char *buf, *name; 3670 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3672 int saveop = op;
3673 dDisp;
3649 3674
3650 assert (str != NULL); 3675 assert (str != NULL);
3651 switch (op) 3676 switch (op)
3652 { 3677 {
3653 case XTerm_name: 3678 case XTerm_name:
… …
3669 unsigned long bytes_after; 3694 unsigned long bytes_after;
3670 unsigned char *value = 0; 3695 unsigned char *value = 0;
3671 const char *str = ""; 3696 const char *str = "";
3672 3697
3673 if (prop 3698 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3703 && actual_type != None
3679 && actual_format == 8) 3704 && actual_format == 8)
… …
3691 { 3716 {
3692 *eq = 0; 3717 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3718 set_utf8_property (display->atom (str), eq + 1);
3694 } 3719 }
3695 else 3720 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3697 display->atom (str)); 3722 display->atom (str));
3698 } 3723 }
3699 break; 3724 break;
3700 3725
3701 case XTerm_Color: 3726 case XTerm_Color:

Diff Legend

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