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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC

… …
54# include "keyboard.h" 54# include "keyboard.h"
55#endif 55#endif
56 56
57#include <csignal> 57#include <csignal>
58 58
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
61# include <sched.h>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62 67
63// exception thrown when the command parser runs out of input data 68// exception thrown when the command parser runs out of input data
… …
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
… …
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);
… …
1054 1085
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1086 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1087 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1088 cmdbuf_endp = cmdbuf_ptr + n;
1058 1089
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1091
1061 if (n > 0) 1092 if (r > 0)
1062 { 1093 {
1063 cmdbuf_endp += n; 1094 cmdbuf_endp += r;
1064 return true; 1095 return true;
1065 } 1096 }
1066 else if (n < 0 && errno != EAGAIN) 1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 {
1099#if HAVE_SCHED_YIELD
1100 sched_yield ();
1101#endif
1102 }
1103 else
1104 {
1105 pty_ev.stop ();
1106
1107 if (!OPTION (Opt_hold))
1067 destroy (); 1108 destroy ();
1109 }
1068 1110
1069 return false; 1111 return false;
1070} 1112}
1071 1113
1072void 1114void
… …
1086} 1128}
1087 1129
1088void 1130void
1089rxvt_term::pointer_unblank () 1131rxvt_term::pointer_unblank ()
1090{ 1132{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1133 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1134 recolour_cursor ();
1093 1135
1094#ifdef POINTER_BLANK 1136#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1137 hidden_pointer = 0;
1096 1138
1097 if (options & Opt_pointerBlank) 1139 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1140 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1141#endif
1100} 1142}
1101 1143
1102#ifdef POINTER_BLANK 1144#ifdef POINTER_BLANK
1103void 1145void
1104rxvt_term::pointer_blank () 1146rxvt_term::pointer_blank ()
1105{ 1147{
1106 if (! (options & Opt_pointerBlank)) 1148 if (! OPTION (Opt_pointerBlank))
1107 return; 1149 return;
1108 1150
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1151 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1152 XFlush (display->display);
1111 1153
1112 hidden_pointer = 1; 1154 hidden_pointer = 1;
1113} 1155}
1114 1156
… …
1209 1251
1210 SET_R (this); 1252 SET_R (this);
1211 SET_LOCALE (locale); 1253 SET_LOCALE (locale);
1212 1254
1213#if defined(CURSOR_BLINK) 1255#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1257 {
1216 if (hidden_cursor) 1258 if (hidden_cursor)
1217 { 1259 {
1218 hidden_cursor = 0; 1260 hidden_cursor = 0;
1219 want_refresh = 1; 1261 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1265 }
1224#endif 1266#endif
1225 1267
1226#if defined(POINTER_BLANK) 1268#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1270 {
1229 if (ev.type == MotionNotify 1271 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1272 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1273 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1274 if (hidden_pointer)
… …
1330 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
1331 break; 1373 break;
1332 1374
1333 case ClientMessage: 1375 case ClientMessage:
1334 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1378 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1379 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1380 destroy ();
1381#if ENABLE_EWMH
1382 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1383 XSendEvent (disp, ev.xclient.window = display->root,
1384 False, SubstructureRedirectMask | SubstructureNotifyMask,
1385 &ev);
1386#endif
1387 }
1338#if ENABLE_XEMBED 1388#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1390 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1392 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1394 focus_out ();
… …
1409 case FocusOut: 1458 case FocusOut:
1410 focus_out (); 1459 focus_out ();
1411 break; 1460 break;
1412 1461
1413 case ConfigureNotify: 1462 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1463 if (ev.xconfigure.window == parent[0])
1415 { 1464 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ;
1425 1467
1426 if (szHint.width != width || szHint.height != height) 1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1469 {
1428 seen_resize = 1; 1470 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1472 }
1431 1473
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1475 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1476 check_our_parents ();
1435#endif 1477#endif
1436 } 1478 }
1437 break; 1479 break;
1438 1480
… …
1455 case SelectionRequest: 1497 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1457 break; 1499 break;
1458 1500
1459 case UnmapNotify: 1501 case UnmapNotify:
1460 TermWin.mapped = 0; 1502 mapped = 0;
1461#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1463#endif 1505#endif
1464 break; 1506 break;
1465 1507
1466 case MapNotify: 1508 case MapNotify:
1467 TermWin.mapped = 1; 1509 mapped = 1;
1468#ifdef TEXT_BLINK 1510#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1512#endif
1471 break; 1513 break;
1472 1514
… …
1476 break; 1518 break;
1477#endif /* TRANSPARENT */ 1519#endif /* TRANSPARENT */
1478 1520
1479 case GraphicsExpose: 1521 case GraphicsExpose:
1480 case Expose: 1522 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1523 if (ev.xany.window == vt)
1482 { 1524 {
1483 do 1525 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1529
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1531
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1493 1535
1494 scr_refresh (refresh_type); 1536 scr_refresh (refresh_type);
1495 } 1537 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1554 menubar_expose ();
1513#endif 1555#endif
1514 1556
1515#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1558 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1559 XClearWindow (disp, ev.xany.window);
1518#endif 1560#endif
1519 } 1561 }
1520 break; 1562 break;
1521 1563
… …
1532 } 1574 }
1533#endif 1575#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1577 break;
1536 1578
1537 if (ev.xany.window == TermWin.vt) 1579 if (ev.xany.window == vt)
1538 { 1580 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1582 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1584 ;
1543 1585
1544 XQueryPointer (disp, TermWin.vt, 1586 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1590 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1561#endif 1603#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1606
1565#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1610 {
1569 int dist; 1611 int dist;
1570 1612
1571 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1625
1584 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1586 { 1628 {
1587 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1589 } 1631 }
1590 else 1632 else
1591 { 1633 {
1592 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1635 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1636 }
1595 1637
1596 scroll_selection_lines = Pixel2Height (dist) 1638 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1640 + 1;
1599 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1601 } 1643 }
1602 else 1644 else
1603 { 1645 {
1604 /* we are within the text window, so we 1646 /* we are within the text window, so we
… …
1635} 1677}
1636 1678
1637void 1679void
1638rxvt_term::focus_in () 1680rxvt_term::focus_in ()
1639{ 1681{
1640 if (!TermWin.focus) 1682 if (!focus)
1641 { 1683 {
1642 TermWin.focus = 1; 1684 focus = 1;
1643 want_refresh = 1; 1685 want_refresh = 1;
1644#ifdef USE_XIM 1686#if USE_XIM
1645 if (Input_Context != NULL) 1687 if (Input_Context != NULL)
1646 { 1688 {
1647 IMSetStatusPosition (); 1689 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1690 XSetICFocus (Input_Context);
1649 } 1691 }
1650#endif 1692#endif
1651#ifdef CURSOR_BLINK 1693#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1694 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1696#endif
1655#ifdef OFF_FOCUS_FADING 1697#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1698 if (rs[Rs_fade])
1657 { 1699 {
1658 pix_colors = pix_colors_focused; 1700 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1701 scr_recolour ();
1660 } 1702 }
… …
1663} 1705}
1664 1706
1665void 1707void
1666rxvt_term::focus_out () 1708rxvt_term::focus_out ()
1667{ 1709{
1668 if (TermWin.focus) 1710 if (focus)
1669 { 1711 {
1670 TermWin.focus = 0; 1712 focus = 0;
1671 want_refresh = 1; 1713 want_refresh = 1;
1672 1714
1673#if ENABLE_FRILLS || ISO_14755 1715#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0; 1716 iso14755buf = 0;
1675#endif 1717#endif
1676#if ENABLE_OVERLAY 1718#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1719 scr_overlay_off ();
1678#endif 1720#endif
1679#ifdef USE_XIM 1721#if USE_XIM
1680 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1723 XUnsetICFocus (Input_Context);
1682#endif 1724#endif
1683#ifdef CURSOR_BLINK 1725#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1726 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1727 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1728 hidden_cursor = 0;
1687#endif 1729#endif
1688#ifdef OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1690 { 1732 {
1691 pix_colors = pix_colors_unfocused; 1733 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1734 scr_recolour ();
1693 } 1735 }
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1756 return;
1715 1757
1716 /* FALLTHROUGH */ 1758 /* FALLTHROUGH */
1717 case ReparentNotify: 1759 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1761 want_refresh = want_full_refresh = 1;
1720 break; 1762 break;
1721 } 1763 }
1722} 1764}
1723#endif 1765#endif
… …
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1774 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1775
1734 /* 1776 /*
1735 * VT window processing of button press 1777 * VT window processing of button press
1736 */ 1778 */
1737 if (ev.window == TermWin.vt) 1779 if (ev.window == vt)
1738 { 1780 {
1739#if ISO_14755 1781#if ISO_14755
1740 // 5.4 1782 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1784 {
… …
1947 case Button3: 1989 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 1990 if (scrollBar.style != R_SB_XTERM)
1949 { 1991 {
1950 if (scrollbar_above_slider (ev.y)) 1992 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 1993# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 1994 scr_page (UP, nrow - 1);
1953# else 1995# else
1954 scr_page (UP, TermWin.nrow / 4); 1996 scr_page (UP, nrow / 4);
1955# endif 1997# endif
1956 else if (scrollbar_below_slider (ev.y)) 1998 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 1999# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2000 scr_page (DN, nrow - 1);
1959# else 2001# else
1960 scr_page (DN, TermWin.nrow / 4); 2002 scr_page (DN, nrow / 4);
1961# endif 2003# endif
1962 else 2004 else
1963 scrollBar.setMotion (); 2005 scrollBar.setMotion ();
1964 } 2006 }
1965 else 2007 else
1966 { 2008 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2009 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2010 (nrow
1969 * scrollbar_position (ev.y) 2011 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2012 / scrollbar_size ()));
1971 } 2013 }
1972 2014
1973 break; 2015 break;
… …
2005#ifdef SELECTION_SCROLLING 2047#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2048 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2049 sel_scroll_ev.stop();
2008#endif 2050#endif
2009 2051
2010 if (ev.window == TermWin.vt) 2052 if (ev.window == vt)
2011 { 2053 {
2012#if ISO_14755 2054#if ISO_14755
2013 // 5.4 2055 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2057 return;
… …
2065 2107
2066 v = ev.button == Button4 ? UP : DN; 2108 v = ev.button == Button4 ? UP : DN;
2067 2109
2068 if (ev.state & ShiftMask) 2110 if (ev.state & ShiftMask)
2069 i = 1; 2111 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2112 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2113 i = nrow - 1;
2072 else 2114 else
2073 i = 5; 2115 i = 5;
2074 2116
2075# ifdef MOUSE_SLIP_WHEELING 2117# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2118 if (ev.state & ControlMask)
2077 { 2119 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2120 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2121 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2122 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2123
2082 if (slip_wheel_ev.at < NOW) 2124 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2125 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2126
2085 slip_wheel_ev.start (); 2127 slip_wheel_ev.start ();
… …
2361 XWindowAttributes wattr, wrootattr; 2403 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2404 dDisp;
2363 2405
2364 pchanged = 0; 2406 pchanged = 0;
2365 2407
2366 if (!(options & Opt_transparent)) 2408 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2409 return pchanged; /* Don't try any more */
2368 2410
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2411 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2412 rootdepth = wrootattr.depth;
2371 2413
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2414 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2415
2374 if (rootdepth != wattr.depth) 2416 if (rootdepth != wattr.depth)
2375 { 2417 {
2376 if (am_transparent) 2418 if (am_transparent)
2377 { 2419 {
2378 pchanged = 1; 2420 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2422 am_transparent = am_pixmap_trans = 0;
2381 } 2423 }
2382 2424
2383 return pchanged; /* Don't try any more */ 2425 return pchanged; /* Don't try any more */
2384 } 2426 }
… …
2425 Window cr; 2467 Window cr;
2426 XImage *image; 2468 XImage *image;
2427 GC gc; 2469 GC gc;
2428 XGCValues gcvalue; 2470 XGCValues gcvalue;
2429 2471
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2472 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2473 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2474 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2475 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2476 nx = ny = 0;
2435 2477
… …
2445 nh += sy; 2487 nh += sy;
2446 ny = -sy; 2488 ny = -sy;
2447 sy = 0; 2489 sy = 0;
2448 } 2490 }
2449 2491
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2492 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2493 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2494
2453 XSync (disp, False); 2495 XSync (disp, False);
2454 allowedxerror = -1; 2496 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2498
… …
2461 if (image == NULL) 2503 if (image == NULL)
2462 { 2504 {
2463 if (am_transparent && am_pixmap_trans) 2505 if (am_transparent && am_pixmap_trans)
2464 { 2506 {
2465 pchanged = 1; 2507 pchanged = 1;
2466 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2467 { 2509 {
2468 XFreePixmap (disp, TermWin.pixmap); 2510 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2511 pixmap = None;
2470 } 2512 }
2471 } 2513 }
2472 2514
2473 am_pixmap_trans = 0; 2515 am_pixmap_trans = 0;
2474 } 2516 }
2475 else 2517 else
2476 { 2518 {
2477 if (TermWin.pixmap != None) 2519 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2520 XFreePixmap (disp, pixmap);
2479 2521
2480#if TINTING 2522#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2523 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2524 {
2483 unsigned short rm, gm, bm; 2525 unsigned short rm, gm, bm;
… …
2487 2529
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2530 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2531 }
2490#endif 2532#endif
2491 2533
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2534 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2535 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2537 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2538 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2539 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2540 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2542 XClearWindow (disp, parent[0]);
2501 2543
2502 if (!am_transparent || !am_pixmap_trans) 2544 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2545 pchanged = 1;
2504 2546
2505 am_transparent = am_pixmap_trans = 1; 2547 am_transparent = am_pixmap_trans = 1;
2506 } 2548 }
2507 } 2549 }
2508 2550
2509 if (am_pixmap_trans) 2551 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2553 else
2512 { 2554 {
2513 unsigned int n; 2555 unsigned int n;
2514 /* 2556 /*
2515 * InheritPixmap transparency 2557 * InheritPixmap transparency
2516 */ 2558 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2560 {
2519 oldp = TermWin.parent[i]; 2561 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2562 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2563 &parent[i], &list, &n);
2522 XFree (list); 2564 XFree (list);
2523 2565
2524 if (TermWin.parent[i] == display->root) 2566 if (parent[i] == display->root)
2525 { 2567 {
2526 if (oldp != None) 2568 if (oldp != None)
2527 pchanged = 1; 2569 pchanged = 1;
2528 2570
2529 break; 2571 break;
2530 } 2572 }
2531 2573
2532 if (oldp != TermWin.parent[i]) 2574 if (oldp != parent[i])
2533 pchanged = 1; 2575 pchanged = 1;
2534 } 2576 }
2535 2577
2536 n = 0; 2578 n = 0;
2537 2579
2538 if (pchanged) 2580 if (pchanged)
2539 { 2581 {
2540 for (; n < (unsigned int)i; n++) 2582 for (; n < (unsigned int)i; n++)
2541 { 2583 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2584 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2586 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2588 break;
2547 } 2589 }
2548 } 2590 }
2549 } 2591 }
2550 2592
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2593 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2594 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2597 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2598 /* XXX: also turn off Opt_transparent? */
2557 } 2599 }
2558 else 2600 else
2559 { 2601 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2604 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2605 sleep (1);
2564#endif 2606#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2607 for (n = 0; n < (unsigned int)i; n++)
2566 { 2608 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2610 XClearWindow (disp, parent[n]);
2569 } 2611 }
2570 2612
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2614 am_transparent = 1;
2573 } 2615 }
2574 2616
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2618 parent[i] = None;
2577 } 2619 }
2578 2620
2579 if (scrollBar.win) 2621 if (scrollBar.win)
2580 { 2622 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2633 /* Read a text string from the input buffer */ 2675 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2676 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2677 bool refreshnow = false;
2636 int nlines = 0; 2678 int nlines = 0;
2637 unicode_t *str = buf; 2679 unicode_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2681
2639 for (;;) 2682 for (;;)
2640 { 2683 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642 break; 2685 break;
2643 2686
2644 *str++ = ch; 2687 *str++ = ch;
2645 2688
2646 if (ch == C0_LF) 2689 if (ch == C0_LF || str >= eol)
2647 { 2690 {
2691 if (ch == C0_LF)
2648 nlines++; 2692 nlines++;
2693
2649 refresh_count++; 2694 refresh_count++;
2650 2695
2651 if (!(options & Opt_jumpScroll) 2696 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2697 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2698 {
2654 refreshnow = true; 2699 refreshnow = true;
2655 ch = NOCHAR; 2700 ch = NOCHAR;
2656 break; 2701 break;
2657 } 2702 }
2658 2703
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2661 { 2706 {
2662 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2708 nlines = 0;
2664 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2665 } 2711 }
2666 }
2667 2712
2668 if (str >= buf + UBUFSIZ) 2713 if (str >= eol)
2669 { 2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2670 ch = NOCHAR; 2717 ch = NOCHAR;
2671 break; 2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2672 } 2724 }
2673 2725
2674 seq_begin = cmdbuf_ptr; 2726 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2727 ch = next_char ();
2676 } 2728 }
… …
2683 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2737 */
2686 if (refreshnow) 2738 if (refreshnow)
2687 { 2739 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2741 refresh_limit++;
2690 else 2742 else
2691 { 2743 {
2692 flag = true; 2744 flag = true;
2693 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
… …
3335 3387
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3388 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3389 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3390 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3393 break;
3342 3394
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3396 tt_write ((const unsigned char *)VT100_ANS,
3345 (unsigned int) (sizeof (VT100_ANS) - 1)); 3397 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3357 break; 3409 break;
3358 case 6: /* CPR requested */ 3410 case 6: /* CPR requested */
3359 scr_report_position (); 3411 scr_report_position ();
3360 break; 3412 break;
3361 case 7: /* unofficial extension */ 3413 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3414 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3415 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3416 break;
3365 case 8: /* unofficial extension */ 3417 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3419 break;
… …
3470 { 3522 {
3471 /* 3523 /*
3472 * commands 3524 * commands
3473 */ 3525 */
3474 case 1: /* deiconify window */ 3526 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3527 XMapWindow (disp, parent[0]);
3476 break; 3528 break;
3477 case 2: /* iconify window */ 3529 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3530 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3531 break;
3480 case 3: /* set position (pixels) */ 3532 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3533 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3534 break;
3483 case 4: /* set size (pixels) */ 3535 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3537 break;
3486 case 5: /* raise window */ 3538 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3539 XRaiseWindow (disp, parent[0]);
3488 break; 3540 break;
3489 case 6: /* lower window */ 3541 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3542 XLowerWindow (disp, parent[0]);
3491 break; 3543 break;
3492 case 7: /* refresh window */ 3544 case 7: /* refresh window */
3493 scr_touch (true); 3545 scr_touch (true);
3494 break; 3546 break;
3495 case 8: /* set size (chars) */ 3547 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3548 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3549 (unsigned int) (args[1] * fheight));
3498 break; 3550 break;
3499 3551
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3552 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3553 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3554 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3555 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3556 (unsigned int) (args[1] * fheight));
3505 break; 3557 break;
3506 3558
3507 3559
3508 /* 3560 /*
3509 * reports - some output format copied from XTerm 3561 * reports - some output format copied from XTerm
3510 */ 3562 */
3511 case 11: /* report window state */ 3563 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3566 break;
3515 case 13: /* report window position */ 3567 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3568 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3569 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3570 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3571 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3572 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3573 break;
3522 case 14: /* report window size (pixels) */ 3574 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3575 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3577 break;
3526 case 18: /* report text area size (chars) */ 3578 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3579 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3580 break;
3529 case 19: /* report window size (chars) */ 3581 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3582 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3583 break;
3532 case 20: /* report icon label */ 3584 case 20: /* report icon label */
3533 { 3585 {
3534 char *s; 3586 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3587 XGetIconName (disp, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3588 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3589 XFree (s);
3538 } 3590 }
3539 break; 3591 break;
3540 case 21: /* report window title */ 3592 case 21: /* report window title */
3541 { 3593 {
3542 char *s; 3594 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3595 XFetchName (disp, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3596 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3597 XFree (s);
3546 } 3598 }
3547 break; 3599 break;
3548 } 3600 }
3549} 3601}
… …
3581 else if (ch < 0x20) 3633 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3634 return NULL; /* other control character - exit */
3583 3635
3584 seen_esc = false; 3636 seen_esc = false;
3585 3637
3586 if (n >= sizeof (string) - 1) 3638 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3639 // stop at some sane length
3588 return NULL; 3640 return NULL;
3589 3641
3590 if (ch == C0_SYN) 3642 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3643 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3711 set_window_color (color, str);
3660} 3712}
3661 3713
3662/* 3714/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3716 */
3687void 3717void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3689{ 3719{
3690 int changed = 0; 3720 int changed = 0;
… …
3716 unsigned long bytes_after; 3746 unsigned long bytes_after;
3717 unsigned char *value = 0; 3747 unsigned char *value = 0;
3718 const char *str = ""; 3748 const char *str = "";
3719 3749
3720 if (prop 3750 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3751 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3755 && actual_type != None
3726 && actual_format == 8) 3756 && actual_format == 8)
… …
3738 { 3768 {
3739 *eq = 0; 3769 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3741 } 3771 }
3742 else 3772 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3773 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3774 display->atom (str));
3745 } 3775 }
3746 break; 3776 break;
3747 3777
3748 case XTerm_Color: 3778 case XTerm_Color:
… …
3789 break; 3819 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3820#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3821 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3823 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3824 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3826 break;
3800 case XTerm_Color_RV: 3827 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3829 break;
3830 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break;
3803#endif 3833#endif
3804#if TRANSPARENT && TINTING 3834#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3835 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3837 check_our_parents ();
3808 if (am_transparent) 3838 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3839 want_full_refresh = want_refresh = 1;
3810 break; 3840 break;
3811#endif 3841#endif
… …
3845 3875
3846 case XTerm_logfile: 3876 case XTerm_logfile:
3847 // TODO, when secure mode? 3877 // TODO, when secure mode?
3848 break; 3878 break;
3849 3879
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0
3887 case XTerm_dumpscreen: /* no error notices */
3888 {
3889 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 {
3892 scr_dump (fd);
3893 close (fd);
3894 }
3895 }
3896 break;
3897#endif
3850 case XTerm_font: 3898 case XTerm_font:
3851 op = URxvt_font; 3899 op = URxvt_font;
3852 case URxvt_font: 3900 case URxvt_font:
3853#if ENABLE_STYLES 3901#if ENABLE_STYLES
3854 case URxvt_boldFont: 3902 case URxvt_boldFont:
3855 case URxvt_italicFont: 3903 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3904 case URxvt_boldItalicFont:
3857#endif 3905#endif
3858 if (query) 3906 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3907 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3908 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3909 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3910 resp);
3863 else 3911 else
3864 { 3912 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3913 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3914
… …
3869 set_fonts (); 3917 set_fonts ();
3870 } 3918 }
3871 break; 3919 break;
3872 3920
3873#if ENABLE_FRILLS 3921#if ENABLE_FRILLS
3874 case XTerm_locale: 3922 case URxvt_locale:
3875 if (query) 3923 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3877 else 3925 else
3878 { 3926 {
3879 set_locale (str); 3927 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3928 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3929 init_xlocale ();
3883# endif
3884 } 3930 }
3885 break; 3931 break;
3886#endif
3887 3932
3888#ifdef MENUBAR 3933 case URxvt_view_up:
3889 case XTerm_Menu: 3934 case URxvt_view_down:
3890 if (options & Opt_insecure) 3935 int lines = atoi (str);
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3936
3892 break; 3937 if (lines)
3893#endif 3938 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894#if 0
3895 case XTerm_dumpscreen: /* no error notices */
3896 { 3939 else
3897 int fd;
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 { 3940 {
3900 scr_dump (fd); 3941 scr_erase_savelines ();
3901 close (fd);
3902 } 3942 }
3903 } 3943
3904 break; 3944 break;
3905#endif 3945#endif
3906 } 3946 }
3907} 3947}
3908/*----------------------------------------------------------------------*/ 3948/*----------------------------------------------------------------------*/
… …
4017 } 4057 }
4018 4058
4019 /* extra handling for values with state unkept */ 4059 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4060 switch (arg[i])
4021 { 4061 {
4062#if ENABLE_STYLES
4063 case 1021:
4064 if (mode)
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068
4069 want_refresh = 1;
4070 want_full_refresh = 1;
4071 break;
4072#endif
4022 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4023 case 1049: 4074 case 1049:
4024 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4076 if (mode == 0)
4026 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
4027 else if (mode == 1) 4078 else if (mode == 1)
4028 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
4029 break; 4080 break;
… …
4041 */ 4092 */
4042 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
4043 break; 4094 break;
4044 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4098 break;
4048 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4049 if (state) 4100 if (!state)
4050 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4051 else 4102 else
4052 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4053 break; 4104 break;
4054 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4056 break; 4107 break;
4057 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
4098#if 0 4149#if 0
4099 case 1001: 4150 case 1001:
4100 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4101#endif 4152#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state) 4154 if (!state)
4104 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4105 else 4156 else
4106 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4107 break; 4158 break;
4108 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4109 if (state) 4160 if (state)
4110 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4111 else 4162 else
4112 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4113 break; 4164 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4168 scr_erase_screen (2);
4118 scr_change_screen (state); 4169 scr_change_screen (state);
4119 break; 4170 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4172 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4175 scr_erase_screen (2);
4125 break; 4176 break;
4126 default: 4177 default:
4127 break; 4178 break;
… …
4277 case 106: 4328 case 106:
4278 case 107: 4329 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4331 break;
4281#endif 4332#endif
4282
4283 } 4333 }
4284 } 4334 }
4285} 4335}
4286/*}}} */ 4336/*}}} */
4287 4337
… …
4368 } 4418 }
4369 4419
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4420 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4421 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4423 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4424}
4376 4425
4377/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4378 4427

Diff Legend

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