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.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
52 52
53#ifdef KEYSYM_RESOURCE 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 54# include "keyboard.h"
55#endif 55#endif
56 56
57#include <cwchar>
58#include <csignal> 57#include <csignal>
59 58
60/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
61 60
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 119 XK_Print, 0x2399,
121 120
122 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
124 0, 131 0,
125}; 132};
126 133
127void 134void
128rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
129{ 136{
130 x = Pixel2Col (x); 137 x = Pixel2Col (x);
131 y = Pixel2Row (y); 138 y = Pixel2Row (y);
132 139
133 if (x < 0 || x >= TermWin.ncol 140 if (x < 0 || x >= ncol
134 || y < 0 || y >= TermWin.nrow) 141 || y < 0 || y >= nrow)
135 return; 142 return;
136 143
137 for (;;) 144 for (;;)
138 { 145 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = save[y + saveLines - view_start];
147
148 text_t t = l.t[x];
140 149
141 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
142 { 151 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
146 break; 154 break;
147 } 155 }
148 156
149 x--; 157 x--;
… …
156void 164void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
158{ 166{
159 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
163 173
164#if ENABLE_COMBINING 174#if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
166 { 176 {
167 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
… …
176 alloc = 0; 186 alloc = 0;
177 chr = &ch2; 187 chr = &ch2;
178 len = 1; 188 len = 1;
179 } 189 }
180 190
181 int width = strlen (f->name); 191 int width = wcswidth (fname, wcslen (fname));
182 192
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
184 194
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 196
… …
199#endif 209#endif
200 scr_overlay_set (11, y, ch, r); 210 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 211 scr_overlay_set (12, y, NOCHAR, r);
202 } 212 }
203 213
204 scr_overlay_set (0, len, f->name); 214 scr_overlay_set (0, len, fname);
215
216 free (fname);
205 217
206#if ENABLE_COMBINING 218#if ENABLE_COMBINING
207 if (alloc) 219 if (alloc)
208 delete [] alloc; 220 delete [] alloc;
209#endif 221#endif
… …
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 290 * escape sequence to toggle the Keypad.
279 * 291 *
280 * Always permit `shift' to override the current setting 292 * Always permit `shift' to override the current setting
281 */ 293 */
282 shft = (ev.state & ShiftMask); 294 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 295 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 296 meta = ev.state & ModMetaMask;
285 297
286 if (numlock_state || (ev.state & ModNumLockMask)) 298 if (numlock_state || (ev.state & ModNumLockMask))
287 { 299 {
288 numlock_state = (ev.state & ModNumLockMask); 300 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 301 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
309 321
310 // the XOpenIM manpage lies about hardcoding the locale 322 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 323 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 324 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 325 SET_LOCALE (rs[Rs_imLocale]);
326
314 // assume wchar_t == unicode or better 327 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 328 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 329 KBUFSZ, &keysym, &status_return);
330
317 if (rs[Rs_imLocale]) 331 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 332 SET_LOCALE (locale);
319 333
320 if (status_return == XLookupChars 334 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 335 || status_return == XLookupBoth)
… …
353#ifdef KEYSYM_RESOURCE 367#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 368 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 369 return;
356#endif 370#endif
357 371
358 if (TermWin.saveLines) 372 if (saveLines)
359 { 373 {
360#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 375 if (!ctrl && !meta)
362#else 376#else
363 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
364#endif 378#endif
365 { 379 {
366 int lnsppg; 380 int lnsppg;
367 381
368#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 384#else
371 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
372#endif 386#endif
373 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
374 { 388 {
375 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
376 return; 390 return;
… …
513 else 527 else
514 strcpy (kbuf, key_backspace); 528 strcpy (kbuf, key_backspace);
515 break; 529 break;
516#endif 530#endif
517#ifndef NO_DELETE_KEY 531#ifndef NO_DELETE_KEY
532# ifdef XK_KP_Prior
533 case XK_KP_Delete:
534 /* allow shift to override */
535 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
536 {
537 strcpy (kbuf, "\033On");
538 break;
539 }
540 /* FALLTHROUGH */
541# endif
518 case XK_Delete: 542 case XK_Delete:
519 strcpy (kbuf, key_delete); 543 strcpy (kbuf, key_delete);
520 break; 544 break;
521#endif 545#endif
522 case XK_Tab: 546 case XK_Tab:
… …
625#ifdef XK_KP_Begin 649#ifdef XK_KP_Begin
626 case XK_KP_Begin: 650 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 651 strcpy (kbuf, "\033Ou");
628 break; 652 break;
629 653
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 654#endif
638 case XK_KP_F1: /* "\033OP" */ 655 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 656 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 657 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 658 case XK_KP_F4: /* "\033OS" */
… …
673 break; 690 break;
674 691
675 case XK_Find: 692 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 693 strcpy (kbuf, "\033[1~");
677 break; 694 break;
695
696#ifdef XK_KP_End
697 case XK_KP_Insert:
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Op");
702 break;
703 }
704 /* FALLTHROUGH */
705#endif
678 case XK_Insert: 706 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 707 strcpy (kbuf, "\033[2~");
680 break; 708 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 709#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 710 case DXK_Remove:
… …
818 846
819 if (len <= 0) 847 if (len <= 0)
820 return; /* not mapped */ 848 return; /* not mapped */
821 849
822 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
823 if (TermWin.view_start) 851 if (view_start)
824 { 852 {
825 TermWin.view_start = 0; 853 view_start = 0;
826 want_refresh = 1; 854 want_refresh = 1;
827 } 855 }
828 856
829 /* 857 /*
830 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
1007{ 1035{
1008 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1039 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1040 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1041 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1042 mouse_slip_wheel_speed = 0;
1015 1043
1016 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1045 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1065} 1093}
1066 1094
1067void 1095void
1068rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1069{ 1097{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1099 recolour_cursor ();
1072 1100
1073#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1102 hidden_pointer = 0;
1075 1103
… …
1083rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1084{ 1112{
1085 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1086 return; 1114 return;
1087 1115
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1117 XFlush (display->display);
1090 1118
1091 hidden_pointer = 1; 1119 hidden_pointer = 1;
1092} 1120}
1093 1121
… …
1182 1210
1183/*{{{ process an X event */ 1211/*{{{ process an X event */
1184void 1212void
1185rxvt_term::x_cb (XEvent &ev) 1213rxvt_term::x_cb (XEvent &ev)
1186{ 1214{
1215 dDisp;
1216
1187 SET_R (this); 1217 SET_R (this);
1188 SET_LOCALE (locale); 1218 SET_LOCALE (locale);
1189 1219
1190#if defined(CURSOR_BLINK) 1220#if defined(CURSOR_BLINK)
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1307 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1308 break; 1338 break;
1309 1339
1310 case ClientMessage: 1340 case ClientMessage:
1311 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313 destroy (); 1345 destroy ();
1346#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev);
1351#endif
1352 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1314#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1320 { 1368 {
1321 /* Get Dnd data */ 1369 /* Get Dnd data */
1322 Atom ActualType; 1370 Atom ActualType;
1323 int ActualFormat; 1371 int ActualFormat;
1324 unsigned char *data; 1372 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1373 unsigned long Size, RemainingBytes;
1326 1374
1327 XGetWindowProperty (display->display, display->root, 1375 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1376 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1377 0L, 1000000L,
1330 False, AnyPropertyType, 1378 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1379 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1380 &Size, &RemainingBytes,
1333 &data); 1381 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1382 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1383 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1386 }
1339#endif /* OFFIX_DND */ 1387#endif /* OFFIX_DND */
1340 break; 1388 break;
1341 1389
1342 case MappingNotify: 1390 case MappingNotify:
… …
1367 break; 1415 break;
1368 } 1416 }
1369 break; 1417 break;
1370 1418
1371 case FocusIn: 1419 case FocusIn:
1372 if (!TermWin.focus) 1420 focus_in ();
1421 break;
1422
1423 case FocusOut:
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0])
1373 { 1429 {
1374 TermWin.focus = 1;
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1441 1432
1442 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1434 {
1444 seen_resize = 1; 1435 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1437 }
1447 1438
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1450 check_our_parents (); 1441 check_our_parents ();
… …
1471 case SelectionRequest: 1462 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1473 break; 1464 break;
1474 1465
1475 case UnmapNotify: 1466 case UnmapNotify:
1476 TermWin.mapped = 0; 1467 mapped = 0;
1477#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1479#endif 1470#endif
1480 break; 1471 break;
1481 1472
1482 case MapNotify: 1473 case MapNotify:
1483 TermWin.mapped = 1; 1474 mapped = 1;
1484#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif 1477#endif
1487 break; 1478 break;
1488 1479
… …
1492 break; 1483 break;
1493#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1494 1485
1495 case GraphicsExpose: 1486 case GraphicsExpose:
1496 case Expose: 1487 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1498 { 1489 {
1499 do 1490 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503 1494
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1496
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1509 1500
1510 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1511 } 1502 }
1512 else 1503 else
1513 { 1504 {
1514 XEvent unused_event; 1505 XEvent unused_event;
1515 1506
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1508 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1510 ;
1520 1511
1521 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1522 { 1513 {
1523 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose (); 1519 menubar_expose ();
1529#endif 1520#endif
1530 1521
1531#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1534#endif 1525#endif
1535 } 1526 }
1536 break; 1527 break;
1537 1528
1538 case MotionNotify: 1529 case MotionNotify:
… …
1548 } 1539 }
1549#endif 1540#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1542 break;
1552 1543
1553 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1554 { 1545 {
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1547 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558 ; 1549 ;
1559 1550
1560 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, vt,
1561 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1555 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1577#endif 1568#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1571
1581#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1575 {
1585 int dist; 1576 int dist;
1586 1577
1587 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1590
1600 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1602 { 1593 {
1603 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1605 } 1596 }
1606 else 1597 else
1607 { 1598 {
1608 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1601 }
1611 1602
1612 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1605 + 1;
… …
1629#endif 1620#endif
1630 } 1621 }
1631 } 1622 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1624 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1626 MotionNotify, &ev))
1636 ; 1627 ;
1637 1628
1638 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1633 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1648 } 1639 }
1649 break; 1640 break;
1650 } 1641 }
1651} 1642}
1652 1643
1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!focus)
1648 {
1649 focus = 1;
1650 want_refresh = 1;
1651#if USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (focus)
1676 {
1677 focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1653#if TRANSPARENT 1705#if TRANSPARENT
1654void 1706void
1655rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1708{
1657 SET_R (this); 1709 SET_R (this);
… …
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1740
1689 /* 1741 /*
1690 * VT window processing of button press 1742 * VT window processing of button press
1691 */ 1743 */
1692 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1693 { 1745 {
1694#if ISO_14755 1746#if ISO_14755
1695 // 5.4 1747 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1749 {
… …
1902 case Button3: 1954 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1904 { 1956 {
1905 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1908# else 1960# else
1909 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1910# endif 1962# endif
1911 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1914# else 1966# else
1915 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1916# endif 1968# endif
1917 else 1969 else
1918 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1919 } 1971 }
1920 else 1972 else
1921 { 1973 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 1975 (nrow
1924 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 1977 / scrollbar_size ()));
1926 } 1978 }
1927 1979
1928 break; 1980 break;
… …
1960#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1963#endif 2015#endif
1964 2016
1965 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1966 { 2018 {
1967#if ISO_14755 2019#if ISO_14755
1968 // 5.4 2020 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2022 return;
… …
2021 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2022 2074
2023 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2024 i = 1; 2076 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2026 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2027 else 2079 else
2028 i = 5; 2080 i = 5;
2029 2081
2030# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2032 { 2084 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2088
2037 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2091
2040 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2136 int i;
2085 2137
2086 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
2087 2139
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2141
2090 /* for convenience */ 2142 /* for convenience */
2091 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2312 Atom atype; 2364 Atom atype;
2313 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2366 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2317 2370
2318 pchanged = 0; 2371 pchanged = 0;
2319 2372
2320 if (!(options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2322 2375
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2325 2378
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2327 2380
2328 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2329 { 2382 {
2330 if (am_transparent) 2383 if (am_transparent)
2331 { 2384 {
2332 pchanged = 1; 2385 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2335 } 2388 }
2336 2389
2337 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2338 } 2391 }
2339 2392
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2394 XSync (disp, False);
2342 2395
2343 /* 2396 /*
2344 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
2347 */ 2400 */
2348 i = (xa[XA_XROOTPMAP_ID] 2401 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2352 2405
2353 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2358 2411
2359 if (!i || prop == NULL 2412 if (!i || prop == NULL
2360#if TINTING 2413#if TINTING
… …
2379 Window cr; 2432 Window cr;
2380 XImage *image; 2433 XImage *image;
2381 GC gc; 2434 GC gc;
2382 XGCValues gcvalue; 2435 XGCValues gcvalue;
2383 2436
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2441 nx = ny = 0;
2389 2442
… …
2402 } 2455 }
2403 2456
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406 2459
2407 XSync (display->display, False); 2460 XSync (disp, False);
2408 allowedxerror = -1; 2461 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2463
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2466 allowedxerror = 0;
2414 2467
2415 if (image == NULL) 2468 if (image == NULL)
2416 { 2469 {
2417 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2418 { 2471 {
2419 pchanged = 1; 2472 pchanged = 1;
2420 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2421 { 2474 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2423 TermWin.pixmap = None; 2476 pixmap = None;
2424 } 2477 }
2425 } 2478 }
2426 2479
2427 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2428 } 2481 }
2429 else 2482 else
2430 { 2483 {
2431 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2433 2486
2434#if TINTING 2487#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2489 {
2437 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2441 2494
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2496 }
2444#endif 2497#endif
2445 2498
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2447 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2505 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2455 2508
2456 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2510 pchanged = 1;
2458 2511
2459 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2460 } 2513 }
2461 } 2514 }
2462 2515
2463 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465 else 2518 else
2466 { 2519 {
2467 unsigned int n; 2520 unsigned int n;
2468 /* 2521 /*
2469 * InheritPixmap transparency 2522 * InheritPixmap transparency
2470 */ 2523 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2525 {
2473 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2476 XFree (list); 2529 XFree (list);
2477 2530
2478 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2479 { 2532 {
2480 if (oldp != None) 2533 if (oldp != None)
2481 pchanged = 1; 2534 pchanged = 1;
2482 2535
2483 break; 2536 break;
2484 } 2537 }
2485 2538
2486 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2487 pchanged = 1; 2540 pchanged = 1;
2488 } 2541 }
2489 2542
2490 n = 0; 2543 n = 0;
2491 2544
2492 if (pchanged) 2545 if (pchanged)
2493 { 2546 {
2494 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2495 { 2548 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2551 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2553 break;
2501 } 2554 }
2502 } 2555 }
2503 } 2556 }
2504 2557
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2559 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2562 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2511 } 2564 }
2512 else 2565 else
2513 { 2566 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2570 sleep (1);
2518#endif 2571#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2520 { 2573 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2523 } 2576 }
2524 2577
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526 am_transparent = 1; 2579 am_transparent = 1;
2527 } 2580 }
2528 2581
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2583 parent[i] = None;
2531 } 2584 }
2532 2585
2533 if (scrollBar.win) 2586 if (scrollBar.win)
2534 { 2587 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2537 scrollbar_show (0); 2590 scrollbar_show (0);
2538 } 2591 }
2539 2592
2540 if (am_transparent) 2593 if (am_transparent)
… …
2578 // some window managers resize the window early, and these programs 2631 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2632 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2633 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2634 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2635 // resized.
2583 if (seen_resize) 2636 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2637 kill (-cmd_pid, SIGWINCH);
2585 } 2638 }
2586 2639
2587 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2642 bool refreshnow = false;
2590 int nlines = 0; 2643 int nlines = 0;
2591 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2592 2646
2593 for (;;) 2647 for (;;)
2594 { 2648 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2650 break;
2597 2651
2598 *str++ = ch; 2652 *str++ = ch;
2599 2653
2600 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2601 { 2655 {
2656 if (ch == C0_LF)
2602 nlines++; 2657 nlines++;
2658
2603 refresh_count++; 2659 refresh_count++;
2604 2660
2605 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2663 {
2608 refreshnow = true; 2664 refreshnow = true;
2609 ch = NOCHAR; 2665 ch = NOCHAR;
2610 break; 2666 break;
2611 } 2667 }
2612 2668
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2615 { 2671 {
2616 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2617 nlines = 0; 2673 nlines = 0;
2618 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2619 } 2676 }
2620 }
2621 2677
2622 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2623 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2624 ch = NOCHAR; 2682 ch = NOCHAR;
2625 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2626 } 2689 }
2627 2690
2628 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2692 ch = next_char ();
2630 } 2693 }
… …
3174 { 3237 {
3175 switch (priv) 3238 switch (priv)
3176 { 3239 {
3177 case '>': 3240 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3241 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3243 break;
3181 case '?': 3244 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3246 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3247 break;
… …
3289 3352
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3354 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3355 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3358 break;
3296 3359
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3361 tt_write ((const unsigned char *)VT100_ANS,
3299 (unsigned int) (sizeof (VT100_ANS) - 1)); 3362 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3476rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3477{
3415 int x, y; 3478 int x, y;
3416 XWindowAttributes wattr; 3479 XWindowAttributes wattr;
3417 Window wdummy; 3480 Window wdummy;
3481 dDisp;
3418 3482
3419 if (nargs == 0) 3483 if (nargs == 0)
3420 return; 3484 return;
3421 3485
3422 switch (args[0]) 3486 switch (args[0])
3423 { 3487 {
3424 /* 3488 /*
3425 * commands 3489 * commands
3426 */ 3490 */
3427 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3429 break; 3493 break;
3430 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3495 XIconifyWindow (disp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3496 break;
3434 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3436 break; 3499 break;
3437 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3502 break;
3440 case 5: /* raise window */ 3503 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3442 break; 3505 break;
3443 case 6: /* lower window */ 3506 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3445 break; 3508 break;
3446 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3447 scr_touch (true); 3510 scr_touch (true);
3448 break; 3511 break;
3449 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3452 break; 3515 break;
3453 3516
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3518 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3459 break; 3522 break;
3460 3523
3461 3524
3462 /* 3525 /*
3463 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3464 */ 3527 */
3465 case 11: /* report window state */ 3528 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3531 break;
3469 case 13: /* report window position */ 3532 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3538 break;
3476 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3542 break;
3480 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3545 break;
3483 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3548 break;
3486 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3487 { 3550 {
3488 char *s; 3551 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3554 XFree (s);
3492 } 3555 }
3493 break; 3556 break;
3494 case 21: /* report window title */ 3557 case 21: /* report window title */
3495 { 3558 {
3496 char *s; 3559 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3562 XFree (s);
3500 } 3563 }
3501 break; 3564 break;
3502 } 3565 }
… …
3535 else if (ch < 0x20) 3598 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3537 3600
3538 seen_esc = false; 3601 seen_esc = false;
3539 3602
3540 if (n >= sizeof (string) - 1) 3603 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3604 // stop at some sane length
3542 return NULL; 3605 return NULL;
3543 3606
3544 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
… …
3613 set_window_color (color, str); 3676 set_window_color (color, str);
3614} 3677}
3615 3678
3616/* 3679/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3681 */
3641void 3682void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3643{ 3684{
3644 int changed = 0; 3685 int changed = 0;
3645 int color; 3686 int color;
3646 char *buf, *name; 3687 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3688 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3689 int saveop = op;
3690 dDisp;
3649 3691
3650 assert (str != NULL); 3692 assert (str != NULL);
3651 switch (op) 3693 switch (op)
3652 { 3694 {
3653 case XTerm_name: 3695 case XTerm_name:
… …
3669 unsigned long bytes_after; 3711 unsigned long bytes_after;
3670 unsigned char *value = 0; 3712 unsigned char *value = 0;
3671 const char *str = ""; 3713 const char *str = "";
3672 3714
3673 if (prop 3715 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3720 && actual_type != None
3679 && actual_format == 8) 3721 && actual_format == 8)
… …
3691 { 3733 {
3692 *eq = 0; 3734 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3694 } 3736 }
3695 else 3737 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3697 display->atom (str)); 3739 display->atom (str));
3698 } 3740 }
3699 break; 3741 break;
3700 3742
3701 case XTerm_Color: 3743 case XTerm_Color:
… …
3742 break; 3784 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3785#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD: 3786 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break; 3788 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break; 3791 break;
3753 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3756#endif 3798#endif
3757#if TRANSPARENT && TINTING 3799#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3800 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760 check_our_parents (); 3802 check_our_parents ();
3761 if (am_transparent) 3803 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3804 want_full_refresh = want_refresh = 1;
3763 break; 3805 break;
3764#endif 3806#endif
… …
3776 { 3818 {
3777 str++; 3819 str++;
3778#if XPM_BACKGROUND 3820#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3821 changed += scale_pixmap (str);
3780#endif 3822#endif
3781
3782 } 3823 }
3824
3783 if (changed) 3825 if (changed)
3784 { 3826 {
3785#ifdef XPM_BACKGROUND 3827#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3828 resize_pixmap ();
3787#endif 3829#endif
… …
3798 3840
3799 case XTerm_logfile: 3841 case XTerm_logfile:
3800 // TODO, when secure mode? 3842 // TODO, when secure mode?
3801 break; 3843 break;
3802 3844
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 {
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break;
3862#endif
3803 case XTerm_font: 3863 case XTerm_font:
3804 op = URxvt_font; 3864 op = URxvt_font;
3805 case URxvt_font: 3865 case URxvt_font:
3806#if ENABLE_STYLES 3866#if ENABLE_STYLES
3807 case URxvt_boldFont: 3867 case URxvt_boldFont:
3808 case URxvt_italicFont: 3868 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3810#endif 3870#endif
3811 if (query) 3871 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3875 resp);
3816 else 3876 else
3817 { 3877 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3879
… …
3822 set_fonts (); 3882 set_fonts ();
3823 } 3883 }
3824 break; 3884 break;
3825 3885
3826#if ENABLE_FRILLS 3886#if ENABLE_FRILLS
3827 case XTerm_locale: 3887 case URxvt_locale:
3828 if (query) 3888 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3830 else 3890 else
3831 { 3891 {
3832 set_locale (str); 3892 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3893 pty.set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3894 init_xlocale ();
3836# endif
3837 } 3895 }
3838 break; 3896 break;
3839#endif
3840 3897
3841#ifdef MENUBAR 3898 case URxvt_view_up:
3842 case XTerm_Menu: 3899 case URxvt_view_down:
3843 if (options & Opt_insecure) 3900 int lines = atoi (str);
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3901
3845 break; 3902 if (lines)
3846#endif 3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3847#if 0
3848 case XTerm_dumpscreen: /* no error notices */
3849 { 3904 else
3850 int fd;
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852 { 3905 {
3853 scr_dump (fd); 3906 scr_erase_savelines ();
3854 close (fd);
3855 } 3907 }
3856 } 3908
3857 break; 3909 break;
3858#endif 3910#endif
3859 } 3911 }
3860} 3912}
3861/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
3994 */ 4046 */
3995 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
3996 break; 4048 break;
3997 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4052 break;
4001 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4002 if (state) 4054 if (state)
4003 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4004 else 4056 else

Diff Legend

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