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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
53#include <cwchar> 57#include <cwchar>
54#include <csignal> 58#include <csignal>
55 59
56/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
57 61
… …
344 valid_keysym = keysym != NoSymbol; 348 valid_keysym = keysym != NoSymbol;
345 } 349 }
346 350
347 if (valid_keysym) 351 if (valid_keysym)
348 { 352 {
353#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state))
355 return;
356#endif
357
349 if (TermWin.saveLines) 358 if (TermWin.saveLines)
350 { 359 {
351#ifdef UNSHIFTED_SCROLLKEYS 360#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 361 if (!ctrl && !meta)
353#else 362#else
… …
487 } 496 }
488#endif 497#endif
489 498
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 499 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 500 {
492#ifdef KEYSYM_RESOURCE
493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 501 {
518 newlen = 1; 502 newlen = 1;
519 switch (keysym) 503 switch (keysym)
520 { 504 {
521#ifndef NO_BACKSPACE_KEY 505#ifndef NO_BACKSPACE_KEY
… …
785 case XK_F35: /* "\033[49~" */ 769 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 770 FKEY (31, XK_F17);
787 break; 771 break;
788#undef FKEY 772#undef FKEY
789 default: 773 default:
790 if (len == 0 774 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 775 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 776 }
796 777
797 if (newlen) 778 if (newlen)
798 len = strlen (kbuf); 779 len = strlen (kbuf);
799 } 780 }
… …
814 } 795 }
815 else if (keysym == XK_ISO_Left_Tab) 796 else if (keysym == XK_ISO_Left_Tab)
816 { 797 {
817 strcpy (kbuf, "\033[Z"); 798 strcpy (kbuf, "\033[Z");
818 len = 3; 799 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 } 800 }
827 else 801 else
828 { 802 {
829#ifdef META8_OPTION 803#ifdef META8_OPTION
830 /* set 8-bit on */ 804 /* set 8-bit on */
… …
889#endif /* DEBUG_CMD */ 863#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 864 tt_write (kbuf, (unsigned int)len);
891} 865}
892/*}}} */ 866/*}}} */
893 867
894#if (MENUBAR_MAX) 868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */ 870/* attempt to `write' count to the input buffer */
897unsigned int 871unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 872rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899{ 873{
… …
922 896
923 cmd_parse (); 897 cmd_parse ();
924 898
925 return 0; 899 return 0;
926} 900}
927#endif /* MENUBAR_MAX */ 901#endif
928 902
929void 903void
930rxvt_term::flush () 904rxvt_term::flush ()
931{ 905{
932 flush_ev.stop (); 906 flush_ev.stop ();
… …
1033{ 1007{
1034 if (mouse_slip_wheel_speed == 0 1008 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1010 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1011 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0;
1015
1038 refresh_type |= SMOOTH_REFRESH; 1016 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1; 1017 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1019 }
1042} 1020}
… …
1105rxvt_term::pointer_blank () 1083rxvt_term::pointer_blank ()
1106{ 1084{
1107 if (! (options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
1108 return; 1086 return;
1109 1087
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1111 XFlush (display->display); 1089 XFlush (display->display);
1112 1090
1113 hidden_pointer = 1; 1091 hidden_pointer = 1;
1114} 1092}
1115 1093
… …
1204 1182
1205/*{{{ process an X event */ 1183/*{{{ process an X event */
1206void 1184void
1207rxvt_term::x_cb (XEvent &ev) 1185rxvt_term::x_cb (XEvent &ev)
1208{ 1186{
1187 dDisp;
1188
1209 SET_R (this); 1189 SET_R (this);
1210 SET_LOCALE (locale); 1190 SET_LOCALE (locale);
1211 1191
1212#if defined(CURSOR_BLINK) 1192#if defined(CURSOR_BLINK)
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1344 Atom ActualType; 1324 Atom ActualType;
1345 int ActualFormat; 1325 int ActualFormat;
1346 unsigned char *data; 1326 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1327 unsigned long Size, RemainingBytes;
1348 1328
1349 XGetWindowProperty (display->display, display->root, 1329 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1330 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1331 0L, 1000000L,
1352 False, AnyPropertyType, 1332 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1333 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1334 &Size, &RemainingBytes,
1355 &data); 1335 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1336 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1337 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1338 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1340 }
1361#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1362 break; 1342 break;
1363 1343
1364 case MappingNotify: 1344 case MappingNotify:
… …
1457 { /* Wrap lots of configures into one */ 1437 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width; 1438 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height; 1439 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 } 1441 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1463 1443
1464 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != width || szHint.height != height)
1465 { 1445 {
1466 seen_resize = 1; 1446 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1447 resize_all_windows (width, height, 1);
… …
1519 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1520 { 1500 {
1521 do 1501 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1525 1505
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1507
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1531 1511
1532 scr_refresh (refresh_type); 1512 scr_refresh (refresh_type);
1533 } 1513 }
1534 else 1514 else
1535 { 1515 {
1536 XEvent unused_event; 1516 XEvent unused_event;
1537 1517
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1519 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1521 ;
1542 1522
1543 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1544 { 1524 {
1545 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
… …
1550 menubar_expose (); 1530 menubar_expose ();
1551#endif 1531#endif
1552 1532
1553#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1535 XClearWindow (disp, ev.xany.window);
1556#endif 1536#endif
1557 } 1537 }
1558 break; 1538 break;
1559 1539
1560 case MotionNotify: 1540 case MotionNotify:
… …
1574 1554
1575 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1576 { 1556 {
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1558 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1580 ; 1560 ;
1581 1561
1582 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1583 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1565 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1566 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
… …
1651#endif 1631#endif
1652 } 1632 }
1653 } 1633 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1635 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1637 MotionNotify, &ev))
1658 ; 1638 ;
1659 1639
1660 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1644 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1767 { 1747 {
1768 case Button1: 1748 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1749 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1750 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1752 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1753#else
1774 selection.rect = false; 1754 selection.rect = false;
1775#endif 1755#endif
1776 1756
1777 /* allow shift+left click to extend selection */ 1757 /* allow shift+left click to extend selection */
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2084 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2085 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2086 int i;
2107 2087
2108 Visual* visual = display->visual; 2088 Visual *visual = display->visual;
2109 2089
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2091
2112 /* for convenience */ 2092 /* for convenience */
2113 mask_r = visual->red_mask; 2093 mask_r = visual->red_mask;
… …
2334 Atom atype; 2314 Atom atype;
2335 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2316 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
2339 2320
2340 pchanged = 0; 2321 pchanged = 0;
2341 2322
2342 if (!(options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
2344 2325
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
2347 2328
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2349 2330
2350 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
2351 { 2332 {
2352 if (am_transparent) 2333 if (am_transparent)
2353 { 2334 {
2354 pchanged = 1; 2335 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
2357 } 2338 }
2358 2339
2359 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
2360 } 2341 }
2361 2342
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2343 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2344 XSync (disp, False);
2364 2345
2365 /* 2346 /*
2366 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2349 * windows for each client, so we have to take care about that.
2369 */ 2350 */
2370 i = (xa[XA_XROOTPMAP_ID] 2351 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2354 &nitems, &bytes_after, &prop) == Success);
2374 2355
2375 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2357 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2360 &nitems, &bytes_after, &prop) == Success);
2380 2361
2381 if (!i || prop == NULL 2362 if (!i || prop == NULL
2382#if TINTING 2363#if TINTING
… …
2401 Window cr; 2382 Window cr;
2402 XImage *image; 2383 XImage *image;
2403 GC gc; 2384 GC gc;
2404 XGCValues gcvalue; 2385 XGCValues gcvalue;
2405 2386
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2391 nx = ny = 0;
2411 2392
… …
2424 } 2405 }
2425 2406
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428 2409
2429 XSync (display->display, False); 2410 XSync (disp, False);
2430 allowedxerror = -1; 2411 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2413
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2416 allowedxerror = 0;
2436 2417
… …
2439 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
2440 { 2421 {
2441 pchanged = 1; 2422 pchanged = 1;
2442 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
2443 { 2424 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
2445 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
2446 } 2427 }
2447 } 2428 }
2448 2429
2449 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
2450 } 2431 }
2451 else 2432 else
2452 { 2433 {
2453 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2455 2436
2456#if TINTING 2437#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2438 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2439 {
2459 unsigned short rm, gm, bm; 2440 unsigned short rm, gm, bm;
… …
2463 2444
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2445 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2446 }
2466#endif 2447#endif
2467 2448
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2469 szHint.width, szHint.height, image->depth); 2450 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2453 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2455 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2457 XClearWindow (disp, TermWin.parent[0]);
2477 2458
2478 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2460 pchanged = 1;
2480 2461
2481 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
2482 } 2463 }
2483 } 2464 }
2484 2465
2485 if (am_pixmap_trans) 2466 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2487 else 2468 else
2488 { 2469 {
2489 unsigned int n; 2470 unsigned int n;
2490 /* 2471 /*
2491 * InheritPixmap transparency 2472 * InheritPixmap transparency
2492 */ 2473 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2494 { 2475 {
2495 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2498 XFree (list); 2479 XFree (list);
2499 2480
2500 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2501 { 2482 {
… …
2513 2494
2514 if (pchanged) 2495 if (pchanged)
2515 { 2496 {
2516 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2517 { 2498 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2501 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2522 break; 2503 break;
2523 } 2504 }
2524 } 2505 }
2525 } 2506 }
2526 2507
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2528 { 2509 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2512 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2533 } 2514 }
2534 else 2515 else
2535 { 2516 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2519 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2520 sleep (1);
2540#endif 2521#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2542 { 2523 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2525 XClearWindow (disp, TermWin.parent[n]);
2545 } 2526 }
2546 2527
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2548 am_transparent = 1; 2529 am_transparent = 1;
2549 } 2530 }
2550 2531
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2533 TermWin.parent[i] = None;
2553 } 2534 }
2554 2535
2555 if (scrollBar.win) 2536 if (scrollBar.win)
2556 { 2537 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2539 scrollBar.setIdle ();
2559 scrollbar_show (0); 2540 scrollbar_show (0);
2560 } 2541 }
2561 2542
2562 if (am_transparent) 2543 if (am_transparent)
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3417{
3437 int x, y; 3418 int x, y;
3438 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
3439 Window wdummy; 3420 Window wdummy;
3421 dDisp;
3440 3422
3441 if (nargs == 0) 3423 if (nargs == 0)
3442 return; 3424 return;
3443 3425
3444 switch (args[0]) 3426 switch (args[0])
3445 { 3427 {
3446 /* 3428 /*
3447 * commands 3429 * commands
3448 */ 3430 */
3449 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
3451 break; 3433 break;
3452 case 2: /* iconify window */ 3434 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3436 break;
3456 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3458 break; 3439 break;
3459 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3442 break;
3462 case 5: /* raise window */ 3443 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
3464 break; 3445 break;
3465 case 6: /* lower window */ 3446 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
3467 break; 3448 break;
3468 case 7: /* refresh window */ 3449 case 7: /* refresh window */
3469 scr_touch (true); 3450 scr_touch (true);
3470 break; 3451 break;
3471 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
… …
3483 3464
3484 /* 3465 /*
3485 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
3486 */ 3467 */
3487 case 11: /* report window state */ 3468 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3471 break;
3491 case 13: /* report window position */ 3472 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3478 break;
3498 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3482 break;
3502 case 18: /* report text area size (chars) */ 3483 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3504 break; 3485 break;
… …
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3507 break; 3488 break;
3508 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3509 { 3490 {
3510 char *s; 3491 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3494 XFree (s);
3514 } 3495 }
3515 break; 3496 break;
3516 case 21: /* report window title */ 3497 case 21: /* report window title */
3517 { 3498 {
3518 char *s; 3499 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3502 XFree (s);
3522 } 3503 }
3523 break; 3504 break;
3524 } 3505 }
… …
3666 int changed = 0; 3647 int changed = 0;
3667 int color; 3648 int color;
3668 char *buf, *name; 3649 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3650 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3651 int saveop = op;
3652 dDisp;
3671 3653
3672 assert (str != NULL); 3654 assert (str != NULL);
3673 switch (op) 3655 switch (op)
3674 { 3656 {
3675 case XTerm_name: 3657 case XTerm_name:
… …
3691 unsigned long bytes_after; 3673 unsigned long bytes_after;
3692 unsigned char *value = 0; 3674 unsigned char *value = 0;
3693 const char *str = ""; 3675 const char *str = "";
3694 3676
3695 if (prop 3677 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3678 && XGetWindowProperty (disp, TermWin.parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3679 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3680 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3681 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3682 && actual_type != None
3701 && actual_format == 8) 3683 && actual_format == 8)
… …
3713 { 3695 {
3714 *eq = 0; 3696 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3697 set_utf8_property (display->atom (str), eq + 1);
3716 } 3698 }
3717 else 3699 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3700 XDeleteProperty (disp, TermWin.parent[0],
3719 display->atom (str)); 3701 display->atom (str));
3720 } 3702 }
3721 break; 3703 break;
3722 3704
3723 case XTerm_Color: 3705 case XTerm_Color:
… …
3798 { 3780 {
3799 str++; 3781 str++;
3800#if XPM_BACKGROUND 3782#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3783 changed += scale_pixmap (str);
3802#endif 3784#endif
3803
3804 } 3785 }
3786
3805 if (changed) 3787 if (changed)
3806 { 3788 {
3807#ifdef XPM_BACKGROUND 3789#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3790 resize_pixmap ();
3809#endif 3791#endif
… …
3850 if (query) 3832 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3852 else 3834 else
3853 { 3835 {
3854 set_locale (str); 3836 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8);
3855# ifdef USE_XIM 3838# ifdef USE_XIM
3856 im_cb (); 3839 im_cb ();
3857# endif 3840# endif
3858 } 3841 }
3859 break; 3842 break;

Diff Legend

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