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.205 by root, Wed Jul 13 03:11:51 2005 UTC vs.
Revision 1.211 by root, Tue Dec 20 22:27:49 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(-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);
… …
1092} 1092}
1093 1093
1094void 1094void
1095rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1096{ 1096{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1097 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1098 recolour_cursor ();
1099 1099
1100#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1101 hidden_pointer = 0;
1102 1102
… …
1110rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1111{ 1111{
1112 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1113 return; 1113 return;
1114 1114
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1116 XFlush (display->display);
1117 1117
1118 hidden_pointer = 1; 1118 hidden_pointer = 1;
1119} 1119}
1120 1120
… …
1422 case FocusOut: 1422 case FocusOut:
1423 focus_out (); 1423 focus_out ();
1424 break; 1424 break;
1425 1425
1426 case ConfigureNotify: 1426 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == parent[0])
1428 { 1428 {
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)); 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ;
1438 1431
1439 if (szHint.width != width || szHint.height != height) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1433 {
1441 seen_resize = 1; 1434 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1436 }
1444 1437
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1439 if (options & Opt_transparent)
1447 check_our_parents (); 1440 check_our_parents ();
… …
1468 case SelectionRequest: 1461 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1470 break; 1463 break;
1471 1464
1472 case UnmapNotify: 1465 case UnmapNotify:
1473 TermWin.mapped = 0; 1466 mapped = 0;
1474#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1476#endif 1469#endif
1477 break; 1470 break;
1478 1471
1479 case MapNotify: 1472 case MapNotify:
1480 TermWin.mapped = 1; 1473 mapped = 1;
1481#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1476#endif
1484 break; 1477 break;
1485 1478
… …
1489 break; 1482 break;
1490#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1491 1484
1492 case GraphicsExpose: 1485 case GraphicsExpose:
1493 case Expose: 1486 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1495 { 1488 {
1496 do 1489 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1493
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1495
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1506 1499
1507 scr_refresh (refresh_type); 1500 scr_refresh (refresh_type);
1508 } 1501 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1518 menubar_expose ();
1526#endif 1519#endif
1527 1520
1528#ifdef TRANSPARENT 1521#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1522 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1523 XClearWindow (disp, ev.xany.window);
1531#endif 1524#endif
1532 } 1525 }
1533 break; 1526 break;
1534 1527
… …
1545 } 1538 }
1546#endif 1539#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1541 break;
1549 1542
1550 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1551 { 1544 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1546 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1548 ;
1556 1549
1557 XQueryPointer (disp, TermWin.vt, 1550 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1553 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1554 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
… …
1574#endif 1567#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1570
1578#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1574 {
1582 int dist; 1575 int dist;
1583 1576
1584 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1589
1597 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1599 { 1592 {
1600 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1602 } 1595 }
1603 else 1596 else
1604 { 1597 {
1605 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1599 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1600 }
1608 1601
1609 scroll_selection_lines = Pixel2Height (dist) 1602 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1604 + 1;
… …
1648} 1641}
1649 1642
1650void 1643void
1651rxvt_term::focus_in () 1644rxvt_term::focus_in ()
1652{ 1645{
1653 if (!TermWin.focus) 1646 if (!focus)
1654 { 1647 {
1655 TermWin.focus = 1; 1648 focus = 1;
1656 want_refresh = 1; 1649 want_refresh = 1;
1657#ifdef USE_XIM 1650#if USE_XIM
1658 if (Input_Context != NULL) 1651 if (Input_Context != NULL)
1659 { 1652 {
1660 IMSetStatusPosition (); 1653 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1654 XSetICFocus (Input_Context);
1662 } 1655 }
1663#endif 1656#endif
1664#ifdef CURSOR_BLINK 1657#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1658 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1660#endif
1668#ifdef OFF_FOCUS_FADING 1661#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1662 if (rs[Rs_fade])
1670 { 1663 {
1671 pix_colors = pix_colors_focused; 1664 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1665 scr_recolour ();
1673 } 1666 }
… …
1676} 1669}
1677 1670
1678void 1671void
1679rxvt_term::focus_out () 1672rxvt_term::focus_out ()
1680{ 1673{
1681 if (TermWin.focus) 1674 if (focus)
1682 { 1675 {
1683 TermWin.focus = 0; 1676 focus = 0;
1684 want_refresh = 1; 1677 want_refresh = 1;
1685 1678
1686#if ENABLE_FRILLS || ISO_14755 1679#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1680 iso14755buf = 0;
1688#endif 1681#endif
1689#if ENABLE_OVERLAY 1682#if ENABLE_OVERLAY
1690 scr_overlay_off (); 1683 scr_overlay_off ();
1691#endif 1684#endif
1692#ifdef USE_XIM 1685#if USE_XIM
1693 if (Input_Context != NULL) 1686 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1687 XUnsetICFocus (Input_Context);
1695#endif 1688#endif
1696#ifdef CURSOR_BLINK 1689#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1690 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop (); 1691 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1692 hidden_cursor = 0;
1700#endif 1693#endif
1701#ifdef OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1703 { 1696 {
1704 pix_colors = pix_colors_unfocused; 1697 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1698 scr_recolour ();
1706 } 1699 }
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1739
1747 /* 1740 /*
1748 * VT window processing of button press 1741 * VT window processing of button press
1749 */ 1742 */
1750 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1751 { 1744 {
1752#if ISO_14755 1745#if ISO_14755
1753 // 5.4 1746 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1748 {
… …
1960 case Button3: 1953 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1962 { 1955 {
1963 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1966# else 1959# else
1967 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1968# endif 1961# endif
1969 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1972# else 1965# else
1973 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1974# endif 1967# endif
1975 else 1968 else
1976 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1977 } 1970 }
1978 else 1971 else
1979 { 1972 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 1974 (nrow
1982 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 1976 / scrollbar_size ()));
1984 } 1977 }
1985 1978
1986 break; 1979 break;
… …
2018#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2012 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2013 sel_scroll_ev.stop();
2021#endif 2014#endif
2022 2015
2023 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
2024 { 2017 {
2025#if ISO_14755 2018#if ISO_14755
2026 // 5.4 2019 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2021 return;
… …
2079 v = ev.button == Button4 ? UP : DN; 2072 v = ev.button == Button4 ? UP : DN;
2080 2073
2081 if (ev.state & ShiftMask) 2074 if (ev.state & ShiftMask)
2082 i = 1; 2075 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2076 else if (options & Opt_mouseWheelScrollPage)
2084 i = TermWin.nrow - 1; 2077 i = nrow - 1;
2085 else 2078 else
2086 i = 5; 2079 i = 5;
2087 2080
2088# ifdef MOUSE_SLIP_WHEELING 2081# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2082 if (ev.state & ControlMask)
2090 { 2083 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2084 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2085 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; 2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2087
2095 if (slip_wheel_ev.at < NOW) 2088 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2090
2098 slip_wheel_ev.start (); 2091 slip_wheel_ev.start ();
… …
2380 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
2381 2374
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
2384 2377
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2379
2387 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
2388 { 2381 {
2389 if (am_transparent) 2382 if (am_transparent)
2390 { 2383 {
2391 pchanged = 1; 2384 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
2394 } 2387 }
2395 2388
2396 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
2397 } 2390 }
… …
2438 Window cr; 2431 Window cr;
2439 XImage *image; 2432 XImage *image;
2440 GC gc; 2433 GC gc;
2441 XGCValues gcvalue; 2434 XGCValues gcvalue;
2442 2435
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2440 nx = ny = 0;
2448 2441
… …
2474 if (image == NULL) 2467 if (image == NULL)
2475 { 2468 {
2476 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2477 { 2470 {
2478 pchanged = 1; 2471 pchanged = 1;
2479 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2480 { 2473 {
2481 XFreePixmap (disp, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2475 pixmap = None;
2483 } 2476 }
2484 } 2477 }
2485 2478
2486 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2487 } 2480 }
2488 else 2481 else
2489 { 2482 {
2490 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2492 2485
2493#if TINTING 2486#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2487 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2488 {
2496 unsigned short rm, gm, bm; 2489 unsigned short rm, gm, bm;
… …
2500 2493
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2494 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2495 }
2503#endif 2496#endif
2504 2497
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2499 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2502 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2503 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2504 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2506 XClearWindow (disp, parent[0]);
2514 2507
2515 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2509 pchanged = 1;
2517 2510
2518 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2519 } 2512 }
2520 } 2513 }
2521 2514
2522 if (am_pixmap_trans) 2515 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2517 else
2525 { 2518 {
2526 unsigned int n; 2519 unsigned int n;
2527 /* 2520 /*
2528 * InheritPixmap transparency 2521 * InheritPixmap transparency
2529 */ 2522 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2524 {
2532 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2535 XFree (list); 2528 XFree (list);
2536 2529
2537 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2538 { 2531 {
2539 if (oldp != None) 2532 if (oldp != None)
2540 pchanged = 1; 2533 pchanged = 1;
2541 2534
2542 break; 2535 break;
2543 } 2536 }
2544 2537
2545 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2546 pchanged = 1; 2539 pchanged = 1;
2547 } 2540 }
2548 2541
2549 n = 0; 2542 n = 0;
2550 2543
2551 if (pchanged) 2544 if (pchanged)
2552 { 2545 {
2553 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2554 { 2547 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2548 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2550 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2552 break;
2560 } 2553 }
2561 } 2554 }
2562 } 2555 }
2563 2556
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2558 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2561 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2570 } 2563 }
2571 else 2564 else
2572 { 2565 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2568 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2569 sleep (1);
2577#endif 2570#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2579 { 2572 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2574 XClearWindow (disp, parent[n]);
2582 } 2575 }
2583 2576
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2578 am_transparent = 1;
2586 } 2579 }
2587 2580
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2582 parent[i] = None;
2590 } 2583 }
2591 2584
2592 if (scrollBar.win) 2585 if (scrollBar.win)
2593 { 2586 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2639 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2640 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2641 bool refreshnow = false;
2649 int nlines = 0; 2642 int nlines = 0;
2650 unicode_t *str = buf; 2643 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2645
2653 for (;;) 2646 for (;;)
2654 { 2647 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2649 break;
… …
2663 nlines++; 2656 nlines++;
2664 2657
2665 refresh_count++; 2658 refresh_count++;
2666 2659
2667 if (!(options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2662 {
2670 refreshnow = true; 2663 refreshnow = true;
2671 ch = NOCHAR; 2664 ch = NOCHAR;
2672 break; 2665 break;
2673 } 2666 }
2674 2667
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= nrow - 1)
2677 { 2670 {
2678 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2679 nlines = 0; 2672 nlines = 0;
2680 str = buf; 2673 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2674 eol = str + min (ncol, UBUFSIZ);
2682 } 2675 }
2683 2676
2684 if (str >= eol) 2677 if (str >= eol)
2685 { 2678 {
2686 if (eol >= buf + UBUFSIZ) 2679 if (eol >= buf + UBUFSIZ)
2687 { 2680 {
2688 ch = NOCHAR; 2681 ch = NOCHAR;
2689 break; 2682 break;
2690 } 2683 }
2691 else 2684 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2685 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2686 }
2694 2687
2695 } 2688 }
2696 2689
2697 seq_begin = cmdbuf_ptr; 2690 seq_begin = cmdbuf_ptr;
… …
3358 3351
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3357 break;
3365 3358
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
3368 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3493 { 3486 {
3494 /* 3487 /*
3495 * commands 3488 * commands
3496 */ 3489 */
3497 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
3499 break; 3492 break;
3500 case 2: /* iconify window */ 3493 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3494 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3495 break;
3503 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3498 break;
3506 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3501 break;
3509 case 5: /* raise window */ 3502 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
3511 break; 3504 break;
3512 case 6: /* lower window */ 3505 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
3514 break; 3507 break;
3515 case 7: /* refresh window */ 3508 case 7: /* refresh window */
3516 scr_touch (true); 3509 scr_touch (true);
3517 break; 3510 break;
3518 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
3521 break; 3514 break;
3522 3515
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3516 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3517 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
3528 break; 3521 break;
3529 3522
3530 3523
3531 /* 3524 /*
3532 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
3533 */ 3526 */
3534 case 11: /* report window state */ 3527 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3530 break;
3538 case 13: /* report window position */ 3531 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3537 break;
3545 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3541 break;
3549 case 18: /* report text area size (chars) */ 3542 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3544 break;
3552 case 19: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3547 break;
3555 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3556 { 3549 {
3557 char *s; 3550 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3553 XFree (s);
3561 } 3554 }
3562 break; 3555 break;
3563 case 21: /* report window title */ 3556 case 21: /* report window title */
3564 { 3557 {
3565 char *s; 3558 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3561 XFree (s);
3569 } 3562 }
3570 break; 3563 break;
3571 } 3564 }
… …
3717 unsigned long bytes_after; 3710 unsigned long bytes_after;
3718 unsigned char *value = 0; 3711 unsigned char *value = 0;
3719 const char *str = ""; 3712 const char *str = "";
3720 3713
3721 if (prop 3714 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3715 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3716 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3717 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3718 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3719 && actual_type != None
3727 && actual_format == 8) 3720 && actual_format == 8)
… …
3739 { 3732 {
3740 *eq = 0; 3733 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3734 set_utf8_property (display->atom (str), eq + 1);
3742 } 3735 }
3743 else 3736 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3737 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3738 display->atom (str));
3746 } 3739 }
3747 break; 3740 break;
3748 3741
3749 case XTerm_Color: 3742 case XTerm_Color:
… …
3874 case URxvt_italicFont: 3867 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3868 case URxvt_boldItalicFont:
3876#endif 3869#endif
3877 if (query) 3870 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3873 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3874 resp);
3882 else 3875 else
3883 { 3876 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3878
… …
4052 */ 4045 */
4053 PrivMode (1, PrivMode_vt52); 4046 PrivMode (1, PrivMode_vt52);
4054 break; 4047 break;
4055 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4051 break;
4059 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
4060 if (state) 4053 if (state)
4061 options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
4062 else 4055 else

Diff Legend

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