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.206 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
153 break; 154 break;
154 } 155 }
155 156
156 x--; 157 x--;
157 } 158 }
158
159} 159}
160#endif 160#endif
161 161
162#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
163void 163void
… …
366#ifdef KEYSYM_RESOURCE 366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 367 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 368 return;
369#endif 369#endif
370 370
371 if (TermWin.saveLines) 371 if (saveLines)
372 { 372 {
373#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 374 if (!ctrl && !meta)
375#else 375#else
376 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
377#endif 377#endif
378 { 378 {
379 int lnsppg; 379 int lnsppg;
380 380
381#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 383#else
384 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
385#endif 385#endif
386 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
387 { 387 {
388 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
389 return; 389 return;
… …
845 845
846 if (len <= 0) 846 if (len <= 0)
847 return; /* not mapped */ 847 return; /* not mapped */
848 848
849 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
850 if (TermWin.view_start) 850 if (view_start)
851 { 851 {
852 TermWin.view_start = 0; 852 view_start = 0;
853 want_refresh = 1; 853 want_refresh = 1;
854 } 854 }
855 855
856 /* 856 /*
857 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
1034{ 1034{
1035 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1039 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1041 mouse_slip_wheel_speed = 0;
1042 1042
1043 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1044 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1067 if (n > 0) 1067 if (n > 0)
1068 { 1068 {
1069 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1070 return true; 1070 return true;
1071 } 1071 }
1072 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
1073 destroy (); 1077 destroy ();
1078 }
1074 1079
1075 return false; 1080 return false;
1076} 1081}
1077 1082
1078void 1083void
… …
1092} 1097}
1093 1098
1094void 1099void
1095rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
1096{ 1101{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1103 recolour_cursor ();
1099 1104
1100#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1106 hidden_pointer = 0;
1102 1107
… …
1110rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
1111{ 1116{
1112 if (! (options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
1113 return; 1118 return;
1114 1119
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1121 XFlush (display->display);
1117 1122
1118 hidden_pointer = 1; 1123 hidden_pointer = 1;
1119} 1124}
1120 1125
… …
1422 case FocusOut: 1427 case FocusOut:
1423 focus_out (); 1428 focus_out ();
1424 break; 1429 break;
1425 1430
1426 case ConfigureNotify: 1431 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1432 if (ev.xconfigure.window == parent[0])
1428 { 1433 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ;
1438 1436
1439 if (szHint.width != width || szHint.height != height) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1438 {
1441 seen_resize = 1; 1439 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1441 }
1444 1442
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1444 if (options & Opt_transparent)
1447 check_our_parents (); 1445 check_our_parents ();
… …
1468 case SelectionRequest: 1466 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1470 break; 1468 break;
1471 1469
1472 case UnmapNotify: 1470 case UnmapNotify:
1473 TermWin.mapped = 0; 1471 mapped = 0;
1474#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1476#endif 1474#endif
1477 break; 1475 break;
1478 1476
1479 case MapNotify: 1477 case MapNotify:
1480 TermWin.mapped = 1; 1478 mapped = 1;
1481#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1481#endif
1484 break; 1482 break;
1485 1483
… …
1489 break; 1487 break;
1490#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1491 1489
1492 case GraphicsExpose: 1490 case GraphicsExpose:
1493 case Expose: 1491 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1495 { 1493 {
1496 do 1494 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1498
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1500
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1506 1504
1507 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1508 } 1506 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1523 menubar_expose ();
1526#endif 1524#endif
1527 1525
1528#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1531#endif 1529#endif
1532 } 1530 }
1533 break; 1531 break;
1534 1532
… …
1545 } 1543 }
1546#endif 1544#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1546 break;
1549 1547
1550 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1551 { 1549 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1551 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1553 ;
1556 1554
1557 XQueryPointer (disp, TermWin.vt, 1555 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1558 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1559 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
… …
1574#endif 1572#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1575
1578#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1579 {
1582 int dist; 1580 int dist;
1583 1581
1584 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1594
1597 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1599 { 1597 {
1600 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1602 } 1600 }
1603 else 1601 else
1604 { 1602 {
1605 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1604 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1605 }
1608 1606
1609 scroll_selection_lines = Pixel2Height (dist) 1607 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1609 + 1;
1612 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1614 } 1612 }
1615 else 1613 else
1616 { 1614 {
1617 /* we are within the text window, so we 1615 /* we are within the text window, so we
… …
1648} 1646}
1649 1647
1650void 1648void
1651rxvt_term::focus_in () 1649rxvt_term::focus_in ()
1652{ 1650{
1653 if (!TermWin.focus) 1651 if (!focus)
1654 { 1652 {
1655 TermWin.focus = 1; 1653 focus = 1;
1656 want_refresh = 1; 1654 want_refresh = 1;
1657#if USE_XIM 1655#if USE_XIM
1658 if (Input_Context != NULL) 1656 if (Input_Context != NULL)
1659 { 1657 {
1660 IMSetStatusPosition (); 1658 IMSetStatusPosition ();
… …
1676} 1674}
1677 1675
1678void 1676void
1679rxvt_term::focus_out () 1677rxvt_term::focus_out ()
1680{ 1678{
1681 if (TermWin.focus) 1679 if (focus)
1682 { 1680 {
1683 TermWin.focus = 0; 1681 focus = 0;
1684 want_refresh = 1; 1682 want_refresh = 1;
1685 1683
1686#if ENABLE_FRILLS || ISO_14755 1684#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1685 iso14755buf = 0;
1688#endif 1686#endif
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1744
1747 /* 1745 /*
1748 * VT window processing of button press 1746 * VT window processing of button press
1749 */ 1747 */
1750 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1751 { 1749 {
1752#if ISO_14755 1750#if ISO_14755
1753 // 5.4 1751 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1753 {
… …
1960 case Button3: 1958 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1962 { 1960 {
1963 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1966# else 1964# else
1967 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1968# endif 1966# endif
1969 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1972# else 1970# else
1973 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1974# endif 1972# endif
1975 else 1973 else
1976 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1977 } 1975 }
1978 else 1976 else
1979 { 1977 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 1979 (nrow
1982 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 1981 / scrollbar_size ()));
1984 } 1982 }
1985 1983
1986 break; 1984 break;
… …
2018#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
2021#endif 2019#endif
2022 2020
2023 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
2024 { 2022 {
2025#if ISO_14755 2023#if ISO_14755
2026 // 5.4 2024 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2026 return;
… …
2079 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
2080 2078
2081 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
2082 i = 1; 2080 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
2084 i = TermWin.nrow - 1; 2082 i = nrow - 1;
2085 else 2083 else
2086 i = 5; 2084 i = 5;
2087 2085
2088# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
2090 { 2088 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2092
2095 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2095
2098 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
2380 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2381 2379
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2384 2382
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2384
2387 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2388 { 2386 {
2389 if (am_transparent) 2387 if (am_transparent)
2390 { 2388 {
2391 pchanged = 1; 2389 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2394 } 2392 }
2395 2393
2396 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2397 } 2395 }
… …
2438 Window cr; 2436 Window cr;
2439 XImage *image; 2437 XImage *image;
2440 GC gc; 2438 GC gc;
2441 XGCValues gcvalue; 2439 XGCValues gcvalue;
2442 2440
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2445 nx = ny = 0;
2448 2446
… …
2458 nh += sy; 2456 nh += sy;
2459 ny = -sy; 2457 ny = -sy;
2460 sy = 0; 2458 sy = 0;
2461 } 2459 }
2462 2460
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2463
2466 XSync (disp, False); 2464 XSync (disp, False);
2467 allowedxerror = -1; 2465 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2467
… …
2474 if (image == NULL) 2472 if (image == NULL)
2475 { 2473 {
2476 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2477 { 2475 {
2478 pchanged = 1; 2476 pchanged = 1;
2479 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2480 { 2478 {
2481 XFreePixmap (disp, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2480 pixmap = None;
2483 } 2481 }
2484 } 2482 }
2485 2483
2486 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2487 } 2485 }
2488 else 2486 else
2489 { 2487 {
2490 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2492 2490
2493#if TINTING 2491#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2493 {
2496 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
… …
2500 2498
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2500 }
2503#endif 2501#endif
2504 2502
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2508 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2509 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2514 2512
2515 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2514 pchanged = 1;
2517 2515
2518 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2519 } 2517 }
2520 } 2518 }
2521 2519
2522 if (am_pixmap_trans) 2520 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2522 else
2525 { 2523 {
2526 unsigned int n; 2524 unsigned int n;
2527 /* 2525 /*
2528 * InheritPixmap transparency 2526 * InheritPixmap transparency
2529 */ 2527 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2529 {
2532 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2535 XFree (list); 2533 XFree (list);
2536 2534
2537 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2538 { 2536 {
2539 if (oldp != None) 2537 if (oldp != None)
2540 pchanged = 1; 2538 pchanged = 1;
2541 2539
2542 break; 2540 break;
2543 } 2541 }
2544 2542
2545 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2546 pchanged = 1; 2544 pchanged = 1;
2547 } 2545 }
2548 2546
2549 n = 0; 2547 n = 0;
2550 2548
2551 if (pchanged) 2549 if (pchanged)
2552 { 2550 {
2553 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2554 { 2552 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2555 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2557 break;
2560 } 2558 }
2561 } 2559 }
2562 } 2560 }
2563 2561
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2563 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2566 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2570 } 2568 }
2571 else 2569 else
2572 { 2570 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2574 sleep (1);
2577#endif 2575#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2579 { 2577 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2582 } 2580 }
2583 2581
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2583 am_transparent = 1;
2586 } 2584 }
2587 2585
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2587 parent[i] = None;
2590 } 2588 }
2591 2589
2592 if (scrollBar.win) 2590 if (scrollBar.win)
2593 { 2591 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2646 bool refreshnow = false;
2649 int nlines = 0; 2647 int nlines = 0;
2650 unicode_t *str = buf; 2648 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2650
2653 for (;;) 2651 for (;;)
2654 { 2652 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2654 break;
… …
2663 nlines++; 2661 nlines++;
2664 2662
2665 refresh_count++; 2663 refresh_count++;
2666 2664
2667 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2667 {
2670 refreshnow = true; 2668 refreshnow = true;
2671 ch = NOCHAR; 2669 ch = NOCHAR;
2672 break; 2670 break;
2673 } 2671 }
2674 2672
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2677 { 2675 {
2678 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2679 nlines = 0; 2677 nlines = 0;
2680 str = buf; 2678 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2679 eol = str + min (ncol, UBUFSIZ);
2682 } 2680 }
2683 2681
2684 if (str >= eol) 2682 if (str >= eol)
2685 { 2683 {
2686 if (eol >= buf + UBUFSIZ) 2684 if (eol >= buf + UBUFSIZ)
2687 { 2685 {
2688 ch = NOCHAR; 2686 ch = NOCHAR;
2689 break; 2687 break;
2690 } 2688 }
2691 else 2689 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2690 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2691 }
2694 2692
2695 } 2693 }
2696 2694
2697 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
… …
3358 3356
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3362 break;
3365 3363
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
3368 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3493 { 3491 {
3494 /* 3492 /*
3495 * commands 3493 * commands
3496 */ 3494 */
3497 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3499 break; 3497 break;
3500 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3499 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3500 break;
3503 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3503 break;
3506 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3506 break;
3509 case 5: /* raise window */ 3507 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3511 break; 3509 break;
3512 case 6: /* lower window */ 3510 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3514 break; 3512 break;
3515 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3516 scr_touch (true); 3514 scr_touch (true);
3517 break; 3515 break;
3518 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3521 break; 3519 break;
3522 3520
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3522 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3528 break; 3526 break;
3529 3527
3530 3528
3531 /* 3529 /*
3532 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3533 */ 3531 */
3534 case 11: /* report window state */ 3532 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3535 break;
3538 case 13: /* report window position */ 3536 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3542 break;
3545 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3546 break;
3549 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3549 break;
3552 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3552 break;
3555 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3556 { 3554 {
3557 char *s; 3555 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3558 XFree (s);
3561 } 3559 }
3562 break; 3560 break;
3563 case 21: /* report window title */ 3561 case 21: /* report window title */
3564 { 3562 {
3565 char *s; 3563 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3566 XFree (s);
3569 } 3567 }
3570 break; 3568 break;
3571 } 3569 }
… …
3717 unsigned long bytes_after; 3715 unsigned long bytes_after;
3718 unsigned char *value = 0; 3716 unsigned char *value = 0;
3719 const char *str = ""; 3717 const char *str = "";
3720 3718
3721 if (prop 3719 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3724 && actual_type != None
3727 && actual_format == 8) 3725 && actual_format == 8)
… …
3739 { 3737 {
3740 *eq = 0; 3738 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3742 } 3740 }
3743 else 3741 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3743 display->atom (str));
3746 } 3744 }
3747 break; 3745 break;
3748 3746
3749 case XTerm_Color: 3747 case XTerm_Color:
… …
3874 case URxvt_italicFont: 3872 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3873 case URxvt_boldItalicFont:
3876#endif 3874#endif
3877 if (query) 3875 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3878 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3879 resp);
3882 else 3880 else
3883 { 3881 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3883
… …
4052 */ 4050 */
4053 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
4054 break; 4052 break;
4055 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4056 break;
4059 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
4060 if (state) 4058 if (state)
4061 options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
4062 else 4060 else
… …
4379 } 4377 }
4380 4378
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4379 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4380 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4382 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4383}
4387 4384
4388/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4389 4386

Diff Legend

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