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.219 by root, Sat Dec 31 17:16:17 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 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; 153 iso14755buf = ISO_14755_54;
153 break; 154 break;
154 } 155 }
155 156
156 x--; 157 x--;
157 } 158 }
158
159} 159}
160#endif 160#endif
161 161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
162#if ENABLE_OVERLAY 165#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name);
172
171#if ENABLE_COMBINING 173# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
177 } 179 }
178 else 180 else
179#endif 181# endif
180 { 182 {
181 ch2 = ch; 183 ch2 = ch;
182 184
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 char attr[80]; // plenty
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
191 214
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 216
194 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
195 { 218 {
… …
198 ch = *chr++; 221 ch = *chr++;
199 222
200 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
203#if !UNICODE3 226# if !UNICODE3
204 if (ch >= 0x10000) 227 if (ch >= 0x10000)
205 ch = 0xfffd; 228 ch = 0xfffd;
206#endif 229# endif
207 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 231 scr_overlay_set (12, y, NOCHAR, r);
209 } 232 }
210 233
234 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 235 scr_overlay_set (0, len + 1, fname);
212 236
237 free (fname);
238
213#if ENABLE_COMBINING 239# if ENABLE_COMBINING
214 if (alloc) 240 if (alloc)
215 delete [] alloc; 241 delete [] alloc;
216#endif 242# endif
217}
218#endif 243#endif
244}
219 245
220void 246void
221rxvt_term::commit_iso14755 () 247rxvt_term::commit_iso14755 ()
222{ 248{
223 wchar_t ch[2]; 249 wchar_t ch[2];
… …
316 342
317 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
321 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
324 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 353 SET_LOCALE (locale);
326 354
327 if (status_return == XLookupChars 355 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 388#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 389 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 390 return;
363#endif 391#endif
364 392
365 if (TermWin.saveLines) 393 if (saveLines)
366 { 394 {
367#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 396 if (!ctrl && !meta)
369#else 397#else
370 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
371#endif 399#endif
372 { 400 {
373 int lnsppg; 401 int lnsppg;
374 402
375#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 405#else
378 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
379#endif 407#endif
380 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
381 { 409 {
382 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
383 return; 411 return;
… …
838 } 866 }
839 867
840 if (len <= 0) 868 if (len <= 0)
841 return; /* not mapped */ 869 return; /* not mapped */
842 870
843 if (options & Opt_scrollTtyKeypress) 871 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 872 if (view_start)
845 { 873 {
846 TermWin.view_start = 0; 874 view_start = 0;
847 want_refresh = 1; 875 want_refresh = 1;
848 } 876 }
849 877
850 /* 878 /*
851 * these modifications only affect the static keybuffer 879 * these modifications only affect the static keybuffer
… …
1028{ 1056{
1029 if (mouse_slip_wheel_speed == 0 1057 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1059 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1060 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1061 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1062 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1063 mouse_slip_wheel_speed = 0;
1036 1064
1037 refresh_type |= SMOOTH_REFRESH; 1065 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1066 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1061 if (n > 0) 1089 if (n > 0)
1062 { 1090 {
1063 cmdbuf_endp += n; 1091 cmdbuf_endp += n;
1064 return true; 1092 return true;
1065 } 1093 }
1066 else if (n < 0 && errno != EAGAIN) 1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1095 {
1096 pty_ev.stop ();
1097
1098 if (!OPTION (Opt_hold))
1067 destroy (); 1099 destroy ();
1100 }
1068 1101
1069 return false; 1102 return false;
1070} 1103}
1071 1104
1072void 1105void
… …
1086} 1119}
1087 1120
1088void 1121void
1089rxvt_term::pointer_unblank () 1122rxvt_term::pointer_unblank ()
1090{ 1123{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1124 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1125 recolour_cursor ();
1093 1126
1094#ifdef POINTER_BLANK 1127#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1128 hidden_pointer = 0;
1096 1129
1097 if (options & Opt_pointerBlank) 1130 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1131 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1132#endif
1100} 1133}
1101 1134
1102#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1103void 1136void
1104rxvt_term::pointer_blank () 1137rxvt_term::pointer_blank ()
1105{ 1138{
1106 if (! (options & Opt_pointerBlank)) 1139 if (! OPTION (Opt_pointerBlank))
1107 return; 1140 return;
1108 1141
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1142 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1143 XFlush (display->display);
1111 1144
1112 hidden_pointer = 1; 1145 hidden_pointer = 1;
1113} 1146}
1114 1147
… …
1209 1242
1210 SET_R (this); 1243 SET_R (this);
1211 SET_LOCALE (locale); 1244 SET_LOCALE (locale);
1212 1245
1213#if defined(CURSOR_BLINK) 1246#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1247 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1248 {
1216 if (hidden_cursor) 1249 if (hidden_cursor)
1217 { 1250 {
1218 hidden_cursor = 0; 1251 hidden_cursor = 0;
1219 want_refresh = 1; 1252 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1256 }
1224#endif 1257#endif
1225 1258
1226#if defined(POINTER_BLANK) 1259#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1260 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1261 {
1229 if (ev.type == MotionNotify 1262 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1263 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1264 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1265 if (hidden_pointer)
… …
1330 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1331 break; 1364 break;
1332 1365
1333 case ClientMessage: 1366 case ClientMessage:
1334 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1369 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1371 destroy ();
1372#if ENABLE_EWMH
1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1374 XSendEvent (disp, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1376 &ev);
1377#endif
1378 }
1338#if ENABLE_XEMBED 1379#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1380 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1381 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1382 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1383 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1384 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1385 focus_out ();
… …
1409 case FocusOut: 1449 case FocusOut:
1410 focus_out (); 1450 focus_out ();
1411 break; 1451 break;
1412 1452
1413 case ConfigureNotify: 1453 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1454 if (ev.xconfigure.window == parent[0])
1415 { 1455 {
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)); 1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ;
1425 1458
1426 if (szHint.width != width || szHint.height != height) 1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1460 {
1428 seen_resize = 1; 1461 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1463 }
1431 1464
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1466 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1467 check_our_parents ();
1435#endif 1468#endif
1436 } 1469 }
1437 break; 1470 break;
1438 1471
… …
1455 case SelectionRequest: 1488 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1489 selection_send (ev.xselectionrequest);
1457 break; 1490 break;
1458 1491
1459 case UnmapNotify: 1492 case UnmapNotify:
1460 TermWin.mapped = 0; 1493 mapped = 0;
1461#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1495 text_blink_ev.stop ();
1463#endif 1496#endif
1464 break; 1497 break;
1465 1498
1466 case MapNotify: 1499 case MapNotify:
1467 TermWin.mapped = 1; 1500 mapped = 1;
1468#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1503#endif
1471 break; 1504 break;
1472 1505
… …
1476 break; 1509 break;
1477#endif /* TRANSPARENT */ 1510#endif /* TRANSPARENT */
1478 1511
1479 case GraphicsExpose: 1512 case GraphicsExpose:
1480 case Expose: 1513 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == vt)
1482 { 1515 {
1483 do 1516 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1520
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1522
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1493 1526
1494 scr_refresh (refresh_type); 1527 scr_refresh (refresh_type);
1495 } 1528 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1545 menubar_expose ();
1513#endif 1546#endif
1514 1547
1515#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (disp, ev.xany.window);
1518#endif 1551#endif
1519 } 1552 }
1520 break; 1553 break;
1521 1554
… …
1532 } 1565 }
1533#endif 1566#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1568 break;
1536 1569
1537 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1538 { 1571 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1573 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1575 ;
1543 1576
1544 XQueryPointer (disp, TermWin.vt, 1577 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1580 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1581 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
… …
1561#endif 1594#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1597
1565#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1601 {
1569 int dist; 1602 int dist;
1570 1603
1571 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1616
1584 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1586 { 1619 {
1587 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1589 } 1622 }
1590 else 1623 else
1591 { 1624 {
1592 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1626 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1627 }
1595 1628
1596 scroll_selection_lines = Pixel2Height (dist) 1629 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1631 + 1;
1599 MIN_IT (scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1601 } 1634 }
1602 else 1635 else
1603 { 1636 {
1604 /* we are within the text window, so we 1637 /* we are within the text window, so we
… …
1635} 1668}
1636 1669
1637void 1670void
1638rxvt_term::focus_in () 1671rxvt_term::focus_in ()
1639{ 1672{
1640 if (!TermWin.focus) 1673 if (!focus)
1641 { 1674 {
1642 TermWin.focus = 1; 1675 focus = 1;
1643 want_refresh = 1; 1676 want_refresh = 1;
1644#ifdef USE_XIM 1677#if USE_XIM
1645 if (Input_Context != NULL) 1678 if (Input_Context != NULL)
1646 { 1679 {
1647 IMSetStatusPosition (); 1680 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1681 XSetICFocus (Input_Context);
1649 } 1682 }
1650#endif 1683#endif
1651#ifdef CURSOR_BLINK 1684#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1685 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1687#endif
1655#ifdef OFF_FOCUS_FADING 1688#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1689 if (rs[Rs_fade])
1657 { 1690 {
1658 pix_colors = pix_colors_focused; 1691 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1692 scr_recolour ();
1660 } 1693 }
… …
1663} 1696}
1664 1697
1665void 1698void
1666rxvt_term::focus_out () 1699rxvt_term::focus_out ()
1667{ 1700{
1668 if (TermWin.focus) 1701 if (focus)
1669 { 1702 {
1670 TermWin.focus = 0; 1703 focus = 0;
1671 want_refresh = 1; 1704 want_refresh = 1;
1672 1705
1673#if ENABLE_FRILLS || ISO_14755 1706#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0; 1707 iso14755buf = 0;
1675#endif 1708#endif
1676#if ENABLE_OVERLAY 1709#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1710 scr_overlay_off ();
1678#endif 1711#endif
1679#ifdef USE_XIM 1712#if USE_XIM
1680 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1714 XUnsetICFocus (Input_Context);
1682#endif 1715#endif
1683#ifdef CURSOR_BLINK 1716#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1717 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1718 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1719 hidden_cursor = 0;
1687#endif 1720#endif
1688#ifdef OFF_FOCUS_FADING 1721#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1722 if (rs[Rs_fade])
1690 { 1723 {
1691 pix_colors = pix_colors_unfocused; 1724 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1725 scr_recolour ();
1693 } 1726 }
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1747 return;
1715 1748
1716 /* FALLTHROUGH */ 1749 /* FALLTHROUGH */
1717 case ReparentNotify: 1750 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1751 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1752 want_refresh = want_full_refresh = 1;
1720 break; 1753 break;
1721 } 1754 }
1722} 1755}
1723#endif 1756#endif
… …
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1765 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1766
1734 /* 1767 /*
1735 * VT window processing of button press 1768 * VT window processing of button press
1736 */ 1769 */
1737 if (ev.window == TermWin.vt) 1770 if (ev.window == vt)
1738 { 1771 {
1739#if ISO_14755 1772#if ISO_14755
1740 // 5.4 1773 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1775 {
… …
1947 case Button3: 1980 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 1981 if (scrollBar.style != R_SB_XTERM)
1949 { 1982 {
1950 if (scrollbar_above_slider (ev.y)) 1983 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 1985 scr_page (UP, nrow - 1);
1953# else 1986# else
1954 scr_page (UP, TermWin.nrow / 4); 1987 scr_page (UP, nrow / 4);
1955# endif 1988# endif
1956 else if (scrollbar_below_slider (ev.y)) 1989 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 1990# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 1991 scr_page (DN, nrow - 1);
1959# else 1992# else
1960 scr_page (DN, TermWin.nrow / 4); 1993 scr_page (DN, nrow / 4);
1961# endif 1994# endif
1962 else 1995 else
1963 scrollBar.setMotion (); 1996 scrollBar.setMotion ();
1964 } 1997 }
1965 else 1998 else
1966 { 1999 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2000 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2001 (nrow
1969 * scrollbar_position (ev.y) 2002 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2003 / scrollbar_size ()));
1971 } 2004 }
1972 2005
1973 break; 2006 break;
… …
2005#ifdef SELECTION_SCROLLING 2038#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2039 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2040 sel_scroll_ev.stop();
2008#endif 2041#endif
2009 2042
2010 if (ev.window == TermWin.vt) 2043 if (ev.window == vt)
2011 { 2044 {
2012#if ISO_14755 2045#if ISO_14755
2013 // 5.4 2046 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2048 return;
… …
2065 2098
2066 v = ev.button == Button4 ? UP : DN; 2099 v = ev.button == Button4 ? UP : DN;
2067 2100
2068 if (ev.state & ShiftMask) 2101 if (ev.state & ShiftMask)
2069 i = 1; 2102 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2103 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2104 i = nrow - 1;
2072 else 2105 else
2073 i = 5; 2106 i = 5;
2074 2107
2075# ifdef MOUSE_SLIP_WHEELING 2108# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2109 if (ev.state & ControlMask)
2077 { 2110 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2111 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2112 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; 2113 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2114
2082 if (slip_wheel_ev.at < NOW) 2115 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2116 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2117
2085 slip_wheel_ev.start (); 2118 slip_wheel_ev.start ();
… …
2361 XWindowAttributes wattr, wrootattr; 2394 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2395 dDisp;
2363 2396
2364 pchanged = 0; 2397 pchanged = 0;
2365 2398
2366 if (!(options & Opt_transparent)) 2399 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2400 return pchanged; /* Don't try any more */
2368 2401
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2402 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2403 rootdepth = wrootattr.depth;
2371 2404
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2405 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2406
2374 if (rootdepth != wattr.depth) 2407 if (rootdepth != wattr.depth)
2375 { 2408 {
2376 if (am_transparent) 2409 if (am_transparent)
2377 { 2410 {
2378 pchanged = 1; 2411 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2413 am_transparent = am_pixmap_trans = 0;
2381 } 2414 }
2382 2415
2383 return pchanged; /* Don't try any more */ 2416 return pchanged; /* Don't try any more */
2384 } 2417 }
… …
2425 Window cr; 2458 Window cr;
2426 XImage *image; 2459 XImage *image;
2427 GC gc; 2460 GC gc;
2428 XGCValues gcvalue; 2461 XGCValues gcvalue;
2429 2462
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2463 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2464 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2465 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2466 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2467 nx = ny = 0;
2435 2468
… …
2445 nh += sy; 2478 nh += sy;
2446 ny = -sy; 2479 ny = -sy;
2447 sy = 0; 2480 sy = 0;
2448 } 2481 }
2449 2482
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2485
2453 XSync (disp, False); 2486 XSync (disp, False);
2454 allowedxerror = -1; 2487 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2489
… …
2461 if (image == NULL) 2494 if (image == NULL)
2462 { 2495 {
2463 if (am_transparent && am_pixmap_trans) 2496 if (am_transparent && am_pixmap_trans)
2464 { 2497 {
2465 pchanged = 1; 2498 pchanged = 1;
2466 if (TermWin.pixmap != None) 2499 if (pixmap != None)
2467 { 2500 {
2468 XFreePixmap (disp, TermWin.pixmap); 2501 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2502 pixmap = None;
2470 } 2503 }
2471 } 2504 }
2472 2505
2473 am_pixmap_trans = 0; 2506 am_pixmap_trans = 0;
2474 } 2507 }
2475 else 2508 else
2476 { 2509 {
2477 if (TermWin.pixmap != None) 2510 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2511 XFreePixmap (disp, pixmap);
2479 2512
2480#if TINTING 2513#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2514 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2515 {
2483 unsigned short rm, gm, bm; 2516 unsigned short rm, gm, bm;
… …
2487 2520
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2521 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2522 }
2490#endif 2523#endif
2491 2524
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2525 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2526 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2529 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2530 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2531 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2533 XClearWindow (disp, parent[0]);
2501 2534
2502 if (!am_transparent || !am_pixmap_trans) 2535 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2536 pchanged = 1;
2504 2537
2505 am_transparent = am_pixmap_trans = 1; 2538 am_transparent = am_pixmap_trans = 1;
2506 } 2539 }
2507 } 2540 }
2508 2541
2509 if (am_pixmap_trans) 2542 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2544 else
2512 { 2545 {
2513 unsigned int n; 2546 unsigned int n;
2514 /* 2547 /*
2515 * InheritPixmap transparency 2548 * InheritPixmap transparency
2516 */ 2549 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2551 {
2519 oldp = TermWin.parent[i]; 2552 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2553 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2554 &parent[i], &list, &n);
2522 XFree (list); 2555 XFree (list);
2523 2556
2524 if (TermWin.parent[i] == display->root) 2557 if (parent[i] == display->root)
2525 { 2558 {
2526 if (oldp != None) 2559 if (oldp != None)
2527 pchanged = 1; 2560 pchanged = 1;
2528 2561
2529 break; 2562 break;
2530 } 2563 }
2531 2564
2532 if (oldp != TermWin.parent[i]) 2565 if (oldp != parent[i])
2533 pchanged = 1; 2566 pchanged = 1;
2534 } 2567 }
2535 2568
2536 n = 0; 2569 n = 0;
2537 2570
2538 if (pchanged) 2571 if (pchanged)
2539 { 2572 {
2540 for (; n < (unsigned int)i; n++) 2573 for (; n < (unsigned int)i; n++)
2541 { 2574 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2575 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2577 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2579 break;
2547 } 2580 }
2548 } 2581 }
2549 } 2582 }
2550 2583
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2585 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2588 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2589 /* XXX: also turn off Opt_transparent? */
2557 } 2590 }
2558 else 2591 else
2559 { 2592 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2595 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2596 sleep (1);
2564#endif 2597#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2598 for (n = 0; n < (unsigned int)i; n++)
2566 { 2599 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2601 XClearWindow (disp, parent[n]);
2569 } 2602 }
2570 2603
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2605 am_transparent = 1;
2573 } 2606 }
2574 2607
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2609 parent[i] = None;
2577 } 2610 }
2578 2611
2579 if (scrollBar.win) 2612 if (scrollBar.win)
2580 { 2613 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2633 /* Read a text string from the input buffer */ 2666 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2667 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2668 bool refreshnow = false;
2636 int nlines = 0; 2669 int nlines = 0;
2637 unicode_t *str = buf; 2670 unicode_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2672
2639 for (;;) 2673 for (;;)
2640 { 2674 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642 break; 2676 break;
2643 2677
2644 *str++ = ch; 2678 *str++ = ch;
2645 2679
2646 if (ch == C0_LF) 2680 if (ch == C0_LF || str >= eol)
2647 { 2681 {
2682 if (ch == C0_LF)
2648 nlines++; 2683 nlines++;
2684
2649 refresh_count++; 2685 refresh_count++;
2650 2686
2651 if (!(options & Opt_jumpScroll) 2687 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2688 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2689 {
2654 refreshnow = true; 2690 refreshnow = true;
2655 ch = NOCHAR; 2691 ch = NOCHAR;
2656 break; 2692 break;
2657 } 2693 }
2658 2694
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2695 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2696 if (nlines >= nrow - 1)
2661 { 2697 {
2662 scr_add_lines (buf, nlines, str - buf); 2698 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2699 nlines = 0;
2664 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2665 } 2702 }
2666 }
2667 2703
2668 if (str >= buf + UBUFSIZ) 2704 if (str >= eol)
2669 { 2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2670 ch = NOCHAR; 2708 ch = NOCHAR;
2671 break; 2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2672 } 2715 }
2673 2716
2674 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2718 ch = next_char ();
2676 } 2719 }
… …
2683 * the number of pages between refreshes is refresh_limit, which 2726 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2727 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2728 */
2686 if (refreshnow) 2729 if (refreshnow)
2687 { 2730 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2731 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2732 refresh_limit++;
2690 else 2733 else
2691 { 2734 {
2692 flag = true; 2735 flag = true;
2693 scr_refresh (refresh_type); 2736 scr_refresh (refresh_type);
… …
3335 3378
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3379 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3380 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3384 break;
3342 3385
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3387 tt_write ((const unsigned char *)VT100_ANS,
3345 (unsigned int) (sizeof (VT100_ANS) - 1)); 3388 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3357 break; 3400 break;
3358 case 6: /* CPR requested */ 3401 case 6: /* CPR requested */
3359 scr_report_position (); 3402 scr_report_position ();
3360 break; 3403 break;
3361 case 7: /* unofficial extension */ 3404 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3405 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3406 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3407 break;
3365 case 8: /* unofficial extension */ 3408 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3410 break;
… …
3470 { 3513 {
3471 /* 3514 /*
3472 * commands 3515 * commands
3473 */ 3516 */
3474 case 1: /* deiconify window */ 3517 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3518 XMapWindow (disp, parent[0]);
3476 break; 3519 break;
3477 case 2: /* iconify window */ 3520 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3521 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3522 break;
3480 case 3: /* set position (pixels) */ 3523 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3524 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3525 break;
3483 case 4: /* set size (pixels) */ 3526 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3528 break;
3486 case 5: /* raise window */ 3529 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3530 XRaiseWindow (disp, parent[0]);
3488 break; 3531 break;
3489 case 6: /* lower window */ 3532 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3533 XLowerWindow (disp, parent[0]);
3491 break; 3534 break;
3492 case 7: /* refresh window */ 3535 case 7: /* refresh window */
3493 scr_touch (true); 3536 scr_touch (true);
3494 break; 3537 break;
3495 case 8: /* set size (chars) */ 3538 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3539 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3540 (unsigned int) (args[1] * fheight));
3498 break; 3541 break;
3499 3542
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3543 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3544 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3545 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3546 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3547 (unsigned int) (args[1] * fheight));
3505 break; 3548 break;
3506 3549
3507 3550
3508 /* 3551 /*
3509 * reports - some output format copied from XTerm 3552 * reports - some output format copied from XTerm
3510 */ 3553 */
3511 case 11: /* report window state */ 3554 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3555 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3557 break;
3515 case 13: /* report window position */ 3558 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3559 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3560 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3561 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3562 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3563 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3564 break;
3522 case 14: /* report window size (pixels) */ 3565 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3566 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3568 break;
3526 case 18: /* report text area size (chars) */ 3569 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3570 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3571 break;
3529 case 19: /* report window size (chars) */ 3572 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3574 break;
3532 case 20: /* report icon label */ 3575 case 20: /* report icon label */
3533 { 3576 {
3534 char *s; 3577 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3578 XGetIconName (disp, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3579 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3580 XFree (s);
3538 } 3581 }
3539 break; 3582 break;
3540 case 21: /* report window title */ 3583 case 21: /* report window title */
3541 { 3584 {
3542 char *s; 3585 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3586 XFetchName (disp, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3588 XFree (s);
3546 } 3589 }
3547 break; 3590 break;
3548 } 3591 }
3549} 3592}
… …
3581 else if (ch < 0x20) 3624 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3625 return NULL; /* other control character - exit */
3583 3626
3584 seen_esc = false; 3627 seen_esc = false;
3585 3628
3586 if (n >= sizeof (string) - 1) 3629 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3630 // stop at some sane length
3588 return NULL; 3631 return NULL;
3589 3632
3590 if (ch == C0_SYN) 3633 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3634 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3702 set_window_color (color, str);
3660} 3703}
3661 3704
3662/* 3705/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3706 * 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 */ 3707 */
3687void 3708void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3689{ 3710{
3690 int changed = 0; 3711 int changed = 0;
… …
3716 unsigned long bytes_after; 3737 unsigned long bytes_after;
3717 unsigned char *value = 0; 3738 unsigned char *value = 0;
3718 const char *str = ""; 3739 const char *str = "";
3719 3740
3720 if (prop 3741 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3742 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3743 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3744 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3745 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3746 && actual_type != None
3726 && actual_format == 8) 3747 && actual_format == 8)
… …
3738 { 3759 {
3739 *eq = 0; 3760 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3761 set_utf8_property (display->atom (str), eq + 1);
3741 } 3762 }
3742 else 3763 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3764 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3765 display->atom (str));
3745 } 3766 }
3746 break; 3767 break;
3747 3768
3748 case XTerm_Color: 3769 case XTerm_Color:
… …
3789 break; 3810 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3811#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3812 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3814 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3815 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3817 break;
3800 case XTerm_Color_RV: 3818 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3820 break;
3821 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3823 break;
3803#endif 3824#endif
3804#if TRANSPARENT && TINTING 3825#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3826 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3827 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3828 check_our_parents ();
3808 if (am_transparent) 3829 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3830 want_full_refresh = want_refresh = 1;
3810 break; 3831 break;
3811#endif 3832#endif
… …
3845 3866
3846 case XTerm_logfile: 3867 case XTerm_logfile:
3847 // TODO, when secure mode? 3868 // TODO, when secure mode?
3848 break; 3869 break;
3849 3870
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (OPTION (Opt_insecure))
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break;
3876#endif
3877#if 0
3878 case XTerm_dumpscreen: /* no error notices */
3879 {
3880 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 {
3883 scr_dump (fd);
3884 close (fd);
3885 }
3886 }
3887 break;
3888#endif
3850 case XTerm_font: 3889 case XTerm_font:
3851 op = URxvt_font; 3890 op = URxvt_font;
3852 case URxvt_font: 3891 case URxvt_font:
3853#if ENABLE_STYLES 3892#if ENABLE_STYLES
3854 case URxvt_boldFont: 3893 case URxvt_boldFont:
3855 case URxvt_italicFont: 3894 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3895 case URxvt_boldItalicFont:
3857#endif 3896#endif
3858 if (query) 3897 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3898 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3899 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3900 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3901 resp);
3863 else 3902 else
3864 { 3903 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3904 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3905
… …
3869 set_fonts (); 3908 set_fonts ();
3870 } 3909 }
3871 break; 3910 break;
3872 3911
3873#if ENABLE_FRILLS 3912#if ENABLE_FRILLS
3874 case XTerm_locale: 3913 case URxvt_locale:
3875 if (query) 3914 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3877 else 3916 else
3878 { 3917 {
3879 set_locale (str); 3918 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3919 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3920 init_xlocale ();
3883# endif
3884 } 3921 }
3885 break; 3922 break;
3886#endif
3887 3923
3888#ifdef MENUBAR 3924 case URxvt_view_up:
3889 case XTerm_Menu: 3925 case URxvt_view_down:
3890 if (options & Opt_insecure) 3926 int lines = atoi (str);
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3927
3892 break; 3928 if (lines)
3893#endif 3929 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894#if 0
3895 case XTerm_dumpscreen: /* no error notices */
3896 { 3930 else
3897 int fd;
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 { 3931 {
3900 scr_dump (fd); 3932 scr_erase_savelines ();
3901 close (fd);
3902 } 3933 }
3903 } 3934
3904 break; 3935 break;
3905#endif 3936#endif
3906 } 3937 }
3907} 3938}
3908/*----------------------------------------------------------------------*/ 3939/*----------------------------------------------------------------------*/
… …
4019 /* extra handling for values with state unkept */ 4050 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4051 switch (arg[i])
4021 { 4052 {
4022 case 1048: /* alternative cursor save */ 4053 case 1048: /* alternative cursor save */
4023 case 1049: 4054 case 1049:
4024 if (options & Opt_secondaryScreen) 4055 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4056 if (mode == 0)
4026 scr_cursor (RESTORE); 4057 scr_cursor (RESTORE);
4027 else if (mode == 1) 4058 else if (mode == 1)
4028 scr_cursor (SAVE); 4059 scr_cursor (SAVE);
4029 break; 4060 break;
… …
4041 */ 4072 */
4042 PrivMode (1, PrivMode_vt52); 4073 PrivMode (1, PrivMode_vt52);
4043 break; 4074 break;
4044 case 3: /* 80/132 */ 4075 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4076 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4077 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4078 break;
4048 case 4: /* smooth scrolling */ 4079 case 4: /* smooth scrolling */
4049 if (state) 4080 if (!state)
4050 options &= ~Opt_jumpScroll; 4081 SET_OPTION (Opt_jumpScroll);
4051 else 4082 else
4052 options |= Opt_jumpScroll; 4083 CLR_OPTION (Opt_jumpScroll);
4053 break; 4084 break;
4054 case 5: /* reverse video */ 4085 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4086 scr_rvideo_mode (state);
4056 break; 4087 break;
4057 case 6: /* relative/absolute origins */ 4088 case 6: /* relative/absolute origins */
… …
4098#if 0 4129#if 0
4099 case 1001: 4130 case 1001:
4100 break; /* X11 mouse highlighting */ 4131 break; /* X11 mouse highlighting */
4101#endif 4132#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4133 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state) 4134 if (!state)
4104 options &= ~Opt_scrollTtyOutput; 4135 SET_OPTION (Opt_scrollTtyOutput);
4105 else 4136 else
4106 options |= Opt_scrollTtyOutput; 4137 CLR_OPTION (Opt_scrollTtyOutput);
4107 break; 4138 break;
4108 case 1011: /* scroll to bottom on key press */ 4139 case 1011: /* scroll to bottom on key press */
4109 if (state) 4140 if (state)
4110 options |= Opt_scrollTtyKeypress; 4141 SET_OPTION (Opt_scrollTtyKeypress);
4111 else 4142 else
4112 options &= ~Opt_scrollTtyKeypress; 4143 CLR_OPTION (Opt_scrollTtyKeypress);
4113 break; 4144 break;
4145#if ENABLE_STYLES
4146 case 1021:
4147 if (state)
4148 SET_OPTION (Opt_intensityStyles);
4149 else
4150 CLR_OPTION (Opt_intensityStyles);
4151#endif
4114 case 1047: /* secondary screen w/ clearing last */ 4152 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4153 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4154 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4155 scr_erase_screen (2);
4118 scr_change_screen (state); 4156 scr_change_screen (state);
4119 break; 4157 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4158 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4159 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4160 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4161 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4162 scr_erase_screen (2);
4125 break; 4163 break;
4126 default: 4164 default:
4127 break; 4165 break;
… …
4368 } 4406 }
4369 4407
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4408 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4409 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4410 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4411 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4412}
4376 4413
4377/*----------------------- end-of-file (C source) -----------------------*/ 4414/*----------------------- end-of-file (C source) -----------------------*/
4378 4415

Diff Legend

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