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.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.225 by root, Sun Jan 1 13:35:14 2006 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
53#ifdef KEYSYM_RESOURCE 57#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 58# include "keyboard.h"
55#endif 59#endif
56 60
57#include <csignal> 61#include <csignal>
… …
135rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
136{ 140{
137 x = Pixel2Col (x); 141 x = Pixel2Col (x);
138 y = Pixel2Row (y); 142 y = Pixel2Row (y);
139 143
140 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 146 return;
143 147
144 for (;;) 148 for (;;)
145 { 149 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
147 153
148 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
149 { 155 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 156 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
153 break; 158 break;
154 } 159 }
155 160
156 x--; 161 x--;
157 } 162 }
158
159} 163}
160#endif
161 164
162#if ENABLE_OVERLAY
163void 165void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 169 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 170 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 171 int len;
170 172
171 fname = rxvt_utf8towcs (f->name); 173 fname = rxvt_utf8towcs (f->name);
172 174
173#if ENABLE_COMBINING 175# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
175 { 177 {
176 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
179 } 181 }
180 else 182 else
181#endif 183# endif
182 { 184 {
183 ch2 = ch; 185 ch2 = ch;
184 186
185 alloc = 0; 187 alloc = 0;
186 chr = &ch2; 188 chr = &ch2;
187 len = 1; 189 len = 1;
188 } 190 }
189 191
192 char attr[80]; // plenty
193
194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
190 int width = wcswidth (fname, wcslen (fname)); 204 int width = wcswidth (fname, wcslen (fname));
191 205
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
215 scr_overlay_new (x, y, width, len + 2);
193 216
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 218
196 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
197 { 220 {
… …
200 ch = *chr++; 223 ch = *chr++;
201 224
202 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
205#if !UNICODE3 228# if !UNICODE3
206 if (ch >= 0x10000) 229 if (ch >= 0x10000)
207 ch = 0xfffd; 230 ch = 0xfffd;
208#endif 231# endif
209 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 235
236 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 237 scr_overlay_set (0, len + 1, fname);
214 238
215 free (fname); 239 free (fname);
216 240
217#if ENABLE_COMBINING 241# if ENABLE_COMBINING
218 if (alloc) 242 if (alloc)
219 delete [] alloc; 243 delete [] alloc;
220#endif 244# endif
221} 245}
222#endif 246#endif
223 247
224void 248void
225rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
366#ifdef KEYSYM_RESOURCE 390#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 391 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 392 return;
369#endif 393#endif
370 394
371 if (TermWin.saveLines) 395 if (saveLines)
372 { 396 {
373#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 398 if (!ctrl && !meta)
375#else 399#else
376 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
377#endif 401#endif
378 { 402 {
379 int lnsppg; 403 int lnsppg;
380 404
381#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 407#else
384 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
385#endif 409#endif
386 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
387 { 411 {
388 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
389 return; 413 return;
… …
844 } 868 }
845 869
846 if (len <= 0) 870 if (len <= 0)
847 return; /* not mapped */ 871 return; /* not mapped */
848 872
849 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 874 if (view_start)
851 { 875 {
852 TermWin.view_start = 0; 876 view_start = 0;
853 want_refresh = 1; 877 want_refresh = 1;
854 } 878 }
855 879
856 /* 880 /*
857 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
1034{ 1058{
1035 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1062 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1063 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1064 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1065 mouse_slip_wheel_speed = 0;
1042 1066
1043 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1068 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1060 1084
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1064 1088
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1090
1067 if (n > 0) 1091 if (r > 0)
1068 { 1092 {
1069 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1070 return true; 1094 return true;
1071 } 1095 }
1072 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
1073 destroy (); 1107 destroy ();
1108 }
1074 1109
1075 return false; 1110 return false;
1076} 1111}
1077 1112
1078void 1113void
… …
1092} 1127}
1093 1128
1094void 1129void
1095rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1096{ 1131{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1133 recolour_cursor ();
1099 1134
1100#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1136 hidden_pointer = 0;
1102 1137
1103 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1140#endif
1106} 1141}
1107 1142
1108#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1109void 1144void
1110rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1111{ 1146{
1112 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1113 return; 1148 return;
1114 1149
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1151 XFlush (display->display);
1117 1152
1118 hidden_pointer = 1; 1153 hidden_pointer = 1;
1119} 1154}
1120 1155
… …
1215 1250
1216 SET_R (this); 1251 SET_R (this);
1217 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1218 1253
1219#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1221 { 1256 {
1222 if (hidden_cursor) 1257 if (hidden_cursor)
1223 { 1258 {
1224 hidden_cursor = 0; 1259 hidden_cursor = 0;
1225 want_refresh = 1; 1260 want_refresh = 1;
… …
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 } 1264 }
1230#endif 1265#endif
1231 1266
1232#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1234 { 1269 {
1235 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1238 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1422 case FocusOut: 1457 case FocusOut:
1423 focus_out (); 1458 focus_out ();
1424 break; 1459 break;
1425 1460
1426 case ConfigureNotify: 1461 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1462 if (ev.xconfigure.window == parent[0])
1428 { 1463 {
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)); 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ;
1438 1466
1439 if (szHint.width != width || szHint.height != height) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1468 {
1441 seen_resize = 1; 1469 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1471 }
1444 1472
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1475 check_our_parents ();
1448#endif 1476#endif
1449 } 1477 }
1450 break; 1478 break;
1451 1479
… …
1468 case SelectionRequest: 1496 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1470 break; 1498 break;
1471 1499
1472 case UnmapNotify: 1500 case UnmapNotify:
1473 TermWin.mapped = 0; 1501 mapped = 0;
1474#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1476#endif 1504#endif
1477 break; 1505 break;
1478 1506
1479 case MapNotify: 1507 case MapNotify:
1480 TermWin.mapped = 1; 1508 mapped = 1;
1481#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1511#endif
1484 break; 1512 break;
1485 1513
… …
1489 break; 1517 break;
1490#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1491 1519
1492 case GraphicsExpose: 1520 case GraphicsExpose:
1493 case Expose: 1521 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1495 { 1523 {
1496 do 1524 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1528
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1530
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1506 1534
1507 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1508 } 1536 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1553 menubar_expose ();
1526#endif 1554#endif
1527 1555
1528#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1531#endif 1559#endif
1532 } 1560 }
1533 break; 1561 break;
1534 1562
… …
1545 } 1573 }
1546#endif 1574#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1576 break;
1549 1577
1550 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1551 { 1579 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1581 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1583 ;
1556 1584
1557 XQueryPointer (disp, TermWin.vt, 1585 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1589 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1574#endif 1602#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1605
1578#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1609 {
1582 int dist; 1610 int dist;
1583 1611
1584 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1624
1597 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1599 { 1627 {
1600 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1602 } 1630 }
1603 else 1631 else
1604 { 1632 {
1605 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1635 }
1608 1636
1609 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1639 + 1;
1612 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1614 } 1642 }
1615 else 1643 else
1616 { 1644 {
1617 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1648} 1676}
1649 1677
1650void 1678void
1651rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1652{ 1680{
1653 if (!TermWin.focus) 1681 if (!focus)
1654 { 1682 {
1655 TermWin.focus = 1; 1683 focus = 1;
1656 want_refresh = 1; 1684 want_refresh = 1;
1657#ifdef USE_XIM 1685#if USE_XIM
1658 if (Input_Context != NULL) 1686 if (Input_Context != NULL)
1659 { 1687 {
1660 IMSetStatusPosition (); 1688 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1689 XSetICFocus (Input_Context);
1662 } 1690 }
1663#endif 1691#endif
1664#ifdef CURSOR_BLINK 1692#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1693 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1695#endif
1668#ifdef OFF_FOCUS_FADING 1696#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1697 if (rs[Rs_fade])
1670 { 1698 {
1671 pix_colors = pix_colors_focused; 1699 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1700 scr_recolour ();
1673 } 1701 }
… …
1676} 1704}
1677 1705
1678void 1706void
1679rxvt_term::focus_out () 1707rxvt_term::focus_out ()
1680{ 1708{
1681 if (TermWin.focus) 1709 if (focus)
1682 { 1710 {
1683 TermWin.focus = 0; 1711 focus = 0;
1684 want_refresh = 1; 1712 want_refresh = 1;
1685 1713
1686#if ENABLE_FRILLS || ISO_14755 1714#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1715 iso14755buf = 0;
1688#endif 1716#endif
1689#if ENABLE_OVERLAY 1717#if ENABLE_OVERLAY
1690 scr_overlay_off (); 1718 scr_overlay_off ();
1691#endif 1719#endif
1692#ifdef USE_XIM 1720#if USE_XIM
1693 if (Input_Context != NULL) 1721 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1722 XUnsetICFocus (Input_Context);
1695#endif 1723#endif
1696#ifdef CURSOR_BLINK 1724#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1725 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1726 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1727 hidden_cursor = 0;
1700#endif 1728#endif
1701#ifdef OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1703 { 1731 {
1704 pix_colors = pix_colors_unfocused; 1732 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1733 scr_recolour ();
1706 } 1734 }
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1755 return;
1728 1756
1729 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1730 case ReparentNotify: 1758 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1733 break; 1761 break;
1734 } 1762 }
1735} 1763}
1736#endif 1764#endif
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1774
1747 /* 1775 /*
1748 * VT window processing of button press 1776 * VT window processing of button press
1749 */ 1777 */
1750 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1751 { 1779 {
1752#if ISO_14755 1780#if ISO_14755
1753 // 5.4 1781 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1783 {
… …
1960 case Button3: 1988 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1962 { 1990 {
1963 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1966# else 1994# else
1967 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1968# endif 1996# endif
1969 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1972# else 2000# else
1973 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1974# endif 2002# endif
1975 else 2003 else
1976 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1977 } 2005 }
1978 else 2006 else
1979 { 2007 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2009 (nrow
1982 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2011 / scrollbar_size ()));
1984 } 2012 }
1985 2013
1986 break; 2014 break;
… …
2018#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
2021#endif 2049#endif
2022 2050
2023 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
2024 { 2052 {
2025#if ISO_14755 2053#if ISO_14755
2026 // 5.4 2054 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2056 return;
… …
2078 2106
2079 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2080 2108
2081 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2082 i = 1; 2110 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2085 else 2113 else
2086 i = 5; 2114 i = 5;
2087 2115
2088# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2090 { 2118 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2120 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; 2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2122
2095 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2125
2098 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
… …
2374 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2403 dDisp;
2376 2404
2377 pchanged = 0; 2405 pchanged = 0;
2378 2406
2379 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2381 2409
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2384 2412
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2414
2387 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2388 { 2416 {
2389 if (am_transparent) 2417 if (am_transparent)
2390 { 2418 {
2391 pchanged = 1; 2419 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2394 } 2422 }
2395 2423
2396 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2397 } 2425 }
… …
2438 Window cr; 2466 Window cr;
2439 XImage *image; 2467 XImage *image;
2440 GC gc; 2468 GC gc;
2441 XGCValues gcvalue; 2469 XGCValues gcvalue;
2442 2470
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2475 nx = ny = 0;
2448 2476
… …
2458 nh += sy; 2486 nh += sy;
2459 ny = -sy; 2487 ny = -sy;
2460 sy = 0; 2488 sy = 0;
2461 } 2489 }
2462 2490
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2493
2466 XSync (disp, False); 2494 XSync (disp, False);
2467 allowedxerror = -1; 2495 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2497
… …
2474 if (image == NULL) 2502 if (image == NULL)
2475 { 2503 {
2476 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2477 { 2505 {
2478 pchanged = 1; 2506 pchanged = 1;
2479 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2480 { 2508 {
2481 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2510 pixmap = None;
2483 } 2511 }
2484 } 2512 }
2485 2513
2486 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2487 } 2515 }
2488 else 2516 else
2489 { 2517 {
2490 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2492 2520
2493#if TINTING 2521#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2523 {
2496 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
… …
2500 2528
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2530 }
2503#endif 2531#endif
2504 2532
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2538 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2539 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2514 2542
2515 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2544 pchanged = 1;
2517 2545
2518 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2519 } 2547 }
2520 } 2548 }
2521 2549
2522 if (am_pixmap_trans) 2550 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2552 else
2525 { 2553 {
2526 unsigned int n; 2554 unsigned int n;
2527 /* 2555 /*
2528 * InheritPixmap transparency 2556 * InheritPixmap transparency
2529 */ 2557 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2559 {
2532 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2535 XFree (list); 2563 XFree (list);
2536 2564
2537 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2538 { 2566 {
2539 if (oldp != None) 2567 if (oldp != None)
2540 pchanged = 1; 2568 pchanged = 1;
2541 2569
2542 break; 2570 break;
2543 } 2571 }
2544 2572
2545 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2546 pchanged = 1; 2574 pchanged = 1;
2547 } 2575 }
2548 2576
2549 n = 0; 2577 n = 0;
2550 2578
2551 if (pchanged) 2579 if (pchanged)
2552 { 2580 {
2553 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2554 { 2582 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2585 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2587 break;
2560 } 2588 }
2561 } 2589 }
2562 } 2590 }
2563 2591
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2593 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2596 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2570 } 2598 }
2571 else 2599 else
2572 { 2600 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2604 sleep (1);
2577#endif 2605#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2579 { 2607 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2582 } 2610 }
2583 2611
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2613 am_transparent = 1;
2586 } 2614 }
2587 2615
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2617 parent[i] = None;
2590 } 2618 }
2591 2619
2592 if (scrollBar.win) 2620 if (scrollBar.win)
2593 { 2621 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2676 bool refreshnow = false;
2649 int nlines = 0; 2677 int nlines = 0;
2650 unicode_t *str = buf; 2678 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2680
2653 for (;;) 2681 for (;;)
2654 { 2682 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2684 break;
2657 2685
2658 *str++ = ch; 2686 *str++ = ch;
2659 2687
2660 if (ch == C0_LF || str >= eol) 2688 if (ch == C0_LF || str >= eol)
2661 { 2689 {
2690 if (ch == C0_LF)
2662 nlines++; 2691 nlines++;
2692
2663 refresh_count++; 2693 refresh_count++;
2664 2694
2665 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2697 {
2668 refreshnow = true; 2698 refreshnow = true;
2669 ch = NOCHAR; 2699 ch = NOCHAR;
2670 break; 2700 break;
2671 } 2701 }
2672 2702
2673 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2703 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= TermWin.nrow - 1) 2704 if (nlines >= nrow - 1)
2675 { 2705 {
2676 scr_add_lines (buf, nlines, str - buf); 2706 scr_add_lines (buf, nlines, str - buf);
2677 nlines = 0; 2707 nlines = 0;
2678 str = buf; 2708 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ); 2709 eol = str + min (ncol, UBUFSIZ);
2680 } 2710 }
2681 2711
2682 if (str >= eol) 2712 if (str >= eol)
2683 { 2713 {
2684 if (eol >= buf + UBUFSIZ) 2714 if (eol >= buf + UBUFSIZ)
2685 { 2715 {
2686 ch = NOCHAR; 2716 ch = NOCHAR;
2687 break; 2717 break;
2688 } 2718 }
2689 else 2719 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2720 eol = min (eol + ncol, buf + UBUFSIZ);
2691 } 2721 }
2692 2722
2693 } 2723 }
2694 2724
2695 seq_begin = cmdbuf_ptr; 2725 seq_begin = cmdbuf_ptr;
… …
2704 * the number of pages between refreshes is refresh_limit, which 2734 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2735 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2736 */
2707 if (refreshnow) 2737 if (refreshnow)
2708 { 2738 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2740 refresh_limit++;
2711 else 2741 else
2712 { 2742 {
2713 flag = true; 2743 flag = true;
2714 scr_refresh (refresh_type); 2744 scr_refresh (refresh_type);
… …
3356 3386
3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3387 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3358 arg[0] = -arg[0]; 3388 arg[0] = -arg[0];
3359 /* FALLTHROUGH */ 3389 /* FALLTHROUGH */
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3392 break;
3363 3393
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3395 tt_write ((const unsigned char *)VT100_ANS,
3366 (unsigned int) (sizeof (VT100_ANS) - 1)); 3396 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3378 break; 3408 break;
3379 case 6: /* CPR requested */ 3409 case 6: /* CPR requested */
3380 scr_report_position (); 3410 scr_report_position ();
3381 break; 3411 break;
3382 case 7: /* unofficial extension */ 3412 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3413 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3414 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3415 break;
3386 case 8: /* unofficial extension */ 3416 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3418 break;
… …
3491 { 3521 {
3492 /* 3522 /*
3493 * commands 3523 * commands
3494 */ 3524 */
3495 case 1: /* deiconify window */ 3525 case 1: /* deiconify window */
3496 XMapWindow (disp, TermWin.parent[0]); 3526 XMapWindow (disp, parent[0]);
3497 break; 3527 break;
3498 case 2: /* iconify window */ 3528 case 2: /* iconify window */
3499 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3529 XIconifyWindow (disp, parent[0], display->screen);
3500 break; 3530 break;
3501 case 3: /* set position (pixels) */ 3531 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3532 XMoveWindow (disp, parent[0], args[1], args[2]);
3503 break; 3533 break;
3504 case 4: /* set size (pixels) */ 3534 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3535 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3536 break;
3507 case 5: /* raise window */ 3537 case 5: /* raise window */
3508 XRaiseWindow (disp, TermWin.parent[0]); 3538 XRaiseWindow (disp, parent[0]);
3509 break; 3539 break;
3510 case 6: /* lower window */ 3540 case 6: /* lower window */
3511 XLowerWindow (disp, TermWin.parent[0]); 3541 XLowerWindow (disp, parent[0]);
3512 break; 3542 break;
3513 case 7: /* refresh window */ 3543 case 7: /* refresh window */
3514 scr_touch (true); 3544 scr_touch (true);
3515 break; 3545 break;
3516 case 8: /* set size (chars) */ 3546 case 8: /* set size (chars) */
3517 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3547 set_widthheight ((unsigned int) (args[2] * fwidth),
3518 (unsigned int) (args[1] * TermWin.fheight)); 3548 (unsigned int) (args[1] * fheight));
3519 break; 3549 break;
3520 3550
3521 //case 9: NYI, TODO, restore maximized window or maximize window 3551 //case 9: NYI, TODO, restore maximized window or maximize window
3522 default: 3552 default:
3523 if (args[0] >= 24) /* set height (chars) */ 3553 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)TermWin.width, 3554 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * TermWin.fheight)); 3555 (unsigned int) (args[1] * fheight));
3526 break; 3556 break;
3527 3557
3528 3558
3529 /* 3559 /*
3530 * reports - some output format copied from XTerm 3560 * reports - some output format copied from XTerm
3531 */ 3561 */
3532 case 11: /* report window state */ 3562 case 11: /* report window state */
3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3563 XGetWindowAttributes (disp, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3564 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3565 break;
3536 case 13: /* report window position */ 3566 case 13: /* report window position */
3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3567 XGetWindowAttributes (disp, parent[0], &wattr);
3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3568 XTranslateCoordinates (disp, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3569 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3570 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3571 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3572 break;
3543 case 14: /* report window size (pixels) */ 3573 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3574 XGetWindowAttributes (disp, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3575 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3576 break;
3547 case 18: /* report text area size (chars) */ 3577 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3578 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3579 break;
3550 case 19: /* report window size (chars) */ 3580 case 19: /* report window size (chars) */
3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3581 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3582 break;
3553 case 20: /* report icon label */ 3583 case 20: /* report icon label */
3554 { 3584 {
3555 char *s; 3585 char *s;
3556 XGetIconName (disp, TermWin.parent[0], &s); 3586 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3588 XFree (s);
3559 } 3589 }
3560 break; 3590 break;
3561 case 21: /* report window title */ 3591 case 21: /* report window title */
3562 { 3592 {
3563 char *s; 3593 char *s;
3564 XFetchName (disp, TermWin.parent[0], &s); 3594 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3596 XFree (s);
3567 } 3597 }
3568 break; 3598 break;
3569 } 3599 }
3570} 3600}
… …
3715 unsigned long bytes_after; 3745 unsigned long bytes_after;
3716 unsigned char *value = 0; 3746 unsigned char *value = 0;
3717 const char *str = ""; 3747 const char *str = "";
3718 3748
3719 if (prop 3749 if (prop
3720 && XGetWindowProperty (disp, TermWin.parent[0], 3750 && XGetWindowProperty (disp, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3751 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3752 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3753 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3754 && actual_type != None
3725 && actual_format == 8) 3755 && actual_format == 8)
… …
3737 { 3767 {
3738 *eq = 0; 3768 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3769 set_utf8_property (display->atom (str), eq + 1);
3740 } 3770 }
3741 else 3771 else
3742 XDeleteProperty (disp, TermWin.parent[0], 3772 XDeleteProperty (disp, parent[0],
3743 display->atom (str)); 3773 display->atom (str));
3744 } 3774 }
3745 break; 3775 break;
3746 3776
3747 case XTerm_Color: 3777 case XTerm_Color:
… …
3846 // TODO, when secure mode? 3876 // TODO, when secure mode?
3847 break; 3877 break;
3848 3878
3849#ifdef MENUBAR 3879#ifdef MENUBAR
3850 case URxvt_Menu: 3880 case URxvt_Menu:
3851 if (options & Opt_insecure) 3881 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3883 break;
3854#endif 3884#endif
3855#if 0 3885#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3886 case XTerm_dumpscreen: /* no error notices */
… …
3872 case URxvt_italicFont: 3902 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3903 case URxvt_boldItalicFont:
3874#endif 3904#endif
3875 if (query) 3905 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3906 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3908 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3909 resp);
3880 else 3910 else
3881 { 3911 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3912 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883 3913
… …
3888 break; 3918 break;
3889 3919
3890#if ENABLE_FRILLS 3920#if ENABLE_FRILLS
3891 case URxvt_locale: 3921 case URxvt_locale:
3892 if (query) 3922 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 3924 else
3895 { 3925 {
3896 set_locale (str); 3926 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3927 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3928 init_xlocale ();
… …
4026 } 4056 }
4027 4057
4028 /* extra handling for values with state unkept */ 4058 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4059 switch (arg[i])
4030 { 4060 {
4061#if ENABLE_STYLES
4062 case 1021:
4063 if (mode)
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067
4068 scr_touch (true);
4069 break;
4070#endif
4031 case 1048: /* alternative cursor save */ 4071 case 1048: /* alternative cursor save */
4032 case 1049: 4072 case 1049:
4033 if (options & Opt_secondaryScreen) 4073 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4074 if (mode == 0)
4035 scr_cursor (RESTORE); 4075 scr_cursor (RESTORE);
4036 else if (mode == 1) 4076 else if (mode == 1)
4037 scr_cursor (SAVE); 4077 scr_cursor (SAVE);
4038 break; 4078 break;
… …
4050 */ 4090 */
4051 PrivMode (1, PrivMode_vt52); 4091 PrivMode (1, PrivMode_vt52);
4052 break; 4092 break;
4053 case 3: /* 80/132 */ 4093 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4094 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4095 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4096 break;
4057 case 4: /* smooth scrolling */ 4097 case 4: /* smooth scrolling */
4058 if (state) 4098 if (!state)
4059 options &= ~Opt_jumpScroll; 4099 SET_OPTION (Opt_jumpScroll);
4060 else 4100 else
4061 options |= Opt_jumpScroll; 4101 CLR_OPTION (Opt_jumpScroll);
4062 break; 4102 break;
4063 case 5: /* reverse video */ 4103 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4104 scr_rvideo_mode (state);
4065 break; 4105 break;
4066 case 6: /* relative/absolute origins */ 4106 case 6: /* relative/absolute origins */
… …
4107#if 0 4147#if 0
4108 case 1001: 4148 case 1001:
4109 break; /* X11 mouse highlighting */ 4149 break; /* X11 mouse highlighting */
4110#endif 4150#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4151 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state) 4152 if (!state)
4113 options &= ~Opt_scrollTtyOutput; 4153 SET_OPTION (Opt_scrollTtyOutput);
4114 else 4154 else
4115 options |= Opt_scrollTtyOutput; 4155 CLR_OPTION (Opt_scrollTtyOutput);
4116 break; 4156 break;
4117 case 1011: /* scroll to bottom on key press */ 4157 case 1011: /* scroll to bottom on key press */
4118 if (state) 4158 if (state)
4119 options |= Opt_scrollTtyKeypress; 4159 SET_OPTION (Opt_scrollTtyKeypress);
4120 else 4160 else
4121 options &= ~Opt_scrollTtyKeypress; 4161 CLR_OPTION (Opt_scrollTtyKeypress);
4122 break; 4162 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4163 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4165 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4166 scr_erase_screen (2);
4127 scr_change_screen (state); 4167 scr_change_screen (state);
4128 break; 4168 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4169 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4170 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4171 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4172 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4173 scr_erase_screen (2);
4134 break; 4174 break;
4135 default: 4175 default:
4136 break; 4176 break;
… …
4286 case 106: 4326 case 106:
4287 case 107: 4327 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4328 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4329 break;
4290#endif 4330#endif
4291
4292 } 4331 }
4293 } 4332 }
4294} 4333}
4295/*}}} */ 4334/*}}} */
4296 4335
… …
4377 } 4416 }
4378 4417
4379 memmove (v_buffer, v_buffer + written, v_buflen); 4418 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 4419 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4420 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 // original code just ignores this... 4421 pty_ev.set (EVENT_READ);
4383 destroy ();
4384} 4422}
4385 4423
4386/*----------------------- end-of-file (C source) -----------------------*/ 4424/*----------------------- end-of-file (C source) -----------------------*/
4387 4425

Diff Legend

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