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.201 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.226 by root, Sun Jan 1 15:03:49 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; 170 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 171 int len;
170 172
173 fname = rxvt_utf8towcs (f->name);
174
171#if ENABLE_COMBINING 175# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
173 { 177 {
174 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
177 } 181 }
178 else 182 else
179#endif 183# endif
180 { 184 {
181 ch2 = ch; 185 ch2 = ch;
182 186
183 alloc = 0; 187 alloc = 0;
184 chr = &ch2; 188 chr = &ch2;
185 len = 1; 189 len = 1;
186 } 190 }
187 191
188 int width = strlen (f->name); 192 char attr[80]; // plenty
189 193
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
204 int width = wcswidth (fname, wcslen (fname));
205
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);
191 216
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 218
194 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
195 { 220 {
… …
198 ch = *chr++; 223 ch = *chr++;
199 224
200 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
203#if !UNICODE3 228# if !UNICODE3
204 if (ch >= 0x10000) 229 if (ch >= 0x10000)
205 ch = 0xfffd; 230 ch = 0xfffd;
206#endif 231# endif
207 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
209 } 234 }
210 235
236 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 237 scr_overlay_set (0, len + 1, fname);
212 238
239 free (fname);
240
213#if ENABLE_COMBINING 241# if ENABLE_COMBINING
214 if (alloc) 242 if (alloc)
215 delete [] alloc; 243 delete [] alloc;
216#endif 244# endif
217} 245}
218#endif 246#endif
219 247
220void 248void
221rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
316 344
317 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
321 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
324 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 355 SET_LOCALE (locale);
326 356
327 if (status_return == XLookupChars 357 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 390#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 391 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 392 return;
363#endif 393#endif
364 394
365 if (TermWin.saveLines) 395 if (saveLines)
366 { 396 {
367#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 398 if (!ctrl && !meta)
369#else 399#else
370 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
371#endif 401#endif
372 { 402 {
373 int lnsppg; 403 int lnsppg;
374 404
375#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 407#else
378 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
379#endif 409#endif
380 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
381 { 411 {
382 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
383 return; 413 return;
… …
838 } 868 }
839 869
840 if (len <= 0) 870 if (len <= 0)
841 return; /* not mapped */ 871 return; /* not mapped */
842 872
843 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 874 if (view_start)
845 { 875 {
846 TermWin.view_start = 0; 876 view_start = 0;
847 want_refresh = 1; 877 want_refresh = 1;
848 } 878 }
849 879
850 /* 880 /*
851 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
954 SET_LOCALE (locale); 984 SET_LOCALE (locale);
955 985
956 display->flush (); 986 display->flush ();
957 987
958 if (want_refresh && !flush_ev.active) 988 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 989 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 990}
961 991
962void 992void
963rxvt_term::flush_cb (time_watcher &w) 993rxvt_term::flush_cb (time_watcher &w)
964{ 994{
… …
1028{ 1058{
1029 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1030 || 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)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1062 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1063 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1064 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1065 mouse_slip_wheel_speed = 0;
1036 1066
1037 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1068 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1054 1084
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1058 1088
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1090
1061 if (n > 0) 1091 if (r > 0)
1062 { 1092 {
1063 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1064 return true; 1094 return true;
1065 } 1095 }
1066 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))
1067 destroy (); 1107 destroy ();
1108 }
1068 1109
1069 return false; 1110 return false;
1070} 1111}
1071 1112
1072void 1113void
… …
1086} 1127}
1087 1128
1088void 1129void
1089rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1090{ 1131{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1133 recolour_cursor ();
1093 1134
1094#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1136 hidden_pointer = 0;
1096 1137
1097 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1140#endif
1100} 1141}
1101 1142
1102#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1103void 1144void
1104rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1105{ 1146{
1106 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1107 return; 1148 return;
1108 1149
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1151 XFlush (display->display);
1111 1152
1112 hidden_pointer = 1; 1153 hidden_pointer = 1;
1113} 1154}
1114 1155
… …
1209 1250
1210 SET_R (this); 1251 SET_R (this);
1211 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1212 1253
1213#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1256 {
1216 if (hidden_cursor) 1257 if (hidden_cursor)
1217 { 1258 {
1218 hidden_cursor = 0; 1259 hidden_cursor = 0;
1219 want_refresh = 1; 1260 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1264 }
1224#endif 1265#endif
1225 1266
1226#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1269 {
1229 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1416 case FocusOut: 1457 case FocusOut:
1417 focus_out (); 1458 focus_out ();
1418 break; 1459 break;
1419 1460
1420 case ConfigureNotify: 1461 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1462 if (ev.xconfigure.window == parent[0])
1422 { 1463 {
1423 int height, width;
1424
1425 do
1426 { /* Wrap lots of configures into one */
1427 width = ev.xconfigure.width;
1428 height = ev.xconfigure.height;
1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1430 }
1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ;
1432 1466
1433 if (szHint.width != width || szHint.height != height) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1468 {
1435 seen_resize = 1; 1469 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1471 }
1438 1472
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1475 check_our_parents ();
1442#endif 1476#endif
1443 } 1477 }
1444 break; 1478 break;
1445 1479
… …
1462 case SelectionRequest: 1496 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1464 break; 1498 break;
1465 1499
1466 case UnmapNotify: 1500 case UnmapNotify:
1467 TermWin.mapped = 0; 1501 mapped = 0;
1468#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1470#endif 1504#endif
1471 break; 1505 break;
1472 1506
1473 case MapNotify: 1507 case MapNotify:
1474 TermWin.mapped = 1; 1508 mapped = 1;
1475#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif 1511#endif
1478 break; 1512 break;
1479 1513
… …
1483 break; 1517 break;
1484#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1485 1519
1486 case GraphicsExpose: 1520 case GraphicsExpose:
1487 case Expose: 1521 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1489 { 1523 {
1490 do 1524 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1528
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1530
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1500 1534
1501 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1502 } 1536 }
… …
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose (); 1553 menubar_expose ();
1520#endif 1554#endif
1521 1555
1522#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1525#endif 1559#endif
1526 } 1560 }
1527 break; 1561 break;
1528 1562
… …
1539 } 1573 }
1540#endif 1574#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1576 break;
1543 1577
1544 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1545 { 1579 {
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1581 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1583 ;
1550 1584
1551 XQueryPointer (disp, TermWin.vt, 1585 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1589 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1568#endif 1602#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1605
1572#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1609 {
1576 int dist; 1610 int dist;
1577 1611
1578 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1624
1591 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1593 { 1627 {
1594 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1596 } 1630 }
1597 else 1631 else
1598 { 1632 {
1599 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1635 }
1602 1636
1603 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1639 + 1;
1606 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1608 } 1642 }
1609 else 1643 else
1610 { 1644 {
1611 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1642} 1676}
1643 1677
1644void 1678void
1645rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1646{ 1680{
1647 if (!TermWin.focus) 1681 if (!focus)
1648 { 1682 {
1649 TermWin.focus = 1; 1683 focus = 1;
1650 want_refresh = 1; 1684 want_refresh = 1;
1651#ifdef USE_XIM 1685#if USE_XIM
1652 if (Input_Context != NULL) 1686 if (Input_Context != NULL)
1653 { 1687 {
1654 IMSetStatusPosition (); 1688 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1689 XSetICFocus (Input_Context);
1656 } 1690 }
1657#endif 1691#endif
1658#ifdef CURSOR_BLINK 1692#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1693 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1695#endif
1662#ifdef OFF_FOCUS_FADING 1696#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1697 if (rs[Rs_fade])
1664 { 1698 {
1665 pix_colors = pix_colors_focused; 1699 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1700 scr_recolour ();
1667 } 1701 }
… …
1670} 1704}
1671 1705
1672void 1706void
1673rxvt_term::focus_out () 1707rxvt_term::focus_out ()
1674{ 1708{
1675 if (TermWin.focus) 1709 if (focus)
1676 { 1710 {
1677 TermWin.focus = 0; 1711 focus = 0;
1678 want_refresh = 1; 1712 want_refresh = 1;
1679 1713
1680#if ENABLE_FRILLS || ISO_14755 1714#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0; 1715 iso14755buf = 0;
1682#endif 1716#endif
1683#if ENABLE_OVERLAY 1717#if ENABLE_OVERLAY
1684 scr_overlay_off (); 1718 scr_overlay_off ();
1685#endif 1719#endif
1686#ifdef USE_XIM 1720#if USE_XIM
1687 if (Input_Context != NULL) 1721 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1722 XUnsetICFocus (Input_Context);
1689#endif 1723#endif
1690#ifdef CURSOR_BLINK 1724#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1725 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1726 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1727 hidden_cursor = 0;
1694#endif 1728#endif
1695#ifdef OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1697 { 1731 {
1698 pix_colors = pix_colors_unfocused; 1732 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1733 scr_recolour ();
1700 } 1734 }
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1755 return;
1722 1756
1723 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1724 case ReparentNotify: 1758 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1727 break; 1761 break;
1728 } 1762 }
1729} 1763}
1730#endif 1764#endif
… …
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1774
1741 /* 1775 /*
1742 * VT window processing of button press 1776 * VT window processing of button press
1743 */ 1777 */
1744 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1745 { 1779 {
1746#if ISO_14755 1780#if ISO_14755
1747 // 5.4 1781 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1783 {
… …
1954 case Button3: 1988 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1956 { 1990 {
1957 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1960# else 1994# else
1961 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1962# endif 1996# endif
1963 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1966# else 2000# else
1967 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1968# endif 2002# endif
1969 else 2003 else
1970 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1971 } 2005 }
1972 else 2006 else
1973 { 2007 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2009 (nrow
1976 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2011 / scrollbar_size ()));
1978 } 2012 }
1979 2013
1980 break; 2014 break;
… …
2012#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
2015#endif 2049#endif
2016 2050
2017 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
2018 { 2052 {
2019#if ISO_14755 2053#if ISO_14755
2020 // 5.4 2054 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2056 return;
… …
2072 2106
2073 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2074 2108
2075 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2076 i = 1; 2110 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2079 else 2113 else
2080 i = 5; 2114 i = 5;
2081 2115
2082# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2084 { 2118 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2086 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;
2087 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;
2088 2122
2089 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2125
2092 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
… …
2368 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2403 dDisp;
2370 2404
2371 pchanged = 0; 2405 pchanged = 0;
2372 2406
2373 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2375 2409
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2378 2412
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2414
2381 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2382 { 2416 {
2383 if (am_transparent) 2417 if (am_transparent)
2384 { 2418 {
2385 pchanged = 1; 2419 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2388 } 2422 }
2389 2423
2390 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2391 } 2425 }
… …
2432 Window cr; 2466 Window cr;
2433 XImage *image; 2467 XImage *image;
2434 GC gc; 2468 GC gc;
2435 XGCValues gcvalue; 2469 XGCValues gcvalue;
2436 2470
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2475 nx = ny = 0;
2442 2476
… …
2452 nh += sy; 2486 nh += sy;
2453 ny = -sy; 2487 ny = -sy;
2454 sy = 0; 2488 sy = 0;
2455 } 2489 }
2456 2490
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2493
2460 XSync (disp, False); 2494 XSync (disp, False);
2461 allowedxerror = -1; 2495 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2497
… …
2468 if (image == NULL) 2502 if (image == NULL)
2469 { 2503 {
2470 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2471 { 2505 {
2472 pchanged = 1; 2506 pchanged = 1;
2473 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2474 { 2508 {
2475 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2510 pixmap = None;
2477 } 2511 }
2478 } 2512 }
2479 2513
2480 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2481 } 2515 }
2482 else 2516 else
2483 { 2517 {
2484 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2486 2520
2487#if TINTING 2521#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2523 {
2490 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
… …
2494 2528
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2530 }
2497#endif 2531#endif
2498 2532
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2538 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2539 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2508 2542
2509 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2544 pchanged = 1;
2511 2545
2512 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2513 } 2547 }
2514 } 2548 }
2515 2549
2516 if (am_pixmap_trans) 2550 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2552 else
2519 { 2553 {
2520 unsigned int n; 2554 unsigned int n;
2521 /* 2555 /*
2522 * InheritPixmap transparency 2556 * InheritPixmap transparency
2523 */ 2557 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2559 {
2526 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2529 XFree (list); 2563 XFree (list);
2530 2564
2531 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2532 { 2566 {
2533 if (oldp != None) 2567 if (oldp != None)
2534 pchanged = 1; 2568 pchanged = 1;
2535 2569
2536 break; 2570 break;
2537 } 2571 }
2538 2572
2539 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2540 pchanged = 1; 2574 pchanged = 1;
2541 } 2575 }
2542 2576
2543 n = 0; 2577 n = 0;
2544 2578
2545 if (pchanged) 2579 if (pchanged)
2546 { 2580 {
2547 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2548 { 2582 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2585 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2587 break;
2554 } 2588 }
2555 } 2589 }
2556 } 2590 }
2557 2591
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2593 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2596 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2564 } 2598 }
2565 else 2599 else
2566 { 2600 {
… …
2569 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2604 sleep (1);
2571#endif 2605#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2573 { 2607 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2576 } 2610 }
2577 2611
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2613 am_transparent = 1;
2580 } 2614 }
2581 2615
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2617 parent[i] = None;
2584 } 2618 }
2585 2619
2586 if (scrollBar.win) 2620 if (scrollBar.win)
2587 { 2621 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2640 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2676 bool refreshnow = false;
2643 int nlines = 0; 2677 int nlines = 0;
2644 unicode_t *str = buf; 2678 unicode_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2645 2680
2646 for (;;) 2681 for (;;)
2647 { 2682 {
2648 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))
2649 break; 2684 break;
2650 2685
2651 *str++ = ch; 2686 *str++ = ch;
2652 2687
2653 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2654 { 2689 {
2690 if (ch == C0_LF)
2655 nlines++; 2691 nlines++;
2692
2656 refresh_count++; 2693 refresh_count++;
2657 2694
2658 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2697 {
2661 refreshnow = true; 2698 refreshnow = true;
2699 refresh_count = 0;
2662 ch = NOCHAR; 2700 ch = NOCHAR;
2663 break; 2701 break;
2664 } 2702 }
2665 2703
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2668 { 2706 {
2669 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2670 nlines = 0; 2708 nlines = 0;
2671 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2672 } 2711 }
2673 }
2674 2712
2675 if (str >= buf + UBUFSIZ) 2713 if (str >= eol)
2676 { 2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2677 ch = NOCHAR; 2717 ch = NOCHAR;
2678 break; 2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2679 } 2724 }
2680 2725
2681 seq_begin = cmdbuf_ptr; 2726 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2727 ch = next_char ();
2683 } 2728 }
… …
2690 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2737 */
2693 if (refreshnow) 2738 if (refreshnow)
2694 { 2739 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2741 refresh_limit++;
2697 else 2742 else
2698 { 2743 {
2699 flag = true; 2744 flag = true;
2700 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
2746 flush_ev.stop ();
2701 } 2747 }
2702 } 2748 }
2703 2749
2704 } 2750 }
2705 else 2751 else
… …
3342 3388
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3389 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3390 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3391 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3394 break;
3349 3395
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3397 tt_write ((const unsigned char *)VT100_ANS,
3352 (unsigned int) (sizeof (VT100_ANS) - 1)); 3398 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3364 break; 3410 break;
3365 case 6: /* CPR requested */ 3411 case 6: /* CPR requested */
3366 scr_report_position (); 3412 scr_report_position ();
3367 break; 3413 break;
3368 case 7: /* unofficial extension */ 3414 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3415 if (OPTION (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3416 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3417 break;
3372 case 8: /* unofficial extension */ 3418 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3419 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3420 break;
… …
3477 { 3523 {
3478 /* 3524 /*
3479 * commands 3525 * commands
3480 */ 3526 */
3481 case 1: /* deiconify window */ 3527 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3528 XMapWindow (disp, parent[0]);
3483 break; 3529 break;
3484 case 2: /* iconify window */ 3530 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3531 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3532 break;
3487 case 3: /* set position (pixels) */ 3533 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3534 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3535 break;
3490 case 4: /* set size (pixels) */ 3536 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3537 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3538 break;
3493 case 5: /* raise window */ 3539 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3540 XRaiseWindow (disp, parent[0]);
3495 break; 3541 break;
3496 case 6: /* lower window */ 3542 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3543 XLowerWindow (disp, parent[0]);
3498 break; 3544 break;
3499 case 7: /* refresh window */ 3545 case 7: /* refresh window */
3500 scr_touch (true); 3546 scr_touch (true);
3501 break; 3547 break;
3502 case 8: /* set size (chars) */ 3548 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3549 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3550 (unsigned int) (args[1] * fheight));
3505 break; 3551 break;
3506 3552
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3553 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3554 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3555 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3556 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3557 (unsigned int) (args[1] * fheight));
3512 break; 3558 break;
3513 3559
3514 3560
3515 /* 3561 /*
3516 * reports - some output format copied from XTerm 3562 * reports - some output format copied from XTerm
3517 */ 3563 */
3518 case 11: /* report window state */ 3564 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3565 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3566 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3567 break;
3522 case 13: /* report window position */ 3568 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3570 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3571 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3572 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3573 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3574 break;
3529 case 14: /* report window size (pixels) */ 3575 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3576 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3577 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3578 break;
3533 case 18: /* report text area size (chars) */ 3579 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3580 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3581 break;
3536 case 19: /* report window size (chars) */ 3582 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3583 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3584 break;
3539 case 20: /* report icon label */ 3585 case 20: /* report icon label */
3540 { 3586 {
3541 char *s; 3587 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3588 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3589 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3590 XFree (s);
3545 } 3591 }
3546 break; 3592 break;
3547 case 21: /* report window title */ 3593 case 21: /* report window title */
3548 { 3594 {
3549 char *s; 3595 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3596 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3597 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3598 XFree (s);
3553 } 3599 }
3554 break; 3600 break;
3555 } 3601 }
3556} 3602}
… …
3588 else if (ch < 0x20) 3634 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3635 return NULL; /* other control character - exit */
3590 3636
3591 seen_esc = false; 3637 seen_esc = false;
3592 3638
3593 if (n >= sizeof (string) - 1) 3639 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3640 // stop at some sane length
3595 return NULL; 3641 return NULL;
3596 3642
3597 if (ch == C0_SYN) 3643 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3644 string[n++] = cmd_get8 ();
… …
3701 unsigned long bytes_after; 3747 unsigned long bytes_after;
3702 unsigned char *value = 0; 3748 unsigned char *value = 0;
3703 const char *str = ""; 3749 const char *str = "";
3704 3750
3705 if (prop 3751 if (prop
3706 && XGetWindowProperty (disp, TermWin.parent[0], 3752 && XGetWindowProperty (disp, parent[0],
3707 prop, 0, 1<<16, 0, AnyPropertyType, 3753 prop, 0, 1<<16, 0, AnyPropertyType,
3708 &actual_type, &actual_format, 3754 &actual_type, &actual_format,
3709 &nitems, &bytes_after, &value) == Success 3755 &nitems, &bytes_after, &value) == Success
3710 && actual_type != None 3756 && actual_type != None
3711 && actual_format == 8) 3757 && actual_format == 8)
… …
3723 { 3769 {
3724 *eq = 0; 3770 *eq = 0;
3725 set_utf8_property (display->atom (str), eq + 1); 3771 set_utf8_property (display->atom (str), eq + 1);
3726 } 3772 }
3727 else 3773 else
3728 XDeleteProperty (disp, TermWin.parent[0], 3774 XDeleteProperty (disp, parent[0],
3729 display->atom (str)); 3775 display->atom (str));
3730 } 3776 }
3731 break; 3777 break;
3732 3778
3733 case XTerm_Color: 3779 case XTerm_Color:
… …
3832 // TODO, when secure mode? 3878 // TODO, when secure mode?
3833 break; 3879 break;
3834 3880
3835#ifdef MENUBAR 3881#ifdef MENUBAR
3836 case URxvt_Menu: 3882 case URxvt_Menu:
3837 if (options & Opt_insecure) 3883 if (OPTION (Opt_insecure))
3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3884 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3839 break; 3885 break;
3840#endif 3886#endif
3841#if 0 3887#if 0
3842 case XTerm_dumpscreen: /* no error notices */ 3888 case XTerm_dumpscreen: /* no error notices */
… …
3858 case URxvt_italicFont: 3904 case URxvt_italicFont:
3859 case URxvt_boldItalicFont: 3905 case URxvt_boldItalicFont:
3860#endif 3906#endif
3861 if (query) 3907 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop, 3908 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3909 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3910 ? fontset[op - URxvt_font]->fontdesc : "",
3865 resp); 3911 resp);
3866 else 3912 else
3867 { 3913 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3914 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869 3915
… …
3874 break; 3920 break;
3875 3921
3876#if ENABLE_FRILLS 3922#if ENABLE_FRILLS
3877 case URxvt_locale: 3923 case URxvt_locale:
3878 if (query) 3924 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3925 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3880 else 3926 else
3881 { 3927 {
3882 set_locale (str); 3928 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8); 3929 pty.set_utf8_mode (enc_utf8);
3884 init_xlocale (); 3930 init_xlocale ();
… …
4012 } 4058 }
4013 4059
4014 /* extra handling for values with state unkept */ 4060 /* extra handling for values with state unkept */
4015 switch (arg[i]) 4061 switch (arg[i])
4016 { 4062 {
4063#if ENABLE_STYLES
4064 case 1021:
4065 if (mode)
4066 SET_OPTION (Opt_intensityStyles);
4067 else
4068 CLR_OPTION (Opt_intensityStyles);
4069
4070 scr_touch (true);
4071 break;
4072#endif
4017 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4018 case 1049: 4074 case 1049:
4019 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
4020 if (mode == 0) 4076 if (mode == 0)
4021 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
4022 else if (mode == 1) 4078 else if (mode == 1)
4023 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
4024 break; 4080 break;
… …
4036 */ 4092 */
4037 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
4038 break; 4094 break;
4039 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4040 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4042 break; 4098 break;
4043 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4044 if (state) 4100 if (!state)
4045 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4046 else 4102 else
4047 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4048 break; 4104 break;
4049 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4050 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4051 break; 4107 break;
4052 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
4093#if 0 4149#if 0
4094 case 1001: 4150 case 1001:
4095 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4096#endif 4152#endif
4097 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4098 if (state) 4154 if (!state)
4099 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4100 else 4156 else
4101 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4102 break; 4158 break;
4103 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4104 if (state) 4160 if (state)
4105 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4106 else 4162 else
4107 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4108 break; 4164 break;
4109 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4110 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4111 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4112 scr_erase_screen (2); 4168 scr_erase_screen (2);
4113 scr_change_screen (state); 4169 scr_change_screen (state);
4114 break; 4170 break;
4115 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4116 scr_change_screen (state); 4172 scr_change_screen (state);
4117 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4118 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4119 scr_erase_screen (2); 4175 scr_erase_screen (2);
4120 break; 4176 break;
4121 default: 4177 default:
4122 break; 4178 break;
… …
4272 case 106: 4328 case 106:
4273 case 107: 4329 case 107:
4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4275 break; 4331 break;
4276#endif 4332#endif
4277
4278 } 4333 }
4279 } 4334 }
4280} 4335}
4281/*}}} */ 4336/*}}} */
4282 4337
… …
4363 } 4418 }
4364 4419
4365 memmove (v_buffer, v_buffer + written, v_buflen); 4420 memmove (v_buffer, v_buffer + written, v_buflen);
4366 } 4421 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this... 4423 pty_ev.set (EVENT_READ);
4369 destroy ();
4370} 4424}
4371 4425
4372/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4373 4427

Diff Legend

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