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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.216 by root, Tue Dec 27 01:25:42 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
… …
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 scr_overlay_new (0, -1, width, len + 2);
193 208
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 210
196 for (int y = 0; y < len; y++) 211 for (int y = 0; y < len; y++)
197 { 212 {
… …
208#endif 223#endif
209 scr_overlay_set (11, y, ch, r); 224 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 225 scr_overlay_set (12, y, NOCHAR, r);
211 } 226 }
212 227
228 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 229 scr_overlay_set (0, len + 1, fname);
214 230
215 free (fname); 231 free (fname);
216 232
217#if ENABLE_COMBINING 233#if ENABLE_COMBINING
218 if (alloc) 234 if (alloc)
… …
366#ifdef KEYSYM_RESOURCE 382#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 383 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 384 return;
369#endif 385#endif
370 386
371 if (TermWin.saveLines) 387 if (saveLines)
372 { 388 {
373#ifdef UNSHIFTED_SCROLLKEYS 389#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 390 if (!ctrl && !meta)
375#else 391#else
376 if (IS_SCROLL_MOD) 392 if (IS_SCROLL_MOD)
377#endif 393#endif
378 { 394 {
379 int lnsppg; 395 int lnsppg;
380 396
381#ifdef PAGING_CONTEXT_LINES 397#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 398 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 399#else
384 lnsppg = TermWin.nrow * 4 / 5; 400 lnsppg = nrow * 4 / 5;
385#endif 401#endif
386 if (keysym == XK_Prior) 402 if (keysym == XK_Prior)
387 { 403 {
388 scr_page (UP, lnsppg); 404 scr_page (UP, lnsppg);
389 return; 405 return;
… …
845 861
846 if (len <= 0) 862 if (len <= 0)
847 return; /* not mapped */ 863 return; /* not mapped */
848 864
849 if (options & Opt_scrollTtyKeypress) 865 if (options & Opt_scrollTtyKeypress)
850 if (TermWin.view_start) 866 if (view_start)
851 { 867 {
852 TermWin.view_start = 0; 868 view_start = 0;
853 want_refresh = 1; 869 want_refresh = 1;
854 } 870 }
855 871
856 /* 872 /*
857 * these modifications only affect the static keybuffer 873 * these modifications only affect the static keybuffer
… …
1034{ 1050{
1035 if (mouse_slip_wheel_speed == 0 1051 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1053 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1054 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1055 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1056 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1057 mouse_slip_wheel_speed = 0;
1042 1058
1043 refresh_type |= SMOOTH_REFRESH; 1059 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1060 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1067 if (n > 0) 1083 if (n > 0)
1068 { 1084 {
1069 cmdbuf_endp += n; 1085 cmdbuf_endp += n;
1070 return true; 1086 return true;
1071 } 1087 }
1072 else if (n < 0 && errno != EAGAIN) 1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1089 {
1090 pty_ev.stop ();
1091
1092 if (!(options & Opt_hold))
1073 destroy (); 1093 destroy ();
1094 }
1074 1095
1075 return false; 1096 return false;
1076} 1097}
1077 1098
1078void 1099void
… …
1092} 1113}
1093 1114
1094void 1115void
1095rxvt_term::pointer_unblank () 1116rxvt_term::pointer_unblank ()
1096{ 1117{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1118 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1119 recolour_cursor ();
1099 1120
1100#ifdef POINTER_BLANK 1121#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1122 hidden_pointer = 0;
1102 1123
… …
1110rxvt_term::pointer_blank () 1131rxvt_term::pointer_blank ()
1111{ 1132{
1112 if (! (options & Opt_pointerBlank)) 1133 if (! (options & Opt_pointerBlank))
1113 return; 1134 return;
1114 1135
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1136 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1137 XFlush (display->display);
1117 1138
1118 hidden_pointer = 1; 1139 hidden_pointer = 1;
1119} 1140}
1120 1141
… …
1422 case FocusOut: 1443 case FocusOut:
1423 focus_out (); 1444 focus_out ();
1424 break; 1445 break;
1425 1446
1426 case ConfigureNotify: 1447 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1448 if (ev.xconfigure.window == parent[0])
1428 { 1449 {
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)); 1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ;
1438 1452
1439 if (szHint.width != width || szHint.height != height) 1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1454 {
1441 seen_resize = 1; 1455 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1457 }
1444 1458
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1460 if (options & Opt_transparent)
1447 check_our_parents (); 1461 check_our_parents ();
… …
1468 case SelectionRequest: 1482 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1470 break; 1484 break;
1471 1485
1472 case UnmapNotify: 1486 case UnmapNotify:
1473 TermWin.mapped = 0; 1487 mapped = 0;
1474#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1476#endif 1490#endif
1477 break; 1491 break;
1478 1492
1479 case MapNotify: 1493 case MapNotify:
1480 TermWin.mapped = 1; 1494 mapped = 1;
1481#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1497#endif
1484 break; 1498 break;
1485 1499
… …
1489 break; 1503 break;
1490#endif /* TRANSPARENT */ 1504#endif /* TRANSPARENT */
1491 1505
1492 case GraphicsExpose: 1506 case GraphicsExpose:
1493 case Expose: 1507 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1508 if (ev.xany.window == vt)
1495 { 1509 {
1496 do 1510 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1514
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1516
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1506 1520
1507 scr_refresh (refresh_type); 1521 scr_refresh (refresh_type);
1508 } 1522 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1539 menubar_expose ();
1526#endif 1540#endif
1527 1541
1528#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1543 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1544 XClearWindow (disp, ev.xany.window);
1531#endif 1545#endif
1532 } 1546 }
1533 break; 1547 break;
1534 1548
… …
1545 } 1559 }
1546#endif 1560#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1562 break;
1549 1563
1550 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1551 { 1565 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1566 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1567 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1569 ;
1556 1570
1557 XQueryPointer (disp, TermWin.vt, 1571 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1572 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1573 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1574 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1575 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1576#ifdef MOUSE_THRESHOLD
… …
1574#endif 1588#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1589 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1590 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1591
1578#ifdef SELECTION_SCROLLING 1592#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1593 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1594 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1595 {
1582 int dist; 1596 int dist;
1583 1597
1584 /* don't clobber the current delay if we are 1598 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1599 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1607 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1608 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1609 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1610
1597 /* calc number of lines to scroll */ 1611 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1612 if (ev.xbutton.y < int_bwidth)
1599 { 1613 {
1600 scroll_selection_dir = UP; 1614 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1615 dist = int_bwidth - ev.xbutton.y;
1602 } 1616 }
1603 else 1617 else
1604 { 1618 {
1605 scroll_selection_dir = DN; 1619 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1620 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1621 }
1608 1622
1609 scroll_selection_lines = Pixel2Height (dist) 1623 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1624 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1625 + 1;
1612 MIN_IT (scroll_selection_lines, 1626 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1627 SELECTION_SCROLL_MAX_LINES);
1614 } 1628 }
1615 else 1629 else
1616 { 1630 {
1617 /* we are within the text window, so we 1631 /* we are within the text window, so we
… …
1648} 1662}
1649 1663
1650void 1664void
1651rxvt_term::focus_in () 1665rxvt_term::focus_in ()
1652{ 1666{
1653 if (!TermWin.focus) 1667 if (!focus)
1654 { 1668 {
1655 TermWin.focus = 1; 1669 focus = 1;
1656 want_refresh = 1; 1670 want_refresh = 1;
1657#if USE_XIM 1671#if USE_XIM
1658 if (Input_Context != NULL) 1672 if (Input_Context != NULL)
1659 { 1673 {
1660 IMSetStatusPosition (); 1674 IMSetStatusPosition ();
… …
1676} 1690}
1677 1691
1678void 1692void
1679rxvt_term::focus_out () 1693rxvt_term::focus_out ()
1680{ 1694{
1681 if (TermWin.focus) 1695 if (focus)
1682 { 1696 {
1683 TermWin.focus = 0; 1697 focus = 0;
1684 want_refresh = 1; 1698 want_refresh = 1;
1685 1699
1686#if ENABLE_FRILLS || ISO_14755 1700#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1701 iso14755buf = 0;
1688#endif 1702#endif
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1759 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1760
1747 /* 1761 /*
1748 * VT window processing of button press 1762 * VT window processing of button press
1749 */ 1763 */
1750 if (ev.window == TermWin.vt) 1764 if (ev.window == vt)
1751 { 1765 {
1752#if ISO_14755 1766#if ISO_14755
1753 // 5.4 1767 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1769 {
… …
1960 case Button3: 1974 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1975 if (scrollBar.style != R_SB_XTERM)
1962 { 1976 {
1963 if (scrollbar_above_slider (ev.y)) 1977 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1978# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1979 scr_page (UP, nrow - 1);
1966# else 1980# else
1967 scr_page (UP, TermWin.nrow / 4); 1981 scr_page (UP, nrow / 4);
1968# endif 1982# endif
1969 else if (scrollbar_below_slider (ev.y)) 1983 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1985 scr_page (DN, nrow - 1);
1972# else 1986# else
1973 scr_page (DN, TermWin.nrow / 4); 1987 scr_page (DN, nrow / 4);
1974# endif 1988# endif
1975 else 1989 else
1976 scrollBar.setMotion (); 1990 scrollBar.setMotion ();
1977 } 1991 }
1978 else 1992 else
1979 { 1993 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 1994 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 1995 (nrow
1982 * scrollbar_position (ev.y) 1996 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 1997 / scrollbar_size ()));
1984 } 1998 }
1985 1999
1986 break; 2000 break;
… …
2018#ifdef SELECTION_SCROLLING 2032#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2033 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2034 sel_scroll_ev.stop();
2021#endif 2035#endif
2022 2036
2023 if (ev.window == TermWin.vt) 2037 if (ev.window == vt)
2024 { 2038 {
2025#if ISO_14755 2039#if ISO_14755
2026 // 5.4 2040 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2042 return;
… …
2079 v = ev.button == Button4 ? UP : DN; 2093 v = ev.button == Button4 ? UP : DN;
2080 2094
2081 if (ev.state & ShiftMask) 2095 if (ev.state & ShiftMask)
2082 i = 1; 2096 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2097 else if (options & Opt_mouseWheelScrollPage)
2084 i = TermWin.nrow - 1; 2098 i = nrow - 1;
2085 else 2099 else
2086 i = 5; 2100 i = 5;
2087 2101
2088# ifdef MOUSE_SLIP_WHEELING 2102# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2103 if (ev.state & ControlMask)
2090 { 2104 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2105 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2106 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; 2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2108
2095 if (slip_wheel_ev.at < NOW) 2109 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2111
2098 slip_wheel_ev.start (); 2112 slip_wheel_ev.start ();
… …
2380 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2381 2395
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2396 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2397 rootdepth = wrootattr.depth;
2384 2398
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2399 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2400
2387 if (rootdepth != wattr.depth) 2401 if (rootdepth != wattr.depth)
2388 { 2402 {
2389 if (am_transparent) 2403 if (am_transparent)
2390 { 2404 {
2391 pchanged = 1; 2405 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2407 am_transparent = am_pixmap_trans = 0;
2394 } 2408 }
2395 2409
2396 return pchanged; /* Don't try any more */ 2410 return pchanged; /* Don't try any more */
2397 } 2411 }
… …
2438 Window cr; 2452 Window cr;
2439 XImage *image; 2453 XImage *image;
2440 GC gc; 2454 GC gc;
2441 XGCValues gcvalue; 2455 XGCValues gcvalue;
2442 2456
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2457 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2458 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2459 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2460 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2461 nx = ny = 0;
2448 2462
… …
2458 nh += sy; 2472 nh += sy;
2459 ny = -sy; 2473 ny = -sy;
2460 sy = 0; 2474 sy = 0;
2461 } 2475 }
2462 2476
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2477 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2478 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2479
2466 XSync (disp, False); 2480 XSync (disp, False);
2467 allowedxerror = -1; 2481 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2483
… …
2474 if (image == NULL) 2488 if (image == NULL)
2475 { 2489 {
2476 if (am_transparent && am_pixmap_trans) 2490 if (am_transparent && am_pixmap_trans)
2477 { 2491 {
2478 pchanged = 1; 2492 pchanged = 1;
2479 if (TermWin.pixmap != None) 2493 if (pixmap != None)
2480 { 2494 {
2481 XFreePixmap (disp, TermWin.pixmap); 2495 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2496 pixmap = None;
2483 } 2497 }
2484 } 2498 }
2485 2499
2486 am_pixmap_trans = 0; 2500 am_pixmap_trans = 0;
2487 } 2501 }
2488 else 2502 else
2489 { 2503 {
2490 if (TermWin.pixmap != None) 2504 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2505 XFreePixmap (disp, pixmap);
2492 2506
2493#if TINTING 2507#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2508 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2509 {
2496 unsigned short rm, gm, bm; 2510 unsigned short rm, gm, bm;
… …
2500 2514
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2515 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2516 }
2503#endif 2517#endif
2504 2518
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2519 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2520 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2522 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2523 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2524 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2525 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2527 XClearWindow (disp, parent[0]);
2514 2528
2515 if (!am_transparent || !am_pixmap_trans) 2529 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2530 pchanged = 1;
2517 2531
2518 am_transparent = am_pixmap_trans = 1; 2532 am_transparent = am_pixmap_trans = 1;
2519 } 2533 }
2520 } 2534 }
2521 2535
2522 if (am_pixmap_trans) 2536 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2538 else
2525 { 2539 {
2526 unsigned int n; 2540 unsigned int n;
2527 /* 2541 /*
2528 * InheritPixmap transparency 2542 * InheritPixmap transparency
2529 */ 2543 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2545 {
2532 oldp = TermWin.parent[i]; 2546 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2547 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2548 &parent[i], &list, &n);
2535 XFree (list); 2549 XFree (list);
2536 2550
2537 if (TermWin.parent[i] == display->root) 2551 if (parent[i] == display->root)
2538 { 2552 {
2539 if (oldp != None) 2553 if (oldp != None)
2540 pchanged = 1; 2554 pchanged = 1;
2541 2555
2542 break; 2556 break;
2543 } 2557 }
2544 2558
2545 if (oldp != TermWin.parent[i]) 2559 if (oldp != parent[i])
2546 pchanged = 1; 2560 pchanged = 1;
2547 } 2561 }
2548 2562
2549 n = 0; 2563 n = 0;
2550 2564
2551 if (pchanged) 2565 if (pchanged)
2552 { 2566 {
2553 for (; n < (unsigned int)i; n++) 2567 for (; n < (unsigned int)i; n++)
2554 { 2568 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2569 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2571 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2573 break;
2560 } 2574 }
2561 } 2575 }
2562 } 2576 }
2563 2577
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2578 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2579 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]); 2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2582 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2583 /* XXX: also turn off Opt_transparent? */
2570 } 2584 }
2571 else 2585 else
2572 { 2586 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2589 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2590 sleep (1);
2577#endif 2591#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2592 for (n = 0; n < (unsigned int)i; n++)
2579 { 2593 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2595 XClearWindow (disp, parent[n]);
2582 } 2596 }
2583 2597
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2599 am_transparent = 1;
2586 } 2600 }
2587 2601
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2603 parent[i] = None;
2590 } 2604 }
2591 2605
2592 if (scrollBar.win) 2606 if (scrollBar.win)
2593 { 2607 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2660 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2661 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2662 bool refreshnow = false;
2649 int nlines = 0; 2663 int nlines = 0;
2650 unicode_t *str = buf; 2664 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2665 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2666
2653 for (;;) 2667 for (;;)
2654 { 2668 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2670 break;
… …
2663 nlines++; 2677 nlines++;
2664 2678
2665 refresh_count++; 2679 refresh_count++;
2666 2680
2667 if (!(options & Opt_jumpScroll) 2681 if (!(options & Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2683 {
2670 refreshnow = true; 2684 refreshnow = true;
2671 ch = NOCHAR; 2685 ch = NOCHAR;
2672 break; 2686 break;
2673 } 2687 }
2674 2688
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2689 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2690 if (nlines >= nrow - 1)
2677 { 2691 {
2678 scr_add_lines (buf, nlines, str - buf); 2692 scr_add_lines (buf, nlines, str - buf);
2679 nlines = 0; 2693 nlines = 0;
2680 str = buf; 2694 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2695 eol = str + min (ncol, UBUFSIZ);
2682 } 2696 }
2683 2697
2684 if (str >= eol) 2698 if (str >= eol)
2685 { 2699 {
2686 if (eol >= buf + UBUFSIZ) 2700 if (eol >= buf + UBUFSIZ)
2687 { 2701 {
2688 ch = NOCHAR; 2702 ch = NOCHAR;
2689 break; 2703 break;
2690 } 2704 }
2691 else 2705 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2706 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2707 }
2694 2708
2695 } 2709 }
2696 2710
2697 seq_begin = cmdbuf_ptr; 2711 seq_begin = cmdbuf_ptr;
… …
3358 3372
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3373 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3374 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3378 break;
3365 3379
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3381 tt_write ((const unsigned char *)VT100_ANS,
3368 (unsigned int) (sizeof (VT100_ANS) - 1)); 3382 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3493 { 3507 {
3494 /* 3508 /*
3495 * commands 3509 * commands
3496 */ 3510 */
3497 case 1: /* deiconify window */ 3511 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3512 XMapWindow (disp, parent[0]);
3499 break; 3513 break;
3500 case 2: /* iconify window */ 3514 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3515 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3516 break;
3503 case 3: /* set position (pixels) */ 3517 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3518 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3519 break;
3506 case 4: /* set size (pixels) */ 3520 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3522 break;
3509 case 5: /* raise window */ 3523 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3524 XRaiseWindow (disp, parent[0]);
3511 break; 3525 break;
3512 case 6: /* lower window */ 3526 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3527 XLowerWindow (disp, parent[0]);
3514 break; 3528 break;
3515 case 7: /* refresh window */ 3529 case 7: /* refresh window */
3516 scr_touch (true); 3530 scr_touch (true);
3517 break; 3531 break;
3518 case 8: /* set size (chars) */ 3532 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3533 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3534 (unsigned int) (args[1] * fheight));
3521 break; 3535 break;
3522 3536
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3537 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3538 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3539 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3540 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3541 (unsigned int) (args[1] * fheight));
3528 break; 3542 break;
3529 3543
3530 3544
3531 /* 3545 /*
3532 * reports - some output format copied from XTerm 3546 * reports - some output format copied from XTerm
3533 */ 3547 */
3534 case 11: /* report window state */ 3548 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3549 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3551 break;
3538 case 13: /* report window position */ 3552 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3554 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3555 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3556 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3557 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3558 break;
3545 case 14: /* report window size (pixels) */ 3559 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3560 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3562 break;
3549 case 18: /* report text area size (chars) */ 3563 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3564 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3565 break;
3552 case 19: /* report window size (chars) */ 3566 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3567 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3568 break;
3555 case 20: /* report icon label */ 3569 case 20: /* report icon label */
3556 { 3570 {
3557 char *s; 3571 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3572 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3574 XFree (s);
3561 } 3575 }
3562 break; 3576 break;
3563 case 21: /* report window title */ 3577 case 21: /* report window title */
3564 { 3578 {
3565 char *s; 3579 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3580 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3582 XFree (s);
3569 } 3583 }
3570 break; 3584 break;
3571 } 3585 }
… …
3717 unsigned long bytes_after; 3731 unsigned long bytes_after;
3718 unsigned char *value = 0; 3732 unsigned char *value = 0;
3719 const char *str = ""; 3733 const char *str = "";
3720 3734
3721 if (prop 3735 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3736 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3737 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3738 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3739 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3740 && actual_type != None
3727 && actual_format == 8) 3741 && actual_format == 8)
… …
3739 { 3753 {
3740 *eq = 0; 3754 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3755 set_utf8_property (display->atom (str), eq + 1);
3742 } 3756 }
3743 else 3757 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3758 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3759 display->atom (str));
3746 } 3760 }
3747 break; 3761 break;
3748 3762
3749 case XTerm_Color: 3763 case XTerm_Color:
… …
3874 case URxvt_italicFont: 3888 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3889 case URxvt_boldItalicFont:
3876#endif 3890#endif
3877 if (query) 3891 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3892 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3894 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3895 resp);
3882 else 3896 else
3883 { 3897 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3898 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3899
… …
4052 */ 4066 */
4053 PrivMode (1, PrivMode_vt52); 4067 PrivMode (1, PrivMode_vt52);
4054 break; 4068 break;
4055 case 3: /* 80/132 */ 4069 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4070 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4071 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4072 break;
4059 case 4: /* smooth scrolling */ 4073 case 4: /* smooth scrolling */
4060 if (state) 4074 if (state)
4061 options &= ~Opt_jumpScroll; 4075 options &= ~Opt_jumpScroll;
4062 else 4076 else
… …
4379 } 4393 }
4380 4394
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4395 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4396 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4398 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4399}
4387 4400
4388/*----------------------- end-of-file (C source) -----------------------*/ 4401/*----------------------- end-of-file (C source) -----------------------*/
4389 4402

Diff Legend

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