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.176 by root, Mon Dec 13 01:29:03 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}
… …
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1052rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1053{
1060 SET_R (this); 1054 SET_R (this);
1061 SET_LOCALE (locale); 1055 SET_LOCALE (locale);
1062 1056
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1057 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1058 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1059 while (pty_fill ())
1068 if (cmd_parse ()) 1060 if (cmd_parse ())
1069 break; 1061 break;
1062
1063 if (revents & EVENT_WRITE)
1064 pty_write ();
1070} 1065}
1071 1066
1072void 1067void
1073rxvt_term::pointer_unblank () 1068rxvt_term::pointer_unblank ()
1074{ 1069{
… …
1088rxvt_term::pointer_blank () 1083rxvt_term::pointer_blank ()
1089{ 1084{
1090 if (! (options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
1091 return; 1086 return;
1092 1087
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094 XFlush (display->display); 1089 XFlush (display->display);
1095 1090
1096 hidden_pointer = 1; 1091 hidden_pointer = 1;
1097} 1092}
1098 1093
… …
1187 1182
1188/*{{{ process an X event */ 1183/*{{{ process an X event */
1189void 1184void
1190rxvt_term::x_cb (XEvent &ev) 1185rxvt_term::x_cb (XEvent &ev)
1191{ 1186{
1187 dDisp;
1188
1192 SET_R (this); 1189 SET_R (this);
1193 SET_LOCALE (locale); 1190 SET_LOCALE (locale);
1194 1191
1195#if defined(CURSOR_BLINK) 1192#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1327 Atom ActualType; 1324 Atom ActualType;
1328 int ActualFormat; 1325 int ActualFormat;
1329 unsigned char *data; 1326 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1327 unsigned long Size, RemainingBytes;
1331 1328
1332 XGetWindowProperty (display->display, display->root, 1329 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1330 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1331 0L, 1000000L,
1335 False, AnyPropertyType, 1332 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1333 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1334 &Size, &RemainingBytes,
1338 &data); 1335 &data);
1339 set_string_property (XA_CUT_BUFFER0, data); 1336 set_string_property (XA_CUT_BUFFER0, data);
1340 XFree (data); 1337 XFree (data);
1341 selection_paste (display->root, XA_CUT_BUFFER0, true); 1338 selection_paste (display->root, XA_CUT_BUFFER0, true);
1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343 } 1340 }
1344#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1345 break; 1342 break;
1346 1343
1347 case MappingNotify: 1344 case MappingNotify:
… …
1440 { /* Wrap lots of configures into one */ 1437 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width; 1438 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height; 1439 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 } 1441 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1446 1443
1447 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != width || szHint.height != height)
1448 { 1445 {
1449 seen_resize = 1; 1446 seen_resize = 1;
1450 resize_all_windows (width, height, 1); 1447 resize_all_windows (width, height, 1);
… …
1502 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1503 { 1500 {
1504 do 1501 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1508 1505
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1507
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1514 1511
1515 scr_refresh (refresh_type); 1512 scr_refresh (refresh_type);
1516 } 1513 }
1517 else 1514 else
1518 { 1515 {
1519 XEvent unused_event; 1516 XEvent unused_event;
1520 1517
1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522 ; 1519 ;
1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1521 ;
1525 1522
1526 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1527 { 1524 {
1528 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
… …
1533 menubar_expose (); 1530 menubar_expose ();
1534#endif 1531#endif
1535 1532
1536#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1538 XClearWindow (display->display, ev.xany.window); 1535 XClearWindow (disp, ev.xany.window);
1539#endif 1536#endif
1540 } 1537 }
1541 break; 1538 break;
1542 1539
1543 case MotionNotify: 1540 case MotionNotify:
… …
1557 1554
1558 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1559 { 1556 {
1560 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561 { 1558 {
1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1563 ; 1560 ;
1564 1561
1565 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1566 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1567 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1568 &ev.xbutton.x, &ev.xbutton.y, 1565 &ev.xbutton.x, &ev.xbutton.y,
1569 &ev.xbutton.state); 1566 &ev.xbutton.state);
1570#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
… …
1634#endif 1631#endif
1635 } 1632 }
1636 } 1633 }
1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638 { 1635 {
1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640 MotionNotify, &ev)) 1637 MotionNotify, &ev))
1641 ; 1638 ;
1642 1639
1643 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1644 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1645 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1647 &unused_mask); 1644 &unused_mask);
1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1667 case PropertyNotify: 1664 case PropertyNotify:
1668 /* 1665 /*
1669 * if user used some Esetroot compatible prog to set the root bg, 1666 * if user used some Esetroot compatible prog to set the root bg,
1670 * use the property to determine the pixmap. We use it later on. 1667 * use the property to determine the pixmap. We use it later on.
1671 */ 1668 */
1672 if (xa[XA_XROOTPMAPID] == 0)
1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1676 return; 1671 return;
1677 1672
1678 /* FALLTHROUGH */ 1673 /* FALLTHROUGH */
1679 case ReparentNotify: 1674 case ReparentNotify:
1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1752 { 1747 {
1753 case Button1: 1748 case Button1:
1754 /* allow meta + click to select rectangular areas */ 1749 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */ 1750 /* should be done in screen.C */
1756#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask); 1752 selection.rect = !!(ev.state & ModMetaMask);
1758#else 1753#else
1759 selection.rect = false; 1754 selection.rect = false;
1760#endif 1755#endif
1761 1756
1762 /* allow shift+left click to extend selection */ 1757 /* allow shift+left click to extend selection */
… …
2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2084 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2085 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i; 2086 int i;
2092 2087
2093 Visual* visual = display->visual; 2088 Visual *visual = display->visual;
2094 2089
2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096 2091
2097 /* for convenience */ 2092 /* for convenience */
2098 mask_r = visual->red_mask; 2093 mask_r = visual->red_mask;
… …
2319 Atom atype; 2314 Atom atype;
2320 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
2321 Window root, oldp, *list; 2316 Window root, oldp, *list;
2322 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
2323 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
2324 2320
2325 pchanged = 0; 2321 pchanged = 0;
2326 2322
2327 if (!(options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
2328 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
2329 2325
2330 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
2331 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
2332 2328
2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2334 2330
2335 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
2336 { 2332 {
2337 if (am_transparent) 2333 if (am_transparent)
2338 { 2334 {
2339 pchanged = 1; 2335 pchanged = 1;
2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2341 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
2342 } 2338 }
2343 2339
2344 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
2345 } 2341 }
2346 2342
2347 /* 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. */
2348 XSync (display->display, False); 2344 XSync (disp, False);
2349 2345
2350 /* 2346 /*
2351 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
2352 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
2353 * 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.
2354 */ 2350 */
2355 i = (xa[XA_XROOTPMAPID] 2351 i = (xa[XA_XROOTPMAP_ID]
2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358 &nitems, &bytes_after, &prop) == Success); 2354 &nitems, &bytes_after, &prop) == Success);
2359 2355
2360 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID] 2357 i = (xa[XA_ESETROOT_PMAP_ID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success); 2360 &nitems, &bytes_after, &prop) == Success);
2365 2361
2366 if (!i || prop == NULL 2362 if (!i || prop == NULL
2367#if TINTING 2363#if TINTING
… …
2386 Window cr; 2382 Window cr;
2387 XImage *image; 2383 XImage *image;
2388 GC gc; 2384 GC gc;
2389 XGCValues gcvalue; 2385 XGCValues gcvalue;
2390 2386
2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2392 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
2393 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
2394 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
2395 nx = ny = 0; 2391 nx = ny = 0;
2396 2392
… …
2409 } 2405 }
2410 2406
2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413 2409
2414 XSync (display->display, False); 2410 XSync (disp, False);
2415 allowedxerror = -1; 2411 allowedxerror = -1;
2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417 2413
2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2419 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
2420 allowedxerror = 0; 2416 allowedxerror = 0;
2421 2417
… …
2424 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
2425 { 2421 {
2426 pchanged = 1; 2422 pchanged = 1;
2427 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
2428 { 2424 {
2429 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
2430 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
2431 } 2427 }
2432 } 2428 }
2433 2429
2434 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
2435 } 2431 }
2436 else 2432 else
2437 { 2433 {
2438 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
2439 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2440 2436
2441#if TINTING 2437#if TINTING
2442 if (ISSET_PIXCOLOR (Color_tint)) 2438 if (ISSET_PIXCOLOR (Color_tint))
2443 { 2439 {
2444 unsigned short rm, gm, bm; 2440 unsigned short rm, gm, bm;
… …
2448 2444
2449 ShadeXImage (display, image, shade, rm, gm, bm); 2445 ShadeXImage (display, image, shade, rm, gm, bm);
2450 } 2446 }
2451#endif 2447#endif
2452 2448
2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2454 szHint.width, szHint.height, image->depth); 2450 szHint.width, szHint.height, image->depth);
2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2457 nx, ny, image->width, image->height); 2453 nx, ny, image->width, image->height);
2458 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
2459 XDestroyImage (image); 2455 XDestroyImage (image);
2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2461 XClearWindow (display->display, TermWin.parent[0]); 2457 XClearWindow (disp, TermWin.parent[0]);
2462 2458
2463 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
2464 pchanged = 1; 2460 pchanged = 1;
2465 2461
2466 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
2467 } 2463 }
2468 } 2464 }
2469 2465
2470 if (am_pixmap_trans) 2466 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2472 else 2468 else
2473 { 2469 {
2474 unsigned int n; 2470 unsigned int n;
2475 /* 2471 /*
2476 * InheritPixmap transparency 2472 * InheritPixmap transparency
2477 */ 2473 */
2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2479 { 2475 {
2480 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2481 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2482 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2483 XFree (list); 2479 XFree (list);
2484 2480
2485 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2486 { 2482 {
… …
2498 2494
2499 if (pchanged) 2495 if (pchanged)
2500 { 2496 {
2501 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2502 { 2498 {
2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505 { 2501 {
2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2507 break; 2503 break;
2508 } 2504 }
2509 } 2505 }
2510 } 2506 }
2511 2507
2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2513 { 2509 {
2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2516 am_transparent = 0; 2512 am_transparent = 0;
2517 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2518 } 2514 }
2519 else 2515 else
2520 { 2516 {
… …
2523 * needed for fvwm2.2.2 (and before?) */ 2519 * needed for fvwm2.2.2 (and before?) */
2524 sleep (1); 2520 sleep (1);
2525#endif 2521#endif
2526 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2527 { 2523 {
2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]); 2525 XClearWindow (disp, TermWin.parent[n]);
2530 } 2526 }
2531 2527
2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2533 am_transparent = 1; 2529 am_transparent = 1;
2534 } 2530 }
2535 2531
2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2537 TermWin.parent[i] = None; 2533 TermWin.parent[i] = None;
2538 } 2534 }
2539 2535
2540 if (scrollBar.win) 2536 if (scrollBar.win)
2541 { 2537 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle (); 2539 scrollBar.setIdle ();
2544 scrollbar_show (0); 2540 scrollbar_show (0);
2545 } 2541 }
2546 2542
2547 if (am_transparent) 2543 if (am_transparent)
… …
2708 if (len == (size_t)-1) 2704 if (len == (size_t)-1)
2709 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
2710 2706
2711 // assume wchar == unicode 2707 // assume wchar == unicode
2712 cmdbuf_ptr += len; 2708 cmdbuf_ptr += len;
2713 return wc; 2709 return wc & UNICODE_MASK;
2714 } 2710 }
2715 2711
2716 return NOCHAR; 2712 return NOCHAR;
2717} 2713}
2718 2714
… …
3420rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421{ 3417{
3422 int x, y; 3418 int x, y;
3423 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
3424 Window wdummy; 3420 Window wdummy;
3421 dDisp;
3425 3422
3426 if (nargs == 0) 3423 if (nargs == 0)
3427 return; 3424 return;
3428 3425
3429 switch (args[0]) 3426 switch (args[0])
3430 { 3427 {
3431 /* 3428 /*
3432 * commands 3429 * commands
3433 */ 3430 */
3434 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
3435 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
3436 break; 3433 break;
3437 case 2: /* iconify window */ 3434 case 2: /* iconify window */
3438 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3439 DefaultScreen (display->display));
3440 break; 3436 break;
3441 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
3442 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3443 break; 3439 break;
3444 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
3445 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446 break; 3442 break;
3447 case 5: /* raise window */ 3443 case 5: /* raise window */
3448 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
3449 break; 3445 break;
3450 case 6: /* lower window */ 3446 case 6: /* lower window */
3451 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
3452 break; 3448 break;
3453 case 7: /* refresh window */ 3449 case 7: /* refresh window */
3454 scr_touch (true); 3450 scr_touch (true);
3455 break; 3451 break;
3456 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
… …
3468 3464
3469 /* 3465 /*
3470 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
3471 */ 3467 */
3472 case 11: /* report window state */ 3468 case 11: /* report window state */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475 break; 3471 break;
3476 case 13: /* report window position */ 3472 case 13: /* report window position */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3479 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
3480 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
3481 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
3482 break; 3478 break;
3483 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486 break; 3482 break;
3487 case 18: /* report text area size (chars) */ 3483 case 18: /* report text area size (chars) */
3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3489 break; 3485 break;
… …
3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3492 break; 3488 break;
3493 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3494 { 3490 {
3495 char *s; 3491 char *s;
3496 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
3497 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 */
3498 XFree (s); 3494 XFree (s);
3499 } 3495 }
3500 break; 3496 break;
3501 case 21: /* report window title */ 3497 case 21: /* report window title */
3502 { 3498 {
3503 char *s; 3499 char *s;
3504 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
3505 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 */
3506 XFree (s); 3502 XFree (s);
3507 } 3503 }
3508 break; 3504 break;
3509 } 3505 }
… …
3651 int changed = 0; 3647 int changed = 0;
3652 int color; 3648 int color;
3653 char *buf, *name; 3649 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3650 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3651 int saveop = op;
3652 dDisp;
3656 3653
3657 assert (str != NULL); 3654 assert (str != NULL);
3658 switch (op) 3655 switch (op)
3659 { 3656 {
3660 case XTerm_name: 3657 case XTerm_name:
… …
3676 unsigned long bytes_after; 3673 unsigned long bytes_after;
3677 unsigned char *value = 0; 3674 unsigned char *value = 0;
3678 const char *str = ""; 3675 const char *str = "";
3679 3676
3680 if (prop 3677 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3678 && XGetWindowProperty (disp, TermWin.parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3679 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3680 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3681 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3682 && actual_type != None
3686 && actual_format == 8) 3683 && actual_format == 8)
… …
3698 { 3695 {
3699 *eq = 0; 3696 *eq = 0;
3700 set_utf8_property (display->atom (str), eq + 1); 3697 set_utf8_property (display->atom (str), eq + 1);
3701 } 3698 }
3702 else 3699 else
3703 XDeleteProperty (display->display, TermWin.parent[0], 3700 XDeleteProperty (disp, TermWin.parent[0],
3704 display->atom (str)); 3701 display->atom (str));
3705 } 3702 }
3706 break; 3703 break;
3707 3704
3708 case XTerm_Color: 3705 case XTerm_Color:
… …
3783 { 3780 {
3784 str++; 3781 str++;
3785#if XPM_BACKGROUND 3782#if XPM_BACKGROUND
3786 changed += scale_pixmap (str); 3783 changed += scale_pixmap (str);
3787#endif 3784#endif
3788
3789 } 3785 }
3786
3790 if (changed) 3787 if (changed)
3791 { 3788 {
3792#ifdef XPM_BACKGROUND 3789#ifdef XPM_BACKGROUND
3793 resize_pixmap (); 3790 resize_pixmap ();
3794#endif 3791#endif
… …
3835 if (query) 3832 if (query)
3836 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);
3837 else 3834 else
3838 { 3835 {
3839 set_locale (str); 3836 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8);
3840# ifdef USE_XIM 3838# ifdef USE_XIM
3841 im_cb (); 3839 im_cb ();
3842# endif 3840# endif
3843 } 3841 }
3844 break; 3842 break;
… …
4282 4280
4283/* ---------------------------------------------------------------------- */ 4281/* ---------------------------------------------------------------------- */
4284/* Write data to the pty as typed by the user, pasted with the mouse, 4282/* Write data to the pty as typed by the user, pasted with the mouse,
4285 * or generated by us in response to a query ESC sequence. 4283 * or generated by us in response to a query ESC sequence.
4286 */ 4284 */
4285const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4286
4287void 4287void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289{ 4289{
4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4290 if (v_buflen == 0)
4291 {
4292 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291 4293
4292 if (len) 4294 if ((unsigned int)written == len)
4295 return;
4296
4297 data += written;
4298 len -= written;
4293 { 4299 }
4300
4301 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4302
4303 memcpy (v_buffer + v_buflen, data, len);
4304 v_buflen += len;
4305
4306 pty_ev.set (EVENT_READ | EVENT_WRITE);
4307}
4308
4309void rxvt_term::pty_write ()
4310{
4311 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4312
4313 if (written > 0)
4314 {
4315 v_buflen -= written;
4316
4294 if (v_buflen == 0) 4317 if (v_buflen == 0)
4295 { 4318 {
4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298 if ((unsigned int)written == len)
4299 return;
4300
4301 data += written;
4302 len -= written;
4303 }
4304
4305
4306 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308 memcpy (v_buffer + v_buflen, data, len);
4309 v_buflen += len;
4310 }
4311
4312 for (;;)
4313 {
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4320 if (v_buflen == 0)
4321 {
4322 free (v_buffer); 4319 free (v_buffer);
4323 v_buffer = 0; 4320 v_buffer = 0;
4324 v_buflen = 0; 4321 v_buflen = 0;
4325 4322
4326 pty_ev.set (EVENT_READ); 4323 pty_ev.set (EVENT_READ);
4327 return;
4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4335 else
4336 {
4337 pty_ev.set (EVENT_READ | EVENT_WRITE);
4338 return; 4324 return;
4339 } 4325 }
4326
4327 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4328 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this...
4331 destroy ();
4341} 4332}
4342 4333
4343/*----------------------- end-of-file (C source) -----------------------*/ 4334/*----------------------- end-of-file (C source) -----------------------*/
4344 4335

Diff Legend

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