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

Diff Legend

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