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.229 by root, Tue Jan 3 17:34:44 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 ()
… …
316 345
317 // the XOpenIM manpage lies about hardcoding the locale 346 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 347 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 348 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 349 SET_LOCALE (rs[Rs_imLocale]);
350
321 // assume wchar_t == unicode or better 351 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 352 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 353 KBUFSZ, &keysym, &status_return);
354
324 if (rs[Rs_imLocale]) 355 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 356 SET_LOCALE (locale);
326 357
327 if (status_return == XLookupChars 358 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 359 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 391#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 392 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 393 return;
363#endif 394#endif
364 395
365 if (TermWin.saveLines) 396 if (saveLines)
366 { 397 {
367#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 399 if (!ctrl && !meta)
369#else 400#else
370 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
371#endif 402#endif
372 { 403 {
373 int lnsppg; 404 int lnsppg;
374 405
375#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 408#else
378 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
379#endif 410#endif
380 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
381 { 412 {
382 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
383 return; 414 return;
… …
838 } 869 }
839 870
840 if (len <= 0) 871 if (len <= 0)
841 return; /* not mapped */ 872 return; /* not mapped */
842 873
843 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 875 if (view_start)
845 { 876 {
846 TermWin.view_start = 0; 877 view_start = 0;
847 want_refresh = 1; 878 want_refresh = 1;
848 } 879 }
849 880
850 /* 881 /*
851 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
954 SET_LOCALE (locale); 985 SET_LOCALE (locale);
955 986
956 display->flush (); 987 display->flush ();
957 988
958 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 991}
961 992
962void 993void
963rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
964{ 995{
… …
1028{ 1059{
1029 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1030 || 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)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1063 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1064 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1065 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1066 mouse_slip_wheel_speed = 0;
1036 1067
1037 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1069 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1071 }
1041} 1072}
1042#endif 1073#endif
1043 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
1044bool 1093bool
1045rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1046{ 1095{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1097
… …
1054 1103
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1058 1107
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1109
1061 if (n > 0) 1110 if (r > 0)
1062 { 1111 {
1063 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1064 return true; 1113 return true;
1065 } 1114 }
1066 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 if (display->is_local)
1119 event_handler.cw_yield.start ();
1120#endif
1121 }
1122 else
1123 {
1124 pty_ev.stop ();
1125
1126 if (!OPTION (Opt_hold))
1067 destroy (); 1127 destroy ();
1128 }
1068 1129
1069 return false; 1130 return false;
1070} 1131}
1071 1132
1072void 1133void
… …
1086} 1147}
1087 1148
1088void 1149void
1089rxvt_term::pointer_unblank () 1150rxvt_term::pointer_unblank ()
1090{ 1151{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1152 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1153 recolour_cursor ();
1093 1154
1094#ifdef POINTER_BLANK 1155#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1156 hidden_pointer = 0;
1096 1157
1097 if (options & Opt_pointerBlank) 1158 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1159 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1160#endif
1100} 1161}
1101 1162
1102#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
1103void 1164void
1104rxvt_term::pointer_blank () 1165rxvt_term::pointer_blank ()
1105{ 1166{
1106 if (! (options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
1107 return; 1168 return;
1108 1169
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1171 XFlush (display->display);
1111 1172
1112 hidden_pointer = 1; 1173 hidden_pointer = 1;
1113} 1174}
1114 1175
… …
1209 1270
1210 SET_R (this); 1271 SET_R (this);
1211 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
1212 1273
1213#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1276 {
1216 if (hidden_cursor) 1277 if (hidden_cursor)
1217 { 1278 {
1218 hidden_cursor = 0; 1279 hidden_cursor = 0;
1219 want_refresh = 1; 1280 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1284 }
1224#endif 1285#endif
1225 1286
1226#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1289 {
1229 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1293 if (hidden_pointer)
… …
1416 case FocusOut: 1477 case FocusOut:
1417 focus_out (); 1478 focus_out ();
1418 break; 1479 break;
1419 1480
1420 case ConfigureNotify: 1481 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1422 { 1483 {
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)); 1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ;
1432 1486
1433 if (szHint.width != width || szHint.height != height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1488 {
1435 seen_resize = 1; 1489 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1491 }
1438 1492
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1494 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1495 check_our_parents ();
1442#endif 1496#endif
1443 } 1497 }
1444 break; 1498 break;
1445 1499
… …
1462 case SelectionRequest: 1516 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1464 break; 1518 break;
1465 1519
1466 case UnmapNotify: 1520 case UnmapNotify:
1467 TermWin.mapped = 0; 1521 mapped = 0;
1468#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1470#endif 1524#endif
1471 break; 1525 break;
1472 1526
1473 case MapNotify: 1527 case MapNotify:
1474 TermWin.mapped = 1; 1528 mapped = 1;
1475#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif 1531#endif
1478 break; 1532 break;
1479 1533
… …
1483 break; 1537 break;
1484#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1485 1539
1486 case GraphicsExpose: 1540 case GraphicsExpose:
1487 case Expose: 1541 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1489 { 1543 {
1490 do 1544 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1548
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1550
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1500 1554
1501 scr_refresh (refresh_type); 1555 scr_refresh (refresh_type);
1502 } 1556 }
… …
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose (); 1573 menubar_expose ();
1520#endif 1574#endif
1521 1575
1522#ifdef TRANSPARENT 1576#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1577 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1578 XClearWindow (disp, ev.xany.window);
1525#endif 1579#endif
1526 } 1580 }
1527 break; 1581 break;
1528 1582
… …
1539 } 1593 }
1540#endif 1594#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1596 break;
1543 1597
1544 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1545 { 1599 {
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1601 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1603 ;
1550 1604
1551 XQueryPointer (disp, TermWin.vt, 1605 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1609 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1568#endif 1622#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1625
1572#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1629 {
1576 int dist; 1630 int dist;
1577 1631
1578 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1644
1591 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1593 { 1647 {
1594 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1596 } 1650 }
1597 else 1651 else
1598 { 1652 {
1599 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1654 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1655 }
1602 1656
1603 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1659 + 1;
1606 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1608 } 1662 }
1609 else 1663 else
1610 { 1664 {
1611 /* we are within the text window, so we 1665 /* we are within the text window, so we
… …
1642} 1696}
1643 1697
1644void 1698void
1645rxvt_term::focus_in () 1699rxvt_term::focus_in ()
1646{ 1700{
1647 if (!TermWin.focus) 1701 if (!focus)
1648 { 1702 {
1649 TermWin.focus = 1; 1703 focus = 1;
1650 want_refresh = 1; 1704 want_refresh = 1;
1705
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707
1651#ifdef USE_XIM 1708#if USE_XIM
1652 if (Input_Context != NULL) 1709 if (Input_Context != NULL)
1653 { 1710 {
1654 IMSetStatusPosition (); 1711 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1712 XSetICFocus (Input_Context);
1656 } 1713 }
1657#endif 1714#endif
1658#ifdef CURSOR_BLINK 1715#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1716 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1718#endif
1662#ifdef OFF_FOCUS_FADING 1719#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1720 if (rs[Rs_fade])
1664 { 1721 {
1665 pix_colors = pix_colors_focused; 1722 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1723 scr_recolour ();
1667 } 1724 }
… …
1670} 1727}
1671 1728
1672void 1729void
1673rxvt_term::focus_out () 1730rxvt_term::focus_out ()
1674{ 1731{
1675 if (TermWin.focus) 1732 if (focus)
1676 { 1733 {
1677 TermWin.focus = 0; 1734 focus = 0;
1678 want_refresh = 1; 1735 want_refresh = 1;
1679 1736
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1680#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1681 iso14755buf = 0; 1742 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1743# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1744 scr_overlay_off ();
1685#endif 1745# endif
1746 }
1747#endif
1686#ifdef USE_XIM 1748#if USE_XIM
1687 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1689#endif 1751#endif
1690#ifdef CURSOR_BLINK 1752#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1753 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1755 hidden_cursor = 0;
1694#endif 1756#endif
1695#ifdef OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1697 { 1759 {
1698 pix_colors = pix_colors_unfocused; 1760 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1761 scr_recolour ();
1700 } 1762 }
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1783 return;
1722 1784
1723 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1724 case ReparentNotify: 1786 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1727 break; 1789 break;
1728 } 1790 }
1729} 1791}
1730#endif 1792#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1734{ 1796{
1735 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1736 1798
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1738 if (!bypass_keystate) 1801 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1803
1741 /* 1804 /*
1742 * VT window processing of button press 1805 * VT window processing of button press
1743 */ 1806 */
1744 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1745 { 1808 {
1746#if ISO_14755 1809#if ISO_14755
1747 // 5.4 1810 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1812 {
… …
1791 else 1854 else
1792 { 1855 {
1793 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1794 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1795 1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1796 switch (ev.button) 1860 switch (ev.button)
1797 { 1861 {
1798 case Button1: 1862 case Button1:
1799 /* allow meta + click to select rectangular areas */ 1863 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */ 1864 /* should be done in screen.C */
1801#if ENABLE_FRILLS 1865#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask); 1866 selection.rect = !!(ev.state & ModMetaMask);
1803#else 1867#else
1804 selection.rect = false; 1868 selection.rect = false;
1805#endif 1869#endif
1806 1870
1807 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1809 { 1873 {
1810 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1812 else 1876 else
1813 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1814 } 1878 }
1815 else 1879 else
1816 { 1880 {
1817 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1818 MEvent.clicks++; 1882 MEvent.clicks++;
1819 else 1883 else
1820 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1821 1885
1822 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1823 } 1887 }
1824 1888
1825 MEvent.button = Button1; 1889 MEvent.button = Button1;
1826 break; 1890 break;
1827 1891
1828 case Button3: 1892 case Button3:
1829 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1830 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1831 else 1895 else
1832 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1833 1897
1834 MEvent.button = Button3; 1898 MEvent.button = Button3;
1835 break; 1899 break;
1836 } 1900 }
1837 } 1901 }
1838 1902
1839 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1840 return; 1904 return;
1841 } 1905 }
1842 1906
… …
1954 case Button3: 2018 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 2019 if (scrollBar.style != R_SB_XTERM)
1956 { 2020 {
1957 if (scrollbar_above_slider (ev.y)) 2021 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 2022# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 2023 scr_page (UP, nrow - 1);
1960# else 2024# else
1961 scr_page (UP, TermWin.nrow / 4); 2025 scr_page (UP, nrow / 4);
1962# endif 2026# endif
1963 else if (scrollbar_below_slider (ev.y)) 2027 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 2029 scr_page (DN, nrow - 1);
1966# else 2030# else
1967 scr_page (DN, TermWin.nrow / 4); 2031 scr_page (DN, nrow / 4);
1968# endif 2032# endif
1969 else 2033 else
1970 scrollBar.setMotion (); 2034 scrollBar.setMotion ();
1971 } 2035 }
1972 else 2036 else
1973 { 2037 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 2038 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 2039 (nrow
1976 * scrollbar_position (ev.y) 2040 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 2041 / scrollbar_size ()));
1978 } 2042 }
1979 2043
1980 break; 2044 break;
… …
2012#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
2015#endif 2079#endif
2016 2080
2017 if (ev.window == TermWin.vt) 2081 if (ev.window == vt)
2018 { 2082 {
2019#if ISO_14755 2083#if ISO_14755
2020 // 5.4 2084 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2086 return;
… …
2072 2136
2073 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2074 2138
2075 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2076 i = 1; 2140 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2141 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = TermWin.nrow - 1; 2142 i = nrow - 1;
2079 else 2143 else
2080 i = 5; 2144 i = 5;
2081 2145
2082# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
2084 { 2148 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2150 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; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2152
2089 if (slip_wheel_ev.at < NOW) 2153 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2155
2092 slip_wheel_ev.start (); 2156 slip_wheel_ev.start ();
… …
2368 XWindowAttributes wattr, wrootattr; 2432 XWindowAttributes wattr, wrootattr;
2369 dDisp; 2433 dDisp;
2370 2434
2371 pchanged = 0; 2435 pchanged = 0;
2372 2436
2373 if (!(options & Opt_transparent)) 2437 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2375 2439
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2440 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2441 rootdepth = wrootattr.depth;
2378 2442
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2443 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2444
2381 if (rootdepth != wattr.depth) 2445 if (rootdepth != wattr.depth)
2382 { 2446 {
2383 if (am_transparent) 2447 if (am_transparent)
2384 { 2448 {
2385 pchanged = 1; 2449 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2451 am_transparent = am_pixmap_trans = 0;
2388 } 2452 }
2389 2453
2390 return pchanged; /* Don't try any more */ 2454 return pchanged; /* Don't try any more */
2391 } 2455 }
… …
2432 Window cr; 2496 Window cr;
2433 XImage *image; 2497 XImage *image;
2434 GC gc; 2498 GC gc;
2435 XGCValues gcvalue; 2499 XGCValues gcvalue;
2436 2500
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2501 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2502 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2503 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2504 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2505 nx = ny = 0;
2442 2506
… …
2452 nh += sy; 2516 nh += sy;
2453 ny = -sy; 2517 ny = -sy;
2454 sy = 0; 2518 sy = 0;
2455 } 2519 }
2456 2520
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2523
2460 XSync (disp, False); 2524 XSync (disp, False);
2461 allowedxerror = -1; 2525 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2527
… …
2468 if (image == NULL) 2532 if (image == NULL)
2469 { 2533 {
2470 if (am_transparent && am_pixmap_trans) 2534 if (am_transparent && am_pixmap_trans)
2471 { 2535 {
2472 pchanged = 1; 2536 pchanged = 1;
2473 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2474 { 2538 {
2475 XFreePixmap (disp, TermWin.pixmap); 2539 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2540 pixmap = None;
2477 } 2541 }
2478 } 2542 }
2479 2543
2480 am_pixmap_trans = 0; 2544 am_pixmap_trans = 0;
2481 } 2545 }
2482 else 2546 else
2483 { 2547 {
2484 if (TermWin.pixmap != None) 2548 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2549 XFreePixmap (disp, pixmap);
2486 2550
2487#if TINTING 2551#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2552 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2553 {
2490 unsigned short rm, gm, bm; 2554 unsigned short rm, gm, bm;
… …
2494 2558
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2559 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2560 }
2497#endif 2561#endif
2498 2562
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2563 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2564 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2566 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2567 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2568 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2569 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2571 XClearWindow (disp, parent[0]);
2508 2572
2509 if (!am_transparent || !am_pixmap_trans) 2573 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2574 pchanged = 1;
2511 2575
2512 am_transparent = am_pixmap_trans = 1; 2576 am_transparent = am_pixmap_trans = 1;
2513 } 2577 }
2514 } 2578 }
2515 2579
2516 if (am_pixmap_trans) 2580 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2582 else
2519 { 2583 {
2520 unsigned int n; 2584 unsigned int n;
2521 /* 2585 /*
2522 * InheritPixmap transparency 2586 * InheritPixmap transparency
2523 */ 2587 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2589 {
2526 oldp = TermWin.parent[i]; 2590 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2591 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2592 &parent[i], &list, &n);
2529 XFree (list); 2593 XFree (list);
2530 2594
2531 if (TermWin.parent[i] == display->root) 2595 if (parent[i] == display->root)
2532 { 2596 {
2533 if (oldp != None) 2597 if (oldp != None)
2534 pchanged = 1; 2598 pchanged = 1;
2535 2599
2536 break; 2600 break;
2537 } 2601 }
2538 2602
2539 if (oldp != TermWin.parent[i]) 2603 if (oldp != parent[i])
2540 pchanged = 1; 2604 pchanged = 1;
2541 } 2605 }
2542 2606
2543 n = 0; 2607 n = 0;
2544 2608
2545 if (pchanged) 2609 if (pchanged)
2546 { 2610 {
2547 for (; n < (unsigned int)i; n++) 2611 for (; n < (unsigned int)i; n++)
2548 { 2612 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2613 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2615 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2617 break;
2554 } 2618 }
2555 } 2619 }
2556 } 2620 }
2557 2621
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2623 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2626 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2627 /* XXX: also turn off Opt_transparent? */
2564 } 2628 }
2565 else 2629 else
2566 { 2630 {
… …
2569 * needed for fvwm2.2.2 (and before?) */ 2633 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2634 sleep (1);
2571#endif 2635#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2636 for (n = 0; n < (unsigned int)i; n++)
2573 { 2637 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2639 XClearWindow (disp, parent[n]);
2576 } 2640 }
2577 2641
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2643 am_transparent = 1;
2580 } 2644 }
2581 2645
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2647 parent[i] = None;
2584 } 2648 }
2585 2649
2586 if (scrollBar.win) 2650 if (scrollBar.win)
2587 { 2651 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2640 /* Read a text string from the input buffer */ 2704 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2705 unicode_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2706 bool refreshnow = false;
2643 int nlines = 0; 2707 int nlines = 0;
2644 unicode_t *str = buf; 2708 unicode_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ);
2645 2710
2646 for (;;) 2711 for (;;)
2647 { 2712 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2714 break;
2650 2715
2651 *str++ = ch; 2716 *str++ = ch;
2652 2717
2653 if (ch == C0_LF) 2718 if (ch == C0_LF || str >= eol)
2654 { 2719 {
2720 if (ch == C0_LF)
2655 nlines++; 2721 nlines++;
2722
2656 refresh_count++; 2723 refresh_count++;
2657 2724
2658 if (!(options & Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2727 {
2661 refreshnow = true; 2728 refreshnow = true;
2729 refresh_count = 0;
2662 ch = NOCHAR; 2730 ch = NOCHAR;
2663 break; 2731 break;
2664 } 2732 }
2665 2733
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2735 if (nlines >= nrow - 1)
2668 { 2736 {
2669 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, nlines, str - buf);
2670 nlines = 0; 2738 nlines = 0;
2671 str = buf; 2739 str = buf;
2740 eol = str + min (ncol, UBUFSIZ);
2672 } 2741 }
2673 }
2674 2742
2675 if (str >= buf + UBUFSIZ) 2743 if (str >= eol)
2676 { 2744 {
2745 if (eol >= buf + UBUFSIZ)
2746 {
2677 ch = NOCHAR; 2747 ch = NOCHAR;
2678 break; 2748 break;
2749 }
2750 else
2751 eol = min (eol + ncol, buf + UBUFSIZ);
2752 }
2753
2679 } 2754 }
2680 2755
2681 seq_begin = cmdbuf_ptr; 2756 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2757 ch = next_char ();
2683 } 2758 }
… …
2690 * the number of pages between refreshes is refresh_limit, which 2765 * the number of pages between refreshes is refresh_limit, which
2691 * is incremented here because we must be doing flat-out scrolling. 2766 * is incremented here because we must be doing flat-out scrolling.
2692 */ 2767 */
2693 if (refreshnow) 2768 if (refreshnow)
2694 { 2769 {
2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2696 refresh_limit++; 2771 refresh_limit++;
2697 else 2772 else
2698 { 2773 {
2699 flag = true; 2774 flag = true;
2700 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2701 } 2777 }
2702 } 2778 }
2703 2779
2704 } 2780 }
2705 else 2781 else
… …
3342 3418
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3419 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3420 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3421 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3424 break;
3349 3425
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3427 tt_write ((const unsigned char *)VT100_ANS,
3352 (unsigned int) (sizeof (VT100_ANS) - 1)); 3428 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3364 break; 3440 break;
3365 case 6: /* CPR requested */ 3441 case 6: /* CPR requested */
3366 scr_report_position (); 3442 scr_report_position ();
3367 break; 3443 break;
3368 case 7: /* unofficial extension */ 3444 case 7: /* unofficial extension */
3369 if (options & Opt_insecure) 3445 if (OPTION (Opt_insecure))
3370 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3446 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3371 break; 3447 break;
3372 case 8: /* unofficial extension */ 3448 case 8: /* unofficial extension */
3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3374 break; 3450 break;
… …
3477 { 3553 {
3478 /* 3554 /*
3479 * commands 3555 * commands
3480 */ 3556 */
3481 case 1: /* deiconify window */ 3557 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3558 XMapWindow (disp, parent[0]);
3483 break; 3559 break;
3484 case 2: /* iconify window */ 3560 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3561 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3562 break;
3487 case 3: /* set position (pixels) */ 3563 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3564 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3565 break;
3490 case 4: /* set size (pixels) */ 3566 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3568 break;
3493 case 5: /* raise window */ 3569 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3570 XRaiseWindow (disp, parent[0]);
3495 break; 3571 break;
3496 case 6: /* lower window */ 3572 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3573 XLowerWindow (disp, parent[0]);
3498 break; 3574 break;
3499 case 7: /* refresh window */ 3575 case 7: /* refresh window */
3500 scr_touch (true); 3576 scr_touch (true);
3501 break; 3577 break;
3502 case 8: /* set size (chars) */ 3578 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3579 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
3505 break; 3581 break;
3506 3582
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3583 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3584 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3585 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3586 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3587 (unsigned int) (args[1] * fheight));
3512 break; 3588 break;
3513 3589
3514 3590
3515 /* 3591 /*
3516 * reports - some output format copied from XTerm 3592 * reports - some output format copied from XTerm
3517 */ 3593 */
3518 case 11: /* report window state */ 3594 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3597 break;
3522 case 13: /* report window position */ 3598 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3600 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3601 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3602 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3603 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3604 break;
3529 case 14: /* report window size (pixels) */ 3605 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3606 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3608 break;
3533 case 18: /* report text area size (chars) */ 3609 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3611 break;
3536 case 19: /* report window size (chars) */ 3612 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3613 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3614 break;
3539 case 20: /* report icon label */ 3615 case 20: /* report icon label */
3540 { 3616 {
3541 char *s; 3617 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3618 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3620 XFree (s);
3545 } 3621 }
3546 break; 3622 break;
3547 case 21: /* report window title */ 3623 case 21: /* report window title */
3548 { 3624 {
3549 char *s; 3625 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3626 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3628 XFree (s);
3553 } 3629 }
3554 break; 3630 break;
3555 } 3631 }
3556} 3632}
… …
3588 else if (ch < 0x20) 3664 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3665 return NULL; /* other control character - exit */
3590 3666
3591 seen_esc = false; 3667 seen_esc = false;
3592 3668
3593 if (n >= sizeof (string) - 1) 3669 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3670 // stop at some sane length
3595 return NULL; 3671 return NULL;
3596 3672
3597 if (ch == C0_SYN) 3673 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3674 string[n++] = cmd_get8 ();
… …
3701 unsigned long bytes_after; 3777 unsigned long bytes_after;
3702 unsigned char *value = 0; 3778 unsigned char *value = 0;
3703 const char *str = ""; 3779 const char *str = "";
3704 3780
3705 if (prop 3781 if (prop
3706 && XGetWindowProperty (disp, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3707 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3708 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3709 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3710 && actual_type != None 3786 && actual_type != None
3711 && actual_format == 8) 3787 && actual_format == 8)
… …
3723 { 3799 {
3724 *eq = 0; 3800 *eq = 0;
3725 set_utf8_property (display->atom (str), eq + 1); 3801 set_utf8_property (display->atom (str), eq + 1);
3726 } 3802 }
3727 else 3803 else
3728 XDeleteProperty (disp, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3729 display->atom (str)); 3805 display->atom (str));
3730 } 3806 }
3731 break; 3807 break;
3732 3808
3733 case XTerm_Color: 3809 case XTerm_Color:
… …
3832 // TODO, when secure mode? 3908 // TODO, when secure mode?
3833 break; 3909 break;
3834 3910
3835#ifdef MENUBAR 3911#ifdef MENUBAR
3836 case URxvt_Menu: 3912 case URxvt_Menu:
3837 if (options & Opt_insecure) 3913 if (OPTION (Opt_insecure))
3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3839 break; 3915 break;
3840#endif 3916#endif
3841#if 0 3917#if 0
3842 case XTerm_dumpscreen: /* no error notices */ 3918 case XTerm_dumpscreen: /* no error notices */
… …
3858 case URxvt_italicFont: 3934 case URxvt_italicFont:
3859 case URxvt_boldItalicFont: 3935 case URxvt_boldItalicFont:
3860#endif 3936#endif
3861 if (query) 3937 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop, 3938 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3940 ? fontset[op - URxvt_font]->fontdesc : "",
3865 resp); 3941 resp);
3866 else 3942 else
3867 { 3943 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3944 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869 3945
… …
3874 break; 3950 break;
3875 3951
3876#if ENABLE_FRILLS 3952#if ENABLE_FRILLS
3877 case URxvt_locale: 3953 case URxvt_locale:
3878 if (query) 3954 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3880 else 3956 else
3881 { 3957 {
3882 set_locale (str); 3958 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8); 3959 pty.set_utf8_mode (enc_utf8);
3884 init_xlocale (); 3960 init_xlocale ();
… …
4012 } 4088 }
4013 4089
4014 /* extra handling for values with state unkept */ 4090 /* extra handling for values with state unkept */
4015 switch (arg[i]) 4091 switch (arg[i])
4016 { 4092 {
4093#if ENABLE_STYLES
4094 case 1021:
4095 if (mode)
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099
4100 scr_touch (true);
4101 break;
4102#endif
4017 case 1048: /* alternative cursor save */ 4103 case 1048: /* alternative cursor save */
4018 case 1049: 4104 case 1049:
4019 if (options & Opt_secondaryScreen) 4105 if (OPTION (Opt_secondaryScreen))
4020 if (mode == 0) 4106 if (mode == 0)
4021 scr_cursor (RESTORE); 4107 scr_cursor (RESTORE);
4022 else if (mode == 1) 4108 else if (mode == 1)
4023 scr_cursor (SAVE); 4109 scr_cursor (SAVE);
4024 break; 4110 break;
… …
4036 */ 4122 */
4037 PrivMode (1, PrivMode_vt52); 4123 PrivMode (1, PrivMode_vt52);
4038 break; 4124 break;
4039 case 3: /* 80/132 */ 4125 case 3: /* 80/132 */
4040 if (priv_modes & PrivMode_132OK) 4126 if (priv_modes & PrivMode_132OK)
4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4127 set_widthheight (((state ? 132 : 80) * fwidth), height);
4042 break; 4128 break;
4043 case 4: /* smooth scrolling */ 4129 case 4: /* smooth scrolling */
4044 if (state) 4130 if (!state)
4045 options &= ~Opt_jumpScroll; 4131 SET_OPTION (Opt_jumpScroll);
4046 else 4132 else
4047 options |= Opt_jumpScroll; 4133 CLR_OPTION (Opt_jumpScroll);
4048 break; 4134 break;
4049 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4050 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4051 break; 4137 break;
4052 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4093#if 0 4179#if 0
4094 case 1001: 4180 case 1001:
4095 break; /* X11 mouse highlighting */ 4181 break; /* X11 mouse highlighting */
4096#endif 4182#endif
4097 case 1010: /* scroll to bottom on TTY output inhibit */ 4183 case 1010: /* scroll to bottom on TTY output inhibit */
4098 if (state) 4184 if (!state)
4099 options &= ~Opt_scrollTtyOutput; 4185 SET_OPTION (Opt_scrollTtyOutput);
4100 else 4186 else
4101 options |= Opt_scrollTtyOutput; 4187 CLR_OPTION (Opt_scrollTtyOutput);
4102 break; 4188 break;
4103 case 1011: /* scroll to bottom on key press */ 4189 case 1011: /* scroll to bottom on key press */
4104 if (state) 4190 if (state)
4105 options |= Opt_scrollTtyKeypress; 4191 SET_OPTION (Opt_scrollTtyKeypress);
4106 else 4192 else
4107 options &= ~Opt_scrollTtyKeypress; 4193 CLR_OPTION (Opt_scrollTtyKeypress);
4108 break; 4194 break;
4109 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4110 if (options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
4111 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4112 scr_erase_screen (2); 4198 scr_erase_screen (2);
4113 scr_change_screen (state); 4199 scr_change_screen (state);
4114 break; 4200 break;
4115 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
4116 scr_change_screen (state); 4202 scr_change_screen (state);
4117 if (options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
4118 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4119 scr_erase_screen (2); 4205 scr_erase_screen (2);
4120 break; 4206 break;
4121 default: 4207 default:
4122 break; 4208 break;
… …
4272 case 106: 4358 case 106:
4273 case 107: 4359 case 107:
4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4275 break; 4361 break;
4276#endif 4362#endif
4277
4278 } 4363 }
4279 } 4364 }
4280} 4365}
4281/*}}} */ 4366/*}}} */
4282 4367
… …
4363 } 4448 }
4364 4449
4365 memmove (v_buffer, v_buffer + written, v_buflen); 4450 memmove (v_buffer, v_buffer + written, v_buflen);
4366 } 4451 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4452 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this... 4453 pty_ev.set (EVENT_READ);
4369 destroy ();
4370} 4454}
4371 4455
4372/*----------------------- end-of-file (C source) -----------------------*/ 4456/*----------------------- end-of-file (C source) -----------------------*/
4373 4457

Diff Legend

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