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.179 by root, Wed Dec 15 05:39:08 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 <wchar.h> 57#include <cwchar>
54#include <signal.h> 58#include <csignal>
55 59
56/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
57 61
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 63
… …
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
… …
788#undef FKEY 772#undef FKEY
789 default: 773 default:
790 newlen = 0; 774 newlen = 0;
791 break; 775 break;
792 } 776 }
777
793 if (newlen) 778 if (newlen)
794 len = strlen (kbuf); 779 len = strlen (kbuf);
795 } 780 }
796 781
797 /* 782 /*
… …
805 } 790 }
806 else if (ctrl && keysym == XK_minus) 791 else if (ctrl && keysym == XK_minus)
807 { 792 {
808 len = 1; 793 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 794 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
795 }
796 else if (keysym == XK_ISO_Left_Tab)
797 {
798 strcpy (kbuf, "\033[Z");
799 len = 3;
810 } 800 }
811 else 801 else
812 { 802 {
813#ifdef META8_OPTION 803#ifdef META8_OPTION
814 /* set 8-bit on */ 804 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 863#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 864 tt_write (kbuf, (unsigned int)len);
875} 865}
876/*}}} */ 866/*}}} */
877 867
878#if (MENUBAR_MAX) 868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 870/* attempt to `write' count to the input buffer */
881unsigned int 871unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 872rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 873{
… …
906 896
907 cmd_parse (); 897 cmd_parse ();
908 898
909 return 0; 899 return 0;
910} 900}
911#endif /* MENUBAR_MAX */ 901#endif
912 902
913void 903void
914rxvt_term::flush () 904rxvt_term::flush ()
915{ 905{
916 flush_ev.stop (); 906 flush_ev.stop ();
… …
1017{ 1007{
1018 if (mouse_slip_wheel_speed == 0 1008 if (mouse_slip_wheel_speed == 0
1019 || 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)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1010 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1011 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0;
1015
1022 refresh_type |= SMOOTH_REFRESH; 1016 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1017 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1019 }
1026} 1020}
… …
1089rxvt_term::pointer_blank () 1083rxvt_term::pointer_blank ()
1090{ 1084{
1091 if (! (options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
1092 return; 1086 return;
1093 1087
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1095 XFlush (display->display); 1089 XFlush (display->display);
1096 1090
1097 hidden_pointer = 1; 1091 hidden_pointer = 1;
1098} 1092}
1099 1093
… …
1188 1182
1189/*{{{ process an X event */ 1183/*{{{ process an X event */
1190void 1184void
1191rxvt_term::x_cb (XEvent &ev) 1185rxvt_term::x_cb (XEvent &ev)
1192{ 1186{
1187 dDisp;
1188
1193 SET_R (this); 1189 SET_R (this);
1194 SET_LOCALE (locale); 1190 SET_LOCALE (locale);
1195 1191
1196#if defined(CURSOR_BLINK) 1192#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1328 Atom ActualType; 1324 Atom ActualType;
1329 int ActualFormat; 1325 int ActualFormat;
1330 unsigned char *data; 1326 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1327 unsigned long Size, RemainingBytes;
1332 1328
1333 XGetWindowProperty (display->display, display->root, 1329 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1330 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1331 0L, 1000000L,
1336 False, AnyPropertyType, 1332 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1333 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1334 &Size, &RemainingBytes,
1339 &data); 1335 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1336 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1337 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1338 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1340 }
1345#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1346 break; 1342 break;
1347 1343
1348 case MappingNotify: 1344 case MappingNotify:
… …
1441 { /* Wrap lots of configures into one */ 1437 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width; 1438 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height; 1439 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 } 1441 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1447 1443
1448 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != width || szHint.height != height)
1449 { 1445 {
1450 seen_resize = 1; 1446 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1447 resize_all_windows (width, height, 1);
… …
1503 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1504 { 1500 {
1505 do 1501 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1509 1505
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1507
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1515 1511
1516 scr_refresh (refresh_type); 1512 scr_refresh (refresh_type);
1517 } 1513 }
1518 else 1514 else
1519 { 1515 {
1520 XEvent unused_event; 1516 XEvent unused_event;
1521 1517
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1519 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1521 ;
1526 1522
1527 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1528 { 1524 {
1529 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
… …
1534 menubar_expose (); 1530 menubar_expose ();
1535#endif 1531#endif
1536 1532
1537#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1535 XClearWindow (disp, ev.xany.window);
1540#endif 1536#endif
1541 } 1537 }
1542 break; 1538 break;
1543 1539
1544 case MotionNotify: 1540 case MotionNotify:
… …
1558 1554
1559 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1560 { 1556 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1558 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1564 ; 1560 ;
1565 1561
1566 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1567 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1565 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1566 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
… …
1635#endif 1631#endif
1636 } 1632 }
1637 } 1633 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1635 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1637 MotionNotify, &ev))
1642 ; 1638 ;
1643 1639
1644 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1644 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1751 { 1747 {
1752 case Button1: 1748 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1749 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1750 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1752 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1753#else
1758 selection.rect = false; 1754 selection.rect = false;
1759#endif 1755#endif
1760 1756
1761 /* allow shift+left click to extend selection */ 1757 /* allow shift+left click to extend selection */
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2084 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2085 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2086 int i;
2091 2087
2092 Visual* visual = display->visual; 2088 Visual *visual = display->visual;
2093 2089
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2091
2096 /* for convenience */ 2092 /* for convenience */
2097 mask_r = visual->red_mask; 2093 mask_r = visual->red_mask;
… …
2318 Atom atype; 2314 Atom atype;
2319 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2316 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
2323 2320
2324 pchanged = 0; 2321 pchanged = 0;
2325 2322
2326 if (!(options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
2328 2325
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
2331 2328
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2333 2330
2334 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
2335 { 2332 {
2336 if (am_transparent) 2333 if (am_transparent)
2337 { 2334 {
2338 pchanged = 1; 2335 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
2341 } 2338 }
2342 2339
2343 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
2344 } 2341 }
2345 2342
2346 /* 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. */
2347 XSync (display->display, False); 2344 XSync (disp, False);
2348 2345
2349 /* 2346 /*
2350 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
2352 * 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.
2353 */ 2350 */
2354 i = (xa[XA_XROOTPMAP_ID] 2351 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2354 &nitems, &bytes_after, &prop) == Success);
2358 2355
2359 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID] 2357 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2360 &nitems, &bytes_after, &prop) == Success);
2364 2361
2365 if (!i || prop == NULL 2362 if (!i || prop == NULL
2366#if TINTING 2363#if TINTING
… …
2385 Window cr; 2382 Window cr;
2386 XImage *image; 2383 XImage *image;
2387 GC gc; 2384 GC gc;
2388 XGCValues gcvalue; 2385 XGCValues gcvalue;
2389 2386
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2391 nx = ny = 0;
2395 2392
… …
2408 } 2405 }
2409 2406
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412 2409
2413 XSync (display->display, False); 2410 XSync (disp, False);
2414 allowedxerror = -1; 2411 allowedxerror = -1;
2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416 2413
2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2418 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
2419 allowedxerror = 0; 2416 allowedxerror = 0;
2420 2417
… …
2423 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
2424 { 2421 {
2425 pchanged = 1; 2422 pchanged = 1;
2426 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
2427 { 2424 {
2428 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
2429 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
2430 } 2427 }
2431 } 2428 }
2432 2429
2433 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
2434 } 2431 }
2435 else 2432 else
2436 { 2433 {
2437 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
2438 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2439 2436
2440#if TINTING 2437#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint)) 2438 if (ISSET_PIXCOLOR (Color_tint))
2442 { 2439 {
2443 unsigned short rm, gm, bm; 2440 unsigned short rm, gm, bm;
… …
2447 2444
2448 ShadeXImage (display, image, shade, rm, gm, bm); 2445 ShadeXImage (display, image, shade, rm, gm, bm);
2449 } 2446 }
2450#endif 2447#endif
2451 2448
2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2453 szHint.width, szHint.height, image->depth); 2450 szHint.width, szHint.height, image->depth);
2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2456 nx, ny, image->width, image->height); 2453 nx, ny, image->width, image->height);
2457 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
2458 XDestroyImage (image); 2455 XDestroyImage (image);
2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]); 2457 XClearWindow (disp, TermWin.parent[0]);
2461 2458
2462 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
2463 pchanged = 1; 2460 pchanged = 1;
2464 2461
2465 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
2466 } 2463 }
2467 } 2464 }
2468 2465
2469 if (am_pixmap_trans) 2466 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2471 else 2468 else
2472 { 2469 {
2473 unsigned int n; 2470 unsigned int n;
2474 /* 2471 /*
2475 * InheritPixmap transparency 2472 * InheritPixmap transparency
2476 */ 2473 */
2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2478 { 2475 {
2479 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2480 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2481 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2482 XFree (list); 2479 XFree (list);
2483 2480
2484 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2485 { 2482 {
… …
2497 2494
2498 if (pchanged) 2495 if (pchanged)
2499 { 2496 {
2500 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2501 { 2498 {
2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504 { 2501 {
2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2506 break; 2503 break;
2507 } 2504 }
2508 } 2505 }
2509 } 2506 }
2510 2507
2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2512 { 2509 {
2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2515 am_transparent = 0; 2512 am_transparent = 0;
2516 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2517 } 2514 }
2518 else 2515 else
2519 { 2516 {
… …
2522 * needed for fvwm2.2.2 (and before?) */ 2519 * needed for fvwm2.2.2 (and before?) */
2523 sleep (1); 2520 sleep (1);
2524#endif 2521#endif
2525 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2526 { 2523 {
2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]); 2525 XClearWindow (disp, TermWin.parent[n]);
2529 } 2526 }
2530 2527
2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2532 am_transparent = 1; 2529 am_transparent = 1;
2533 } 2530 }
2534 2531
2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2536 TermWin.parent[i] = None; 2533 TermWin.parent[i] = None;
2537 } 2534 }
2538 2535
2539 if (scrollBar.win) 2536 if (scrollBar.win)
2540 { 2537 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle (); 2539 scrollBar.setIdle ();
2543 scrollbar_show (0); 2540 scrollbar_show (0);
2544 } 2541 }
2545 2542
2546 if (am_transparent) 2543 if (am_transparent)
… …
2707 if (len == (size_t)-1) 2704 if (len == (size_t)-1)
2708 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709 2706
2710 // assume wchar == unicode 2707 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2708 cmdbuf_ptr += len;
2712 return wc; 2709 return wc & UNICODE_MASK;
2713 } 2710 }
2714 2711
2715 return NOCHAR; 2712 return NOCHAR;
2716} 2713}
2717 2714
… …
3419rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420{ 3417{
3421 int x, y; 3418 int x, y;
3422 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
3423 Window wdummy; 3420 Window wdummy;
3421 dDisp;
3424 3422
3425 if (nargs == 0) 3423 if (nargs == 0)
3426 return; 3424 return;
3427 3425
3428 switch (args[0]) 3426 switch (args[0])
3429 { 3427 {
3430 /* 3428 /*
3431 * commands 3429 * commands
3432 */ 3430 */
3433 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
3434 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
3435 break; 3433 break;
3436 case 2: /* iconify window */ 3434 case 2: /* iconify window */
3437 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3438 DefaultScreen (display->display));
3439 break; 3436 break;
3440 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
3441 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3442 break; 3439 break;
3443 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
3444 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445 break; 3442 break;
3446 case 5: /* raise window */ 3443 case 5: /* raise window */
3447 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
3448 break; 3445 break;
3449 case 6: /* lower window */ 3446 case 6: /* lower window */
3450 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
3451 break; 3448 break;
3452 case 7: /* refresh window */ 3449 case 7: /* refresh window */
3453 scr_touch (true); 3450 scr_touch (true);
3454 break; 3451 break;
3455 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
… …
3467 3464
3468 /* 3465 /*
3469 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
3470 */ 3467 */
3471 case 11: /* report window state */ 3468 case 11: /* report window state */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474 break; 3471 break;
3475 case 13: /* report window position */ 3472 case 13: /* report window position */
3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3478 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
3479 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
3480 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
3481 break; 3478 break;
3482 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485 break; 3482 break;
3486 case 18: /* report text area size (chars) */ 3483 case 18: /* report text area size (chars) */
3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3488 break; 3485 break;
… …
3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3491 break; 3488 break;
3492 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3493 { 3490 {
3494 char *s; 3491 char *s;
3495 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
3496 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 */
3497 XFree (s); 3494 XFree (s);
3498 } 3495 }
3499 break; 3496 break;
3500 case 21: /* report window title */ 3497 case 21: /* report window title */
3501 { 3498 {
3502 char *s; 3499 char *s;
3503 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
3504 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 */
3505 XFree (s); 3502 XFree (s);
3506 } 3503 }
3507 break; 3504 break;
3508 } 3505 }
… …
3650 int changed = 0; 3647 int changed = 0;
3651 int color; 3648 int color;
3652 char *buf, *name; 3649 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3650 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3651 int saveop = op;
3652 dDisp;
3655 3653
3656 assert (str != NULL); 3654 assert (str != NULL);
3657 switch (op) 3655 switch (op)
3658 { 3656 {
3659 case XTerm_name: 3657 case XTerm_name:
… …
3675 unsigned long bytes_after; 3673 unsigned long bytes_after;
3676 unsigned char *value = 0; 3674 unsigned char *value = 0;
3677 const char *str = ""; 3675 const char *str = "";
3678 3676
3679 if (prop 3677 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3678 && XGetWindowProperty (disp, TermWin.parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3679 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3680 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3681 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3682 && actual_type != None
3685 && actual_format == 8) 3683 && actual_format == 8)
… …
3697 { 3695 {
3698 *eq = 0; 3696 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1); 3697 set_utf8_property (display->atom (str), eq + 1);
3700 } 3698 }
3701 else 3699 else
3702 XDeleteProperty (display->display, TermWin.parent[0], 3700 XDeleteProperty (disp, TermWin.parent[0],
3703 display->atom (str)); 3701 display->atom (str));
3704 } 3702 }
3705 break; 3703 break;
3706 3704
3707 case XTerm_Color: 3705 case XTerm_Color:
… …
3782 { 3780 {
3783 str++; 3781 str++;
3784#if XPM_BACKGROUND 3782#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3783 changed += scale_pixmap (str);
3786#endif 3784#endif
3787
3788 } 3785 }
3786
3789 if (changed) 3787 if (changed)
3790 { 3788 {
3791#ifdef XPM_BACKGROUND 3789#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3790 resize_pixmap ();
3793#endif 3791#endif
… …
3834 if (query) 3832 if (query)
3835 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);
3836 else 3834 else
3837 { 3835 {
3838 set_locale (str); 3836 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8);
3839# ifdef USE_XIM 3838# ifdef USE_XIM
3840 im_cb (); 3839 im_cb ();
3841# endif 3840# endif
3842 } 3841 }
3843 break; 3842 break;

Diff Legend

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