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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
52 57
53#ifdef KEYSYM_RESOURCE 58#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 59# include "keyboard.h"
55#endif 60#endif
56 61
… …
135rxvt_term::iso14755_54 (int x, int y) 140rxvt_term::iso14755_54 (int x, int y)
136{ 141{
137 x = Pixel2Col (x); 142 x = Pixel2Col (x);
138 y = Pixel2Row (y); 143 y = Pixel2Row (y);
139 144
140 if (x < 0 || x >= TermWin.ncol 145 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 146 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 147 return;
143 148
144 for (;;) 149 for (;;)
145 { 150 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 151 const line_t &l = ROW(y - view_start);
152
153 text_t t = l.t[x];
147 154
148 if (t != NOCHAR || !x) 155 if (t != NOCHAR || !x)
149 { 156 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 157 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; 158 iso14755buf = ISO_14755_54;
153 break; 159 break;
154 } 160 }
155 161
156 x--; 162 x--;
157 } 163 }
158
159} 164}
160#endif
161 165
162#if ENABLE_OVERLAY
163void 166void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 168{
166 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 171 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 172 int len;
170 173
174 fname = rxvt_utf8towcs (f->name);
175
171#if ENABLE_COMBINING 176# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
173 { 178 {
174 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
177 } 182 }
178 else 183 else
179#endif 184# endif
180 { 185 {
181 ch2 = ch; 186 ch2 = ch;
182 187
183 alloc = 0; 188 alloc = 0;
184 chr = &ch2; 189 chr = &ch2;
185 len = 1; 190 len = 1;
186 } 191 }
187 192
188 int width = strlen (f->name); 193 char attr[80]; // plenty
189 194
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
205 int width = wcswidth (fname, wcslen (fname));
206
207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
191 217
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 219
194 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
195 { 221 {
… …
198 ch = *chr++; 224 ch = *chr++;
199 225
200 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
203#if !UNICODE3 229# if !UNICODE3
204 if (ch >= 0x10000) 230 if (ch >= 0x10000)
205 ch = 0xfffd; 231 ch = 0xfffd;
206#endif 232# endif
207 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
209 } 235 }
210 236
237 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 238 scr_overlay_set (0, len + 1, fname);
212 239
240 free (fname);
241
213#if ENABLE_COMBINING 242# if ENABLE_COMBINING
214 if (alloc) 243 if (alloc)
215 delete [] alloc; 244 delete [] alloc;
216#endif 245# endif
217} 246}
218#endif 247#endif
219 248
220void 249void
221rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
362#ifdef KEYSYM_RESOURCE 391#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 392 if (keyboard->dispatch (this, keysym, ev.state))
364 return; 393 return;
365#endif 394#endif
366 395
367 if (TermWin.saveLines) 396 if (saveLines)
368 { 397 {
369#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 399 if (!ctrl && !meta)
371#else 400#else
372 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
373#endif 402#endif
374 { 403 {
375 int lnsppg; 404 int lnsppg;
376 405
377#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 408#else
380 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
381#endif 410#endif
382 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
383 { 412 {
384 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
385 return; 414 return;
… …
840 } 869 }
841 870
842 if (len <= 0) 871 if (len <= 0)
843 return; /* not mapped */ 872 return; /* not mapped */
844 873
845 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
846 if (TermWin.view_start) 875 if (view_start)
847 { 876 {
848 TermWin.view_start = 0; 877 view_start = 0;
849 want_refresh = 1; 878 want_refresh = 1;
850 } 879 }
851 880
852 /* 881 /*
853 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
956 SET_LOCALE (locale); 985 SET_LOCALE (locale);
957 986
958 display->flush (); 987 display->flush ();
959 988
960 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
962} 991}
963 992
964void 993void
965rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
966{ 995{
… …
1030{ 1059{
1031 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1033 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1034 { 1063 {
1035 if (TermWin.view_start == TermWin.nscrolled || 1064 if (view_start == nsaved ||
1036 TermWin.view_start == 0) 1065 view_start == 0)
1037 mouse_slip_wheel_speed = 0; 1066 mouse_slip_wheel_speed = 0;
1038 1067
1039 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1; 1069 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1042 } 1071 }
1043} 1072}
1044#endif 1073#endif
1045 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1046bool 1093bool
1047rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1048{ 1095{
1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1050 1097
… …
1056 1103
1057 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1058 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1059 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1060 1107
1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1062 1109
1063 if (n > 0) 1110 if (r > 0)
1064 { 1111 {
1065 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1066 return true; 1113 return true;
1067 } 1114 }
1068 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1122 {
1123 pty_ev.stop ();
1124
1125 if (!OPTION (Opt_hold))
1069 destroy (); 1126 destroy ();
1127 }
1070 1128
1071 return false; 1129 return false;
1072} 1130}
1073 1131
1074void 1132void
… …
1088} 1146}
1089 1147
1090void 1148void
1091rxvt_term::pointer_unblank () 1149rxvt_term::pointer_unblank ()
1092{ 1150{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1151 XDefineCursor (display->display, vt, TermWin_cursor);
1094 recolour_cursor (); 1152 recolour_cursor ();
1095 1153
1096#ifdef POINTER_BLANK 1154#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1155 hidden_pointer = 0;
1098 1156
1099 if (options & Opt_pointerBlank) 1157 if (OPTION (Opt_pointerBlank))
1100 pointer_ev.start (NOW + pointerBlankDelay); 1158 pointer_ev.start (NOW + pointerBlankDelay);
1101#endif 1159#endif
1102} 1160}
1103 1161
1104#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
1105void 1163void
1106rxvt_term::pointer_blank () 1164rxvt_term::pointer_blank ()
1107{ 1165{
1108 if (! (options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
1109 return; 1167 return;
1110 1168
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
1112 XFlush (display->display); 1170 XFlush (display->display);
1113 1171
1114 hidden_pointer = 1; 1172 hidden_pointer = 1;
1115} 1173}
1116 1174
… …
1211 1269
1212 SET_R (this); 1270 SET_R (this);
1213 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
1214 1272
1215#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1217 { 1275 {
1218 if (hidden_cursor) 1276 if (hidden_cursor)
1219 { 1277 {
1220 hidden_cursor = 0; 1278 hidden_cursor = 0;
1221 want_refresh = 1; 1279 want_refresh = 1;
… …
1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1225 } 1283 }
1226#endif 1284#endif
1227 1285
1228#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1230 { 1288 {
1231 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
1232 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
1233 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
1234 if (hidden_pointer) 1292 if (hidden_pointer)
… …
1418 case FocusOut: 1476 case FocusOut:
1419 focus_out (); 1477 focus_out ();
1420 break; 1478 break;
1421 1479
1422 case ConfigureNotify: 1480 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1424 { 1482 {
1425 int height, width;
1426
1427 do
1428 { /* Wrap lots of configures into one */
1429 width = ev.xconfigure.width;
1430 height = ev.xconfigure.height;
1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1432 }
1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ;
1434 1485
1435 if (szHint.width != width || szHint.height != height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1487 {
1437 seen_resize = 1; 1488 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1490 }
1440 1491
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1442 if (options & Opt_transparent) 1493 if (OPTION (Opt_transparent))
1443 check_our_parents (); 1494 check_our_parents ();
1444#endif 1495#endif
1445 } 1496 }
1446 break; 1497 break;
1447 1498
… …
1464 case SelectionRequest: 1515 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1516 selection_send (ev.xselectionrequest);
1466 break; 1517 break;
1467 1518
1468 case UnmapNotify: 1519 case UnmapNotify:
1469 TermWin.mapped = 0; 1520 mapped = 0;
1470#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1522 text_blink_ev.stop ();
1472#endif 1523#endif
1473 break; 1524 break;
1474 1525
1475 case MapNotify: 1526 case MapNotify:
1476 TermWin.mapped = 1; 1527 mapped = 1;
1477#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1479#endif 1530#endif
1480 break; 1531 break;
1481 1532
… …
1485 break; 1536 break;
1486#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1487 1538
1488 case GraphicsExpose: 1539 case GraphicsExpose:
1489 case Expose: 1540 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1491 { 1542 {
1492 do 1543 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1496 1547
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1549
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1502 1553
1503 scr_refresh (refresh_type); 1554 scr_refresh (refresh_type);
1504 } 1555 }
… …
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose (); 1572 menubar_expose ();
1522#endif 1573#endif
1523 1574
1524#ifdef TRANSPARENT 1575#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1576 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1577 XClearWindow (disp, ev.xany.window);
1527#endif 1578#endif
1528 } 1579 }
1529 break; 1580 break;
1530 1581
… …
1541 } 1592 }
1542#endif 1593#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1595 break;
1545 1596
1546 if (ev.xany.window == TermWin.vt) 1597 if (ev.xany.window == vt)
1547 { 1598 {
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1599 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1600 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1551 ; 1602 ;
1552 1603
1553 XQueryPointer (disp, TermWin.vt, 1604 XQueryPointer (disp, vt,
1554 &unused_root, &unused_child, 1605 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1606 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1607 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1608 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1609#ifdef MOUSE_THRESHOLD
… …
1570#endif 1621#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1622 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1623 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1624
1574#ifdef SELECTION_SCROLLING 1625#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1626 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1627 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1628 {
1578 int dist; 1629 int dist;
1579 1630
1580 /* don't clobber the current delay if we are 1631 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1632 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1640 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1641 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1642 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1643
1593 /* calc number of lines to scroll */ 1644 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1645 if (ev.xbutton.y < int_bwidth)
1595 { 1646 {
1596 scroll_selection_dir = UP; 1647 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1648 dist = int_bwidth - ev.xbutton.y;
1598 } 1649 }
1599 else 1650 else
1600 { 1651 {
1601 scroll_selection_dir = DN; 1652 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1653 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1654 }
1604 1655
1605 scroll_selection_lines = Pixel2Height (dist) 1656 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1657 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1658 + 1;
1608 MIN_IT (scroll_selection_lines, 1659 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1660 SELECTION_SCROLL_MAX_LINES);
1610 } 1661 }
1611 else 1662 else
1612 { 1663 {
1613 /* we are within the text window, so we 1664 /* we are within the text window, so we
… …
1644} 1695}
1645 1696
1646void 1697void
1647rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1648{ 1699{
1649 if (!TermWin.focus) 1700 if (!focus)
1650 { 1701 {
1651 TermWin.focus = 1; 1702 focus = 1;
1652 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1653#ifdef USE_XIM 1707#if USE_XIM
1654 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1655 { 1709 {
1656 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1658 } 1712 }
1659#endif 1713#endif
1660#ifdef CURSOR_BLINK 1714#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif 1717#endif
1664#ifdef OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1666 { 1720 {
1667 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1722 scr_recolour ();
1669 } 1723 }
… …
1672} 1726}
1673 1727
1674void 1728void
1675rxvt_term::focus_out () 1729rxvt_term::focus_out ()
1676{ 1730{
1677 if (TermWin.focus) 1731 if (focus)
1678 { 1732 {
1679 TermWin.focus = 0; 1733 focus = 0;
1680 want_refresh = 1; 1734 want_refresh = 1;
1681 1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1682#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1683 iso14755buf = 0; 1741 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1686 scr_overlay_off (); 1743 scr_overlay_off ();
1687#endif 1744# endif
1745 }
1746#endif
1688#ifdef USE_XIM 1747#if USE_XIM
1689 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1691#endif 1750#endif
1692#ifdef CURSOR_BLINK 1751#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1754 hidden_cursor = 0;
1696#endif 1755#endif
1697#ifdef OFF_FOCUS_FADING 1756#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1757 if (rs[Rs_fade])
1699 { 1758 {
1700 pix_colors = pix_colors_unfocused; 1759 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1760 scr_recolour ();
1702 } 1761 }
… …
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1723 return; 1782 return;
1724 1783
1725 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1726 case ReparentNotify: 1785 case ReparentNotify:
1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1728 want_refresh = want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1729 break; 1788 break;
1730 } 1789 }
1731} 1790}
1732#endif 1791#endif
… …
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1801
1743 /* 1802 /*
1744 * VT window processing of button press 1803 * VT window processing of button press
1745 */ 1804 */
1746 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1747 { 1806 {
1748#if ISO_14755 1807#if ISO_14755
1749 // 5.4 1808 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1810 {
… …
1956 case Button3: 2015 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 2016 if (scrollBar.style != R_SB_XTERM)
1958 { 2017 {
1959 if (scrollbar_above_slider (ev.y)) 2018 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 2019# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 2020 scr_page (UP, nrow - 1);
1962# else 2021# else
1963 scr_page (UP, TermWin.nrow / 4); 2022 scr_page (UP, nrow / 4);
1964# endif 2023# endif
1965 else if (scrollbar_below_slider (ev.y)) 2024 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 2026 scr_page (DN, nrow - 1);
1968# else 2027# else
1969 scr_page (DN, TermWin.nrow / 4); 2028 scr_page (DN, nrow / 4);
1970# endif 2029# endif
1971 else 2030 else
1972 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1973 } 2032 }
1974 else 2033 else
1975 { 2034 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 2035 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 2036 (nrow
1978 * scrollbar_position (ev.y) 2037 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 2038 / scrollbar_size ()));
1980 } 2039 }
1981 2040
1982 break; 2041 break;
… …
2014#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2017#endif 2076#endif
2018 2077
2019 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
2020 { 2079 {
2021#if ISO_14755 2080#if ISO_14755
2022 // 5.4 2081 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2083 return;
… …
2074 2133
2075 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2076 2135
2077 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2078 i = 1; 2137 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2080 i = TermWin.nrow - 1; 2139 i = nrow - 1;
2081 else 2140 else
2082 i = 5; 2141 i = 5;
2083 2142
2084# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2144 if (ev.state & ControlMask)
2086 { 2145 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2146 mouse_slip_wheel_speed += v ? -1 : 1;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2089 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2090 2149
2091 if (slip_wheel_ev.at < NOW) 2150 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2152
2094 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
… …
2370 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2371 dDisp; 2430 dDisp;
2372 2431
2373 pchanged = 0; 2432 pchanged = 0;
2374 2433
2375 if (!(options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
2376 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
2377 2436
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
2380 2439
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2440 XGetWindowAttributes (disp, parent[0], &wattr);
2382 2441
2383 if (rootdepth != wattr.depth) 2442 if (rootdepth != wattr.depth)
2384 { 2443 {
2385 if (am_transparent) 2444 if (am_transparent)
2386 { 2445 {
2387 pchanged = 1; 2446 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2448 am_transparent = am_pixmap_trans = 0;
2390 } 2449 }
2391 2450
2392 return pchanged; /* Don't try any more */ 2451 return pchanged; /* Don't try any more */
2393 } 2452 }
… …
2434 Window cr; 2493 Window cr;
2435 XImage *image; 2494 XImage *image;
2436 GC gc; 2495 GC gc;
2437 XGCValues gcvalue; 2496 XGCValues gcvalue;
2438 2497
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2498 XTranslateCoordinates (disp, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2499 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2500 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2501 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2502 nx = ny = 0;
2444 2503
… …
2454 nh += sy; 2513 nh += sy;
2455 ny = -sy; 2514 ny = -sy;
2456 sy = 0; 2515 sy = 0;
2457 } 2516 }
2458 2517
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2520
2462 XSync (disp, False); 2521 XSync (disp, False);
2463 allowedxerror = -1; 2522 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2524
… …
2470 if (image == NULL) 2529 if (image == NULL)
2471 { 2530 {
2472 if (am_transparent && am_pixmap_trans) 2531 if (am_transparent && am_pixmap_trans)
2473 { 2532 {
2474 pchanged = 1; 2533 pchanged = 1;
2475 if (TermWin.pixmap != None) 2534 if (pixmap != None)
2476 { 2535 {
2477 XFreePixmap (disp, TermWin.pixmap); 2536 XFreePixmap (disp, pixmap);
2478 TermWin.pixmap = None; 2537 pixmap = None;
2479 } 2538 }
2480 } 2539 }
2481 2540
2482 am_pixmap_trans = 0; 2541 am_pixmap_trans = 0;
2483 } 2542 }
2484 else 2543 else
2485 { 2544 {
2486 if (TermWin.pixmap != None) 2545 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2546 XFreePixmap (disp, pixmap);
2488 2547
2489#if TINTING 2548#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2549 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2550 {
2492 unsigned short rm, gm, bm; 2551 unsigned short rm, gm, bm;
… …
2496 2555
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2556 ShadeXImage (display, image, shade, rm, gm, bm);
2498 } 2557 }
2499#endif 2558#endif
2500 2559
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2560 pixmap = XCreatePixmap (disp, vt,
2502 szHint.width, szHint.height, image->depth); 2561 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2565 XFreeGC (disp, gc);
2507 XDestroyImage (image); 2566 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (disp, parent[0]);
2510 2569
2511 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2571 pchanged = 1;
2513 2572
2514 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2515 } 2574 }
2516 } 2575 }
2517 2576
2518 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2520 else 2579 else
2521 { 2580 {
2522 unsigned int n; 2581 unsigned int n;
2523 /* 2582 /*
2524 * InheritPixmap transparency 2583 * InheritPixmap transparency
2525 */ 2584 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2586 {
2528 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (disp, parent[i - 1], &root,
2530 &TermWin.parent[i], &list, &n); 2589 &parent[i], &list, &n);
2531 XFree (list); 2590 XFree (list);
2532 2591
2533 if (TermWin.parent[i] == display->root) 2592 if (parent[i] == display->root)
2534 { 2593 {
2535 if (oldp != None) 2594 if (oldp != None)
2536 pchanged = 1; 2595 pchanged = 1;
2537 2596
2538 break; 2597 break;
2539 } 2598 }
2540 2599
2541 if (oldp != TermWin.parent[i]) 2600 if (oldp != parent[i])
2542 pchanged = 1; 2601 pchanged = 1;
2543 } 2602 }
2544 2603
2545 n = 0; 2604 n = 0;
2546 2605
2547 if (pchanged) 2606 if (pchanged)
2548 { 2607 {
2549 for (; n < (unsigned int)i; n++) 2608 for (; n < (unsigned int)i; n++)
2550 { 2609 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2610 XGetWindowAttributes (disp, parent[n], &wattr);
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2612 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2614 break;
2556 } 2615 }
2557 } 2616 }
2558 } 2617 }
2559 2618
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2561 { 2620 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2623 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2624 /* XXX: also turn off Opt_transparent? */
2566 } 2625 }
2567 else 2626 else
2568 { 2627 {
… …
2571 * needed for fvwm2.2.2 (and before?) */ 2630 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1); 2631 sleep (1);
2573#endif 2632#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2633 for (n = 0; n < (unsigned int)i; n++)
2575 { 2634 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2636 XClearWindow (disp, parent[n]);
2578 } 2637 }
2579 2638
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2581 am_transparent = 1; 2640 am_transparent = 1;
2582 } 2641 }
2583 2642
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2644 parent[i] = None;
2586 } 2645 }
2587 2646
2588 if (scrollBar.win) 2647 if (scrollBar.win)
2589 { 2648 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2642 /* Read a text string from the input buffer */ 2701 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2702 unicode_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2703 bool refreshnow = false;
2645 int nlines = 0; 2704 int nlines = 0;
2646 unicode_t *str = buf; 2705 unicode_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ);
2647 2707
2648 for (;;) 2708 for (;;)
2649 { 2709 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2651 break; 2711 break;
2652 2712
2653 *str++ = ch; 2713 *str++ = ch;
2654 2714
2655 if (ch == C0_LF) 2715 if (ch == C0_LF || str >= eol)
2656 { 2716 {
2717 if (ch == C0_LF)
2657 nlines++; 2718 nlines++;
2719
2658 refresh_count++; 2720 refresh_count++;
2659 2721
2660 if (!(options & Opt_jumpScroll) 2722 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2724 {
2663 refreshnow = true; 2725 refreshnow = true;
2726 refresh_count = 0;
2664 ch = NOCHAR; 2727 ch = NOCHAR;
2665 break; 2728 break;
2666 } 2729 }
2667 2730
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2731 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2732 if (nlines >= nrow - 1)
2670 { 2733 {
2671 scr_add_lines (buf, nlines, str - buf); 2734 scr_add_lines (buf, nlines, str - buf);
2672 nlines = 0; 2735 nlines = 0;
2673 str = buf; 2736 str = buf;
2737 eol = str + min (ncol, UBUFSIZ);
2674 } 2738 }
2675 }
2676 2739
2677 if (str >= buf + UBUFSIZ) 2740 if (str >= eol)
2678 { 2741 {
2742 if (eol >= buf + UBUFSIZ)
2743 {
2679 ch = NOCHAR; 2744 ch = NOCHAR;
2680 break; 2745 break;
2746 }
2747 else
2748 eol = min (eol + ncol, buf + UBUFSIZ);
2749 }
2750
2681 } 2751 }
2682 2752
2683 seq_begin = cmdbuf_ptr; 2753 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2754 ch = next_char ();
2685 } 2755 }
… …
2692 * the number of pages between refreshes is refresh_limit, which 2762 * the number of pages between refreshes is refresh_limit, which
2693 * is incremented here because we must be doing flat-out scrolling. 2763 * is incremented here because we must be doing flat-out scrolling.
2694 */ 2764 */
2695 if (refreshnow) 2765 if (refreshnow)
2696 { 2766 {
2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2698 refresh_limit++; 2768 refresh_limit++;
2699 else 2769 else
2700 { 2770 {
2701 flag = true; 2771 flag = true;
2702 scr_refresh (refresh_type); 2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2703 } 2774 }
2704 } 2775 }
2705 2776
2706 } 2777 }
2707 else 2778 else
… …
3344 3415
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3421 break;
3351 3422
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write ((const unsigned char *)VT100_ANS,
3354 (unsigned int) (sizeof (VT100_ANS) - 1)); 3425 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3366 break; 3437 break;
3367 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3368 scr_report_position (); 3439 scr_report_position ();
3369 break; 3440 break;
3370 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3371 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3372 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3373 break; 3444 break;
3374 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3376 break; 3447 break;
… …
3479 { 3550 {
3480 /* 3551 /*
3481 * commands 3552 * commands
3482 */ 3553 */
3483 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3485 break; 3556 break;
3486 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (disp, parent[0], display->screen);
3488 break; 3559 break;
3489 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3491 break; 3562 break;
3492 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3565 break;
3495 case 5: /* raise window */ 3566 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3497 break; 3568 break;
3498 case 6: /* lower window */ 3569 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3500 break; 3571 break;
3501 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3502 scr_touch (true); 3573 scr_touch (true);
3503 break; 3574 break;
3504 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3507 break; 3578 break;
3508 3579
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3581 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3514 break; 3585 break;
3515 3586
3516 3587
3517 /* 3588 /*
3518 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3519 */ 3590 */
3520 case 11: /* report window state */ 3591 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3594 break;
3524 case 13: /* report window position */ 3595 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3601 break;
3531 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3605 break;
3535 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3608 break;
3538 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3611 break;
3541 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3542 { 3613 {
3543 char *s; 3614 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3617 XFree (s);
3547 } 3618 }
3548 break; 3619 break;
3549 case 21: /* report window title */ 3620 case 21: /* report window title */
3550 { 3621 {
3551 char *s; 3622 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3625 XFree (s);
3555 } 3626 }
3556 break; 3627 break;
3557 } 3628 }
3558} 3629}
… …
3703 unsigned long bytes_after; 3774 unsigned long bytes_after;
3704 unsigned char *value = 0; 3775 unsigned char *value = 0;
3705 const char *str = ""; 3776 const char *str = "";
3706 3777
3707 if (prop 3778 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3783 && actual_type != None
3713 && actual_format == 8) 3784 && actual_format == 8)
… …
3725 { 3796 {
3726 *eq = 0; 3797 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3728 } 3799 }
3729 else 3800 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3731 display->atom (str)); 3802 display->atom (str));
3732 } 3803 }
3733 break; 3804 break;
3734 3805
3735 case XTerm_Color: 3806 case XTerm_Color:
… …
3834 // TODO, when secure mode? 3905 // TODO, when secure mode?
3835 break; 3906 break;
3836 3907
3837#ifdef MENUBAR 3908#ifdef MENUBAR
3838 case URxvt_Menu: 3909 case URxvt_Menu:
3839 if (options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3841 break; 3912 break;
3842#endif 3913#endif
3843#if 0 3914#if 0
3844 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
… …
3860 case URxvt_italicFont: 3931 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3862#endif 3933#endif
3863 if (query) 3934 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3938 resp);
3868 else 3939 else
3869 { 3940 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3942
… …
3876 break; 3947 break;
3877 3948
3878#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3879 case URxvt_locale: 3950 case URxvt_locale:
3880 if (query) 3951 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3882 else 3953 else
3883 { 3954 {
3884 set_locale (str); 3955 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3886 init_xlocale (); 3957 init_xlocale ();
… …
4014 } 4085 }
4015 4086
4016 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
4017 switch (arg[i]) 4088 switch (arg[i])
4018 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
4019 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
4020 case 1049: 4101 case 1049:
4021 if (options & Opt_secondaryScreen) 4102 if (OPTION (Opt_secondaryScreen))
4022 if (mode == 0) 4103 if (mode == 0)
4023 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
4024 else if (mode == 1) 4105 else if (mode == 1)
4025 scr_cursor (SAVE); 4106 scr_cursor (SAVE);
4026 break; 4107 break;
… …
4038 */ 4119 */
4039 PrivMode (1, PrivMode_vt52); 4120 PrivMode (1, PrivMode_vt52);
4040 break; 4121 break;
4041 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4125 break;
4045 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
4046 if (state) 4127 if (!state)
4047 options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
4048 else 4129 else
4049 options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
4050 break; 4131 break;
4051 case 5: /* reverse video */ 4132 case 5: /* reverse video */
4052 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
4053 break; 4134 break;
4054 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
… …
4095#if 0 4176#if 0
4096 case 1001: 4177 case 1001:
4097 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4098#endif 4179#endif
4099 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4100 if (state) 4181 if (!state)
4101 options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
4102 else 4183 else
4103 options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
4104 break; 4185 break;
4105 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
4106 if (state) 4187 if (state)
4107 options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
4108 else 4189 else
4109 options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
4110 break; 4191 break;
4111 case 1047: /* secondary screen w/ clearing last */ 4192 case 1047: /* secondary screen w/ clearing last */
4112 if (options & Opt_secondaryScreen) 4193 if (OPTION (Opt_secondaryScreen))
4113 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
4114 scr_erase_screen (2); 4195 scr_erase_screen (2);
4115 scr_change_screen (state); 4196 scr_change_screen (state);
4116 break; 4197 break;
4117 case 1049: /* secondary screen w/ clearing first */ 4198 case 1049: /* secondary screen w/ clearing first */
4118 scr_change_screen (state); 4199 scr_change_screen (state);
4119 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4202 scr_erase_screen (2);
4122 break; 4203 break;
4123 default: 4204 default:
4124 break; 4205 break;
… …
4274 case 106: 4355 case 106:
4275 case 107: 4356 case 107:
4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4277 break; 4358 break;
4278#endif 4359#endif
4279
4280 } 4360 }
4281 } 4361 }
4282} 4362}
4283/*}}} */ 4363/*}}} */
4284 4364
… …
4365 } 4445 }
4366 4446
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4448 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4371 destroy ();
4372} 4451}
4373 4452
4374/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4375 4454

Diff Legend

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