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.197 by root, Thu Feb 17 15:07:48 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
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1378 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1379 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 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 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1337#ifdef OFFIX_DND 1397#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1398 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1400 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1401 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1402 || ev.xclient.data.l[0] == DndLink))
1343 { 1403 {
1344 /* Get Dnd data */ 1404 /* Get Dnd data */
1345 Atom ActualType; 1405 Atom ActualType;
1346 int ActualFormat; 1406 int ActualFormat;
1347 unsigned char *data; 1407 unsigned char *data;
… …
1390 break; 1450 break;
1391 } 1451 }
1392 break; 1452 break;
1393 1453
1394 case FocusIn: 1454 case FocusIn:
1395 if (!TermWin.focus) 1455 focus_in ();
1456 break;
1457
1458 case FocusOut:
1459 focus_out ();
1460 break;
1461
1462 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0])
1396 { 1464 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ;
1464 1467
1465 if (szHint.width != width || szHint.height != height) 1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1469 {
1467 seen_resize = 1; 1470 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1472 }
1470 1473
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1475 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1476 check_our_parents ();
1474#endif 1477#endif
1475 } 1478 }
1476 break; 1479 break;
1477 1480
… …
1494 case SelectionRequest: 1497 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1496 break; 1499 break;
1497 1500
1498 case UnmapNotify: 1501 case UnmapNotify:
1499 TermWin.mapped = 0; 1502 mapped = 0;
1500#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1502#endif 1505#endif
1503 break; 1506 break;
1504 1507
1505 case MapNotify: 1508 case MapNotify:
1506 TermWin.mapped = 1; 1509 mapped = 1;
1507#ifdef TEXT_BLINK 1510#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1512#endif
1510 break; 1513 break;
1511 1514
… …
1515 break; 1518 break;
1516#endif /* TRANSPARENT */ 1519#endif /* TRANSPARENT */
1517 1520
1518 case GraphicsExpose: 1521 case GraphicsExpose:
1519 case Expose: 1522 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1523 if (ev.xany.window == vt)
1521 { 1524 {
1522 do 1525 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1529
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1531
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1532 1535
1533 scr_refresh (refresh_type); 1536 scr_refresh (refresh_type);
1534 } 1537 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1554 menubar_expose ();
1552#endif 1555#endif
1553 1556
1554#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1558 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1559 XClearWindow (disp, ev.xany.window);
1557#endif 1560#endif
1558 } 1561 }
1559 break; 1562 break;
1560 1563
… …
1571 } 1574 }
1572#endif 1575#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1577 break;
1575 1578
1576 if (ev.xany.window == TermWin.vt) 1579 if (ev.xany.window == vt)
1577 { 1580 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1582 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1584 ;
1582 1585
1583 XQueryPointer (disp, TermWin.vt, 1586 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1590 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1600#endif 1603#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1606
1604#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1610 {
1608 int dist; 1611 int dist;
1609 1612
1610 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1625
1623 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1625 { 1628 {
1626 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1628 } 1631 }
1629 else 1632 else
1630 { 1633 {
1631 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1635 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1636 }
1634 1637
1635 scroll_selection_lines = Pixel2Height (dist) 1638 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1640 + 1;
1638 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1640 } 1643 }
1641 else 1644 else
1642 { 1645 {
1643 /* we are within the text window, so we 1646 /* we are within the text window, so we
… …
1671 } 1674 }
1672 break; 1675 break;
1673 } 1676 }
1674} 1677}
1675 1678
1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 {
1689 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context);
1691 }
1692#endif
1693#if CURSOR_BLINK
1694 if (OPTION (Opt_cursorBlink))
1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1696#endif
1697#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade])
1699 {
1700 pix_colors = pix_colors_focused;
1701 scr_recolour ();
1702 }
1703#endif
1704 }
1705}
1706
1707void
1708rxvt_term::focus_out ()
1709{
1710 if (focus)
1711 {
1712 focus = 0;
1713 want_refresh = 1;
1714
1715#if ENABLE_FRILLS || ISO_14755
1716 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY
1719 scr_overlay_off ();
1720#endif
1721#if USE_XIM
1722 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context);
1724#endif
1725#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink))
1727 cursor_blink_ev.stop ();
1728 hidden_cursor = 0;
1729#endif
1730#if OFF_FOCUS_FADING
1731 if (rs[Rs_fade])
1732 {
1733 pix_colors = pix_colors_unfocused;
1734 scr_recolour ();
1735 }
1736#endif
1737 }
1738}
1739
1676#if TRANSPARENT 1740#if TRANSPARENT
1677void 1741void
1678rxvt_term::rootwin_cb (XEvent &ev) 1742rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1743{
1680 SET_R (this); 1744 SET_R (this);
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1756 return;
1693 1757
1694 /* FALLTHROUGH */ 1758 /* FALLTHROUGH */
1695 case ReparentNotify: 1759 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1761 want_refresh = want_full_refresh = 1;
1698 break; 1762 break;
1699 } 1763 }
1700} 1764}
1701#endif 1765#endif
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1774 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1775
1712 /* 1776 /*
1713 * VT window processing of button press 1777 * VT window processing of button press
1714 */ 1778 */
1715 if (ev.window == TermWin.vt) 1779 if (ev.window == vt)
1716 { 1780 {
1717#if ISO_14755 1781#if ISO_14755
1718 // 5.4 1782 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1784 {
… …
1925 case Button3: 1989 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1990 if (scrollBar.style != R_SB_XTERM)
1927 { 1991 {
1928 if (scrollbar_above_slider (ev.y)) 1992 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1993# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1994 scr_page (UP, nrow - 1);
1931# else 1995# else
1932 scr_page (UP, TermWin.nrow / 4); 1996 scr_page (UP, nrow / 4);
1933# endif 1997# endif
1934 else if (scrollbar_below_slider (ev.y)) 1998 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1999# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2000 scr_page (DN, nrow - 1);
1937# else 2001# else
1938 scr_page (DN, TermWin.nrow / 4); 2002 scr_page (DN, nrow / 4);
1939# endif 2003# endif
1940 else 2004 else
1941 scrollBar.setMotion (); 2005 scrollBar.setMotion ();
1942 } 2006 }
1943 else 2007 else
1944 { 2008 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2009 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2010 (nrow
1947 * scrollbar_position (ev.y) 2011 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2012 / scrollbar_size ()));
1949 } 2013 }
1950 2014
1951 break; 2015 break;
… …
1983#ifdef SELECTION_SCROLLING 2047#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2048 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2049 sel_scroll_ev.stop();
1986#endif 2050#endif
1987 2051
1988 if (ev.window == TermWin.vt) 2052 if (ev.window == vt)
1989 { 2053 {
1990#if ISO_14755 2054#if ISO_14755
1991 // 5.4 2055 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2057 return;
… …
2043 2107
2044 v = ev.button == Button4 ? UP : DN; 2108 v = ev.button == Button4 ? UP : DN;
2045 2109
2046 if (ev.state & ShiftMask) 2110 if (ev.state & ShiftMask)
2047 i = 1; 2111 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2112 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2113 i = nrow - 1;
2050 else 2114 else
2051 i = 5; 2115 i = 5;
2052 2116
2053# ifdef MOUSE_SLIP_WHEELING 2117# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2118 if (ev.state & ControlMask)
2055 { 2119 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2120 mouse_slip_wheel_speed += v ? -1 : 1;
2057 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;
2058 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;
2059 2123
2060 if (slip_wheel_ev.at < NOW) 2124 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2125 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2126
2063 slip_wheel_ev.start (); 2127 slip_wheel_ev.start ();
… …
2339 XWindowAttributes wattr, wrootattr; 2403 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2404 dDisp;
2341 2405
2342 pchanged = 0; 2406 pchanged = 0;
2343 2407
2344 if (!(options & Opt_transparent)) 2408 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2409 return pchanged; /* Don't try any more */
2346 2410
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2411 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2412 rootdepth = wrootattr.depth;
2349 2413
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2414 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2415
2352 if (rootdepth != wattr.depth) 2416 if (rootdepth != wattr.depth)
2353 { 2417 {
2354 if (am_transparent) 2418 if (am_transparent)
2355 { 2419 {
2356 pchanged = 1; 2420 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2422 am_transparent = am_pixmap_trans = 0;
2359 } 2423 }
2360 2424
2361 return pchanged; /* Don't try any more */ 2425 return pchanged; /* Don't try any more */
2362 } 2426 }
… …
2403 Window cr; 2467 Window cr;
2404 XImage *image; 2468 XImage *image;
2405 GC gc; 2469 GC gc;
2406 XGCValues gcvalue; 2470 XGCValues gcvalue;
2407 2471
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2472 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2473 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2474 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2475 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2476 nx = ny = 0;
2413 2477
… …
2423 nh += sy; 2487 nh += sy;
2424 ny = -sy; 2488 ny = -sy;
2425 sy = 0; 2489 sy = 0;
2426 } 2490 }
2427 2491
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2492 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2493 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2494
2431 XSync (disp, False); 2495 XSync (disp, False);
2432 allowedxerror = -1; 2496 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2498
… …
2439 if (image == NULL) 2503 if (image == NULL)
2440 { 2504 {
2441 if (am_transparent && am_pixmap_trans) 2505 if (am_transparent && am_pixmap_trans)
2442 { 2506 {
2443 pchanged = 1; 2507 pchanged = 1;
2444 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2445 { 2509 {
2446 XFreePixmap (disp, TermWin.pixmap); 2510 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2511 pixmap = None;
2448 } 2512 }
2449 } 2513 }
2450 2514
2451 am_pixmap_trans = 0; 2515 am_pixmap_trans = 0;
2452 } 2516 }
2453 else 2517 else
2454 { 2518 {
2455 if (TermWin.pixmap != None) 2519 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2520 XFreePixmap (disp, pixmap);
2457 2521
2458#if TINTING 2522#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2523 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2524 {
2461 unsigned short rm, gm, bm; 2525 unsigned short rm, gm, bm;
… …
2465 2529
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2530 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2531 }
2468#endif 2532#endif
2469 2533
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2534 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2535 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2537 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2538 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2539 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2540 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2542 XClearWindow (disp, parent[0]);
2479 2543
2480 if (!am_transparent || !am_pixmap_trans) 2544 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2545 pchanged = 1;
2482 2546
2483 am_transparent = am_pixmap_trans = 1; 2547 am_transparent = am_pixmap_trans = 1;
2484 } 2548 }
2485 } 2549 }
2486 2550
2487 if (am_pixmap_trans) 2551 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2553 else
2490 { 2554 {
2491 unsigned int n; 2555 unsigned int n;
2492 /* 2556 /*
2493 * InheritPixmap transparency 2557 * InheritPixmap transparency
2494 */ 2558 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2560 {
2497 oldp = TermWin.parent[i]; 2561 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2562 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2563 &parent[i], &list, &n);
2500 XFree (list); 2564 XFree (list);
2501 2565
2502 if (TermWin.parent[i] == display->root) 2566 if (parent[i] == display->root)
2503 { 2567 {
2504 if (oldp != None) 2568 if (oldp != None)
2505 pchanged = 1; 2569 pchanged = 1;
2506 2570
2507 break; 2571 break;
2508 } 2572 }
2509 2573
2510 if (oldp != TermWin.parent[i]) 2574 if (oldp != parent[i])
2511 pchanged = 1; 2575 pchanged = 1;
2512 } 2576 }
2513 2577
2514 n = 0; 2578 n = 0;
2515 2579
2516 if (pchanged) 2580 if (pchanged)
2517 { 2581 {
2518 for (; n < (unsigned int)i; n++) 2582 for (; n < (unsigned int)i; n++)
2519 { 2583 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2584 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2586 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2588 break;
2525 } 2589 }
2526 } 2590 }
2527 } 2591 }
2528 2592
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2593 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2594 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2597 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2598 /* XXX: also turn off Opt_transparent? */
2535 } 2599 }
2536 else 2600 else
2537 { 2601 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2604 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2605 sleep (1);
2542#endif 2606#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2607 for (n = 0; n < (unsigned int)i; n++)
2544 { 2608 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2610 XClearWindow (disp, parent[n]);
2547 } 2611 }
2548 2612
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2614 am_transparent = 1;
2551 } 2615 }
2552 2616
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2618 parent[i] = None;
2555 } 2619 }
2556 2620
2557 if (scrollBar.win) 2621 if (scrollBar.win)
2558 { 2622 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2611 /* Read a text string from the input buffer */ 2675 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2676 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2677 bool refreshnow = false;
2614 int nlines = 0; 2678 int nlines = 0;
2615 unicode_t *str = buf; 2679 unicode_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2681
2617 for (;;) 2682 for (;;)
2618 { 2683 {
2619 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))
2620 break; 2685 break;
2621 2686
2622 *str++ = ch; 2687 *str++ = ch;
2623 2688
2624 if (ch == C0_LF) 2689 if (ch == C0_LF || str >= eol)
2625 { 2690 {
2691 if (ch == C0_LF)
2626 nlines++; 2692 nlines++;
2693
2627 refresh_count++; 2694 refresh_count++;
2628 2695
2629 if (!(options & Opt_jumpScroll) 2696 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2697 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2698 {
2632 refreshnow = true; 2699 refreshnow = true;
2633 ch = NOCHAR; 2700 ch = NOCHAR;
2634 break; 2701 break;
2635 } 2702 }
2636 2703
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2639 { 2706 {
2640 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2708 nlines = 0;
2642 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2643 } 2711 }
2644 }
2645 2712
2646 if (str >= buf + UBUFSIZ) 2713 if (str >= eol)
2647 { 2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2648 ch = NOCHAR; 2717 ch = NOCHAR;
2649 break; 2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2650 } 2724 }
2651 2725
2652 seq_begin = cmdbuf_ptr; 2726 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2727 ch = next_char ();
2654 } 2728 }
… …
2661 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2737 */
2664 if (refreshnow) 2738 if (refreshnow)
2665 { 2739 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2741 refresh_limit++;
2668 else 2742 else
2669 { 2743 {
2670 flag = true; 2744 flag = true;
2671 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
… …
3313 3387
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3388 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3389 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3390 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3393 break;
3320 3394
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3396 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3397 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3335 break; 3409 break;
3336 case 6: /* CPR requested */ 3410 case 6: /* CPR requested */
3337 scr_report_position (); 3411 scr_report_position ();
3338 break; 3412 break;
3339 case 7: /* unofficial extension */ 3413 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3414 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3415 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3416 break;
3343 case 8: /* unofficial extension */ 3417 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3419 break;
… …
3448 { 3522 {
3449 /* 3523 /*
3450 * commands 3524 * commands
3451 */ 3525 */
3452 case 1: /* deiconify window */ 3526 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3527 XMapWindow (disp, parent[0]);
3454 break; 3528 break;
3455 case 2: /* iconify window */ 3529 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3530 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3531 break;
3458 case 3: /* set position (pixels) */ 3532 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3533 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3534 break;
3461 case 4: /* set size (pixels) */ 3535 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3537 break;
3464 case 5: /* raise window */ 3538 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3539 XRaiseWindow (disp, parent[0]);
3466 break; 3540 break;
3467 case 6: /* lower window */ 3541 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3542 XLowerWindow (disp, parent[0]);
3469 break; 3543 break;
3470 case 7: /* refresh window */ 3544 case 7: /* refresh window */
3471 scr_touch (true); 3545 scr_touch (true);
3472 break; 3546 break;
3473 case 8: /* set size (chars) */ 3547 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3548 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3549 (unsigned int) (args[1] * fheight));
3476 break; 3550 break;
3477 3551
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3552 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3553 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3554 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3555 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3556 (unsigned int) (args[1] * fheight));
3483 break; 3557 break;
3484 3558
3485 3559
3486 /* 3560 /*
3487 * reports - some output format copied from XTerm 3561 * reports - some output format copied from XTerm
3488 */ 3562 */
3489 case 11: /* report window state */ 3563 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3566 break;
3493 case 13: /* report window position */ 3567 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3568 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3569 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3570 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3571 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3572 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3573 break;
3500 case 14: /* report window size (pixels) */ 3574 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3575 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3577 break;
3504 case 18: /* report text area size (chars) */ 3578 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3579 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3580 break;
3507 case 19: /* report window size (chars) */ 3581 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3582 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3583 break;
3510 case 20: /* report icon label */ 3584 case 20: /* report icon label */
3511 { 3585 {
3512 char *s; 3586 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3587 XGetIconName (disp, parent[0], &s);
3514 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 */
3515 XFree (s); 3589 XFree (s);
3516 } 3590 }
3517 break; 3591 break;
3518 case 21: /* report window title */ 3592 case 21: /* report window title */
3519 { 3593 {
3520 char *s; 3594 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3595 XFetchName (disp, parent[0], &s);
3522 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 */
3523 XFree (s); 3597 XFree (s);
3524 } 3598 }
3525 break; 3599 break;
3526 } 3600 }
3527} 3601}
… …
3559 else if (ch < 0x20) 3633 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3634 return NULL; /* other control character - exit */
3561 3635
3562 seen_esc = false; 3636 seen_esc = false;
3563 3637
3564 if (n >= sizeof (string) - 1) 3638 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3639 // stop at some sane length
3566 return NULL; 3640 return NULL;
3567 3641
3568 if (ch == C0_SYN) 3642 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3643 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3711 set_window_color (color, str);
3638} 3712}
3639 3713
3640/* 3714/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3716 */
3665void 3717void
3666rxvt_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)
3667{ 3719{
3668 int changed = 0; 3720 int changed = 0;
… …
3694 unsigned long bytes_after; 3746 unsigned long bytes_after;
3695 unsigned char *value = 0; 3747 unsigned char *value = 0;
3696 const char *str = ""; 3748 const char *str = "";
3697 3749
3698 if (prop 3750 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3751 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3755 && actual_type != None
3704 && actual_format == 8) 3756 && actual_format == 8)
… …
3716 { 3768 {
3717 *eq = 0; 3769 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3719 } 3771 }
3720 else 3772 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3773 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3774 display->atom (str));
3723 } 3775 }
3724 break; 3776 break;
3725 3777
3726 case XTerm_Color: 3778 case XTerm_Color:
… …
3767 break; 3819 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3820#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3821 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3823 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3824 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3826 break;
3778 case XTerm_Color_RV: 3827 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3829 break;
3830 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break;
3781#endif 3833#endif
3782#if TRANSPARENT && TINTING 3834#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3835 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3837 check_our_parents ();
3786 if (am_transparent) 3838 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3839 want_full_refresh = want_refresh = 1;
3788 break; 3840 break;
3789#endif 3841#endif
… …
3823 3875
3824 case XTerm_logfile: 3876 case XTerm_logfile:
3825 // TODO, when secure mode? 3877 // TODO, when secure mode?
3826 break; 3878 break;
3827 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
3828 case XTerm_font: 3898 case XTerm_font:
3829 op = URxvt_font; 3899 op = URxvt_font;
3830 case URxvt_font: 3900 case URxvt_font:
3831#if ENABLE_STYLES 3901#if ENABLE_STYLES
3832 case URxvt_boldFont: 3902 case URxvt_boldFont:
3833 case URxvt_italicFont: 3903 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3904 case URxvt_boldItalicFont:
3835#endif 3905#endif
3836 if (query) 3906 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3907 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3908 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3909 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3910 resp);
3841 else 3911 else
3842 { 3912 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3913 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3914
… …
3847 set_fonts (); 3917 set_fonts ();
3848 } 3918 }
3849 break; 3919 break;
3850 3920
3851#if ENABLE_FRILLS 3921#if ENABLE_FRILLS
3852 case XTerm_locale: 3922 case URxvt_locale:
3853 if (query) 3923 if (query)
3854 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);
3855 else 3925 else
3856 { 3926 {
3857 set_locale (str); 3927 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3928 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3929 init_xlocale ();
3861# endif
3862 } 3930 }
3863 break; 3931 break;
3864#endif
3865 3932
3866#ifdef MENUBAR 3933 case URxvt_view_up:
3867 case XTerm_Menu: 3934 case URxvt_view_down:
3868 if (options & Opt_insecure) 3935 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3936
3870 break; 3937 if (lines)
3871#endif 3938 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3939 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3940 {
3878 scr_dump (fd); 3941 scr_erase_savelines ();
3879 close (fd);
3880 } 3942 }
3881 } 3943
3882 break; 3944 break;
3883#endif 3945#endif
3884 } 3946 }
3885} 3947}
3886/*----------------------------------------------------------------------*/ 3948/*----------------------------------------------------------------------*/
… …
3995 } 4057 }
3996 4058
3997 /* extra handling for values with state unkept */ 4059 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4060 switch (arg[i])
3999 { 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
4000 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4001 case 1049: 4074 case 1049:
4002 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4076 if (mode == 0)
4004 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
4005 else if (mode == 1) 4078 else if (mode == 1)
4006 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
4007 break; 4080 break;
… …
4019 */ 4092 */
4020 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
4021 break; 4094 break;
4022 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4098 break;
4026 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4027 if (state) 4100 if (!state)
4028 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4029 else 4102 else
4030 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4031 break; 4104 break;
4032 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4034 break; 4107 break;
4035 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
4076#if 0 4149#if 0
4077 case 1001: 4150 case 1001:
4078 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4079#endif 4152#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state) 4154 if (!state)
4082 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4083 else 4156 else
4084 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4085 break; 4158 break;
4086 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4087 if (state) 4160 if (state)
4088 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4089 else 4162 else
4090 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4091 break; 4164 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4168 scr_erase_screen (2);
4096 scr_change_screen (state); 4169 scr_change_screen (state);
4097 break; 4170 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4172 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4175 scr_erase_screen (2);
4103 break; 4176 break;
4104 default: 4177 default:
4105 break; 4178 break;
… …
4255 case 106: 4328 case 106:
4256 case 107: 4329 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4331 break;
4259#endif 4332#endif
4260
4261 } 4333 }
4262 } 4334 }
4263} 4335}
4264/*}}} */ 4336/*}}} */
4265 4337
… …
4346 } 4418 }
4347 4419
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4420 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4421 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4423 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4424}
4354 4425
4355/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4356 4427

Diff Legend

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