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.216 by root, Tue Dec 27 01:25:42 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 char attr[80]; // plenty
182 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 scr_overlay_new (0, -1, width, len + 2);
184 208
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 210
187 for (int y = 0; y < len; y++) 211 for (int y = 0; y < len; y++)
188 { 212 {
… …
199#endif 223#endif
200 scr_overlay_set (11, y, ch, r); 224 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 225 scr_overlay_set (12, y, NOCHAR, r);
202 } 226 }
203 227
228 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 229 scr_overlay_set (0, len + 1, fname);
230
231 free (fname);
205 232
206#if ENABLE_COMBINING 233#if ENABLE_COMBINING
207 if (alloc) 234 if (alloc)
208 delete [] alloc; 235 delete [] alloc;
209#endif 236#endif
… …
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 305 * escape sequence to toggle the Keypad.
279 * 306 *
280 * Always permit `shift' to override the current setting 307 * Always permit `shift' to override the current setting
281 */ 308 */
282 shft = (ev.state & ShiftMask); 309 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 310 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 311 meta = ev.state & ModMetaMask;
285 312
286 if (numlock_state || (ev.state & ModNumLockMask)) 313 if (numlock_state || (ev.state & ModNumLockMask))
287 { 314 {
288 numlock_state = (ev.state & ModNumLockMask); 315 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 316 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
309 336
310 // the XOpenIM manpage lies about hardcoding the locale 337 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 338 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 339 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 340 SET_LOCALE (rs[Rs_imLocale]);
341
314 // assume wchar_t == unicode or better 342 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 343 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
345
317 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 347 SET_LOCALE (locale);
319 348
320 if (status_return == XLookupChars 349 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 350 || status_return == XLookupBoth)
… …
353#ifdef KEYSYM_RESOURCE 382#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 383 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 384 return;
356#endif 385#endif
357 386
358 if (TermWin.saveLines) 387 if (saveLines)
359 { 388 {
360#ifdef UNSHIFTED_SCROLLKEYS 389#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 390 if (!ctrl && !meta)
362#else 391#else
363 if (IS_SCROLL_MOD) 392 if (IS_SCROLL_MOD)
364#endif 393#endif
365 { 394 {
366 int lnsppg; 395 int lnsppg;
367 396
368#ifdef PAGING_CONTEXT_LINES 397#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 398 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 399#else
371 lnsppg = TermWin.nrow * 4 / 5; 400 lnsppg = nrow * 4 / 5;
372#endif 401#endif
373 if (keysym == XK_Prior) 402 if (keysym == XK_Prior)
374 { 403 {
375 scr_page (UP, lnsppg); 404 scr_page (UP, lnsppg);
376 return; 405 return;
… …
513 else 542 else
514 strcpy (kbuf, key_backspace); 543 strcpy (kbuf, key_backspace);
515 break; 544 break;
516#endif 545#endif
517#ifndef NO_DELETE_KEY 546#ifndef NO_DELETE_KEY
547# ifdef XK_KP_Prior
548 case XK_KP_Delete:
549 /* allow shift to override */
550 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
551 {
552 strcpy (kbuf, "\033On");
553 break;
554 }
555 /* FALLTHROUGH */
556# endif
518 case XK_Delete: 557 case XK_Delete:
519 strcpy (kbuf, key_delete); 558 strcpy (kbuf, key_delete);
520 break; 559 break;
521#endif 560#endif
522 case XK_Tab: 561 case XK_Tab:
… …
625#ifdef XK_KP_Begin 664#ifdef XK_KP_Begin
626 case XK_KP_Begin: 665 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 666 strcpy (kbuf, "\033Ou");
628 break; 667 break;
629 668
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 669#endif
638 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
… …
673 break; 705 break;
674 706
675 case XK_Find: 707 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
677 break; 709 break;
710
711#ifdef XK_KP_End
712 case XK_KP_Insert:
713 /* allow shift to override */
714 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
715 {
716 strcpy (kbuf, "\033Op");
717 break;
718 }
719 /* FALLTHROUGH */
720#endif
678 case XK_Insert: 721 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 722 strcpy (kbuf, "\033[2~");
680 break; 723 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 724#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 725 case DXK_Remove:
… …
818 861
819 if (len <= 0) 862 if (len <= 0)
820 return; /* not mapped */ 863 return; /* not mapped */
821 864
822 if (options & Opt_scrollTtyKeypress) 865 if (options & Opt_scrollTtyKeypress)
823 if (TermWin.view_start) 866 if (view_start)
824 { 867 {
825 TermWin.view_start = 0; 868 view_start = 0;
826 want_refresh = 1; 869 want_refresh = 1;
827 } 870 }
828 871
829 /* 872 /*
830 * these modifications only affect the static keybuffer 873 * these modifications only affect the static keybuffer
… …
1007{ 1050{
1008 if (mouse_slip_wheel_speed == 0 1051 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1053 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1054 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1055 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1056 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1057 mouse_slip_wheel_speed = 0;
1015 1058
1016 refresh_type |= SMOOTH_REFRESH; 1059 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1060 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1040 if (n > 0) 1083 if (n > 0)
1041 { 1084 {
1042 cmdbuf_endp += n; 1085 cmdbuf_endp += n;
1043 return true; 1086 return true;
1044 } 1087 }
1045 else if (n < 0 && errno != EAGAIN) 1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1089 {
1090 pty_ev.stop ();
1091
1092 if (!(options & Opt_hold))
1046 destroy (); 1093 destroy ();
1094 }
1047 1095
1048 return false; 1096 return false;
1049} 1097}
1050 1098
1051void 1099void
… …
1065} 1113}
1066 1114
1067void 1115void
1068rxvt_term::pointer_unblank () 1116rxvt_term::pointer_unblank ()
1069{ 1117{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1118 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1119 recolour_cursor ();
1072 1120
1073#ifdef POINTER_BLANK 1121#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1122 hidden_pointer = 0;
1075 1123
… …
1083rxvt_term::pointer_blank () 1131rxvt_term::pointer_blank ()
1084{ 1132{
1085 if (! (options & Opt_pointerBlank)) 1133 if (! (options & Opt_pointerBlank))
1086 return; 1134 return;
1087 1135
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1136 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1137 XFlush (display->display);
1090 1138
1091 hidden_pointer = 1; 1139 hidden_pointer = 1;
1092} 1140}
1093 1141
… …
1182 1230
1183/*{{{ process an X event */ 1231/*{{{ process an X event */
1184void 1232void
1185rxvt_term::x_cb (XEvent &ev) 1233rxvt_term::x_cb (XEvent &ev)
1186{ 1234{
1235 dDisp;
1236
1187 SET_R (this); 1237 SET_R (this);
1188 SET_LOCALE (locale); 1238 SET_LOCALE (locale);
1189 1239
1190#if defined(CURSOR_BLINK) 1240#if defined(CURSOR_BLINK)
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1307 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1308 break; 1358 break;
1309 1359
1310 case ClientMessage: 1360 case ClientMessage:
1311 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1363 {
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313 destroy (); 1365 destroy ();
1366#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev);
1371#endif
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1314#ifdef OFFIX_DND 1382#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */ 1383 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile 1385 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir 1386 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink)) 1387 || ev.xclient.data.l[0] == DndLink))
1320 { 1388 {
1321 /* Get Dnd data */ 1389 /* Get Dnd data */
1322 Atom ActualType; 1390 Atom ActualType;
1323 int ActualFormat; 1391 int ActualFormat;
1324 unsigned char *data; 1392 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1393 unsigned long Size, RemainingBytes;
1326 1394
1327 XGetWindowProperty (display->display, display->root, 1395 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1396 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1397 0L, 1000000L,
1330 False, AnyPropertyType, 1398 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1399 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1400 &Size, &RemainingBytes,
1333 &data); 1401 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1402 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1403 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1404 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1405 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1406 }
1339#endif /* OFFIX_DND */ 1407#endif /* OFFIX_DND */
1340 break; 1408 break;
1341 1409
1342 case MappingNotify: 1410 case MappingNotify:
… …
1367 break; 1435 break;
1368 } 1436 }
1369 break; 1437 break;
1370 1438
1371 case FocusIn: 1439 case FocusIn:
1372 if (!TermWin.focus) 1440 focus_in ();
1441 break;
1442
1443 case FocusOut:
1444 focus_out ();
1445 break;
1446
1447 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0])
1373 { 1449 {
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)); 1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ;
1441 1452
1442 if (szHint.width != width || szHint.height != height) 1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1454 {
1444 seen_resize = 1; 1455 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1457 }
1447 1458
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449 if (options & Opt_transparent) 1460 if (options & Opt_transparent)
1450 check_our_parents (); 1461 check_our_parents ();
… …
1471 case SelectionRequest: 1482 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1473 break; 1484 break;
1474 1485
1475 case UnmapNotify: 1486 case UnmapNotify:
1476 TermWin.mapped = 0; 1487 mapped = 0;
1477#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1479#endif 1490#endif
1480 break; 1491 break;
1481 1492
1482 case MapNotify: 1493 case MapNotify:
1483 TermWin.mapped = 1; 1494 mapped = 1;
1484#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif 1497#endif
1487 break; 1498 break;
1488 1499
… …
1492 break; 1503 break;
1493#endif /* TRANSPARENT */ 1504#endif /* TRANSPARENT */
1494 1505
1495 case GraphicsExpose: 1506 case GraphicsExpose:
1496 case Expose: 1507 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1508 if (ev.xany.window == vt)
1498 { 1509 {
1499 do 1510 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503 1514
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1516
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1509 1520
1510 scr_refresh (refresh_type); 1521 scr_refresh (refresh_type);
1511 } 1522 }
1512 else 1523 else
1513 { 1524 {
1514 XEvent unused_event; 1525 XEvent unused_event;
1515 1526
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1528 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1530 ;
1520 1531
1521 if (isScrollbarWindow (ev.xany.window)) 1532 if (isScrollbarWindow (ev.xany.window))
1522 { 1533 {
1523 scrollBar.setIdle (); 1534 scrollBar.setIdle ();
… …
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose (); 1539 menubar_expose ();
1529#endif 1540#endif
1530 1541
1531#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1543 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1544 XClearWindow (disp, ev.xany.window);
1534#endif 1545#endif
1535 } 1546 }
1536 break; 1547 break;
1537 1548
1538 case MotionNotify: 1549 case MotionNotify:
… …
1548 } 1559 }
1549#endif 1560#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1562 break;
1552 1563
1553 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1554 { 1565 {
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1566 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1567 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558 ; 1569 ;
1559 1570
1560 XQueryPointer (display->display, TermWin.vt, 1571 XQueryPointer (disp, vt,
1561 &unused_root, &unused_child, 1572 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1573 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1574 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1575 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1576#ifdef MOUSE_THRESHOLD
… …
1577#endif 1588#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1589 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1590 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1591
1581#ifdef SELECTION_SCROLLING 1592#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1593 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1594 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1595 {
1585 int dist; 1596 int dist;
1586 1597
1587 /* don't clobber the current delay if we are 1598 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1599 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1607 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1608 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1609 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1610
1600 /* calc number of lines to scroll */ 1611 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1612 if (ev.xbutton.y < int_bwidth)
1602 { 1613 {
1603 scroll_selection_dir = UP; 1614 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1615 dist = int_bwidth - ev.xbutton.y;
1605 } 1616 }
1606 else 1617 else
1607 { 1618 {
1608 scroll_selection_dir = DN; 1619 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1620 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1621 }
1611 1622
1612 scroll_selection_lines = Pixel2Height (dist) 1623 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1624 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1625 + 1;
1615 MIN_IT (scroll_selection_lines, 1626 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1627 SELECTION_SCROLL_MAX_LINES);
1617 } 1628 }
1618 else 1629 else
1619 { 1630 {
1620 /* we are within the text window, so we 1631 /* we are within the text window, so we
… …
1629#endif 1640#endif
1630 } 1641 }
1631 } 1642 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1644 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1645 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1646 MotionNotify, &ev))
1636 ; 1647 ;
1637 1648
1638 XQueryPointer (display->display, scrollBar.win, 1649 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1653 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1648 } 1659 }
1649 break; 1660 break;
1650 } 1661 }
1651} 1662}
1652 1663
1664void
1665rxvt_term::focus_in ()
1666{
1667 if (!focus)
1668 {
1669 focus = 1;
1670 want_refresh = 1;
1671#if USE_XIM
1672 if (Input_Context != NULL)
1673 {
1674 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context);
1676 }
1677#endif
1678#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink)
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif
1682#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade])
1684 {
1685 pix_colors = pix_colors_focused;
1686 scr_recolour ();
1687 }
1688#endif
1689 }
1690}
1691
1692void
1693rxvt_term::focus_out ()
1694{
1695 if (focus)
1696 {
1697 focus = 0;
1698 want_refresh = 1;
1699
1700#if ENABLE_FRILLS || ISO_14755
1701 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY
1704 scr_overlay_off ();
1705#endif
1706#if USE_XIM
1707 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context);
1709#endif
1710#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink)
1712 cursor_blink_ev.stop ();
1713 hidden_cursor = 0;
1714#endif
1715#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade])
1717 {
1718 pix_colors = pix_colors_unfocused;
1719 scr_recolour ();
1720 }
1721#endif
1722 }
1723}
1724
1653#if TRANSPARENT 1725#if TRANSPARENT
1654void 1726void
1655rxvt_term::rootwin_cb (XEvent &ev) 1727rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1728{
1657 SET_R (this); 1729 SET_R (this);
… …
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1759 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1760
1689 /* 1761 /*
1690 * VT window processing of button press 1762 * VT window processing of button press
1691 */ 1763 */
1692 if (ev.window == TermWin.vt) 1764 if (ev.window == vt)
1693 { 1765 {
1694#if ISO_14755 1766#if ISO_14755
1695 // 5.4 1767 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1769 {
… …
1902 case Button3: 1974 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 1975 if (scrollBar.style != R_SB_XTERM)
1904 { 1976 {
1905 if (scrollbar_above_slider (ev.y)) 1977 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 1978# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 1979 scr_page (UP, nrow - 1);
1908# else 1980# else
1909 scr_page (UP, TermWin.nrow / 4); 1981 scr_page (UP, nrow / 4);
1910# endif 1982# endif
1911 else if (scrollbar_below_slider (ev.y)) 1983 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 1985 scr_page (DN, nrow - 1);
1914# else 1986# else
1915 scr_page (DN, TermWin.nrow / 4); 1987 scr_page (DN, nrow / 4);
1916# endif 1988# endif
1917 else 1989 else
1918 scrollBar.setMotion (); 1990 scrollBar.setMotion ();
1919 } 1991 }
1920 else 1992 else
1921 { 1993 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 1994 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 1995 (nrow
1924 * scrollbar_position (ev.y) 1996 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 1997 / scrollbar_size ()));
1926 } 1998 }
1927 1999
1928 break; 2000 break;
… …
1960#ifdef SELECTION_SCROLLING 2032#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2033 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2034 sel_scroll_ev.stop();
1963#endif 2035#endif
1964 2036
1965 if (ev.window == TermWin.vt) 2037 if (ev.window == vt)
1966 { 2038 {
1967#if ISO_14755 2039#if ISO_14755
1968 // 5.4 2040 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2042 return;
… …
2021 v = ev.button == Button4 ? UP : DN; 2093 v = ev.button == Button4 ? UP : DN;
2022 2094
2023 if (ev.state & ShiftMask) 2095 if (ev.state & ShiftMask)
2024 i = 1; 2096 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2097 else if (options & Opt_mouseWheelScrollPage)
2026 i = TermWin.nrow - 1; 2098 i = nrow - 1;
2027 else 2099 else
2028 i = 5; 2100 i = 5;
2029 2101
2030# ifdef MOUSE_SLIP_WHEELING 2102# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2103 if (ev.state & ControlMask)
2032 { 2104 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2105 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2106 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; 2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2108
2037 if (slip_wheel_ev.at < NOW) 2109 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2111
2040 slip_wheel_ev.start (); 2112 slip_wheel_ev.start ();
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2153 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2154 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2155 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2156 int i;
2085 2157
2086 Visual* visual = display->visual; 2158 Visual *visual = display->visual;
2087 2159
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2160 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2161
2090 /* for convenience */ 2162 /* for convenience */
2091 mask_r = visual->red_mask; 2163 mask_r = visual->red_mask;
… …
2312 Atom atype; 2384 Atom atype;
2313 unsigned char *prop = NULL; 2385 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2386 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2387 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2388 XWindowAttributes wattr, wrootattr;
2389 dDisp;
2317 2390
2318 pchanged = 0; 2391 pchanged = 0;
2319 2392
2320 if (!(options & Opt_transparent)) 2393 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2322 2395
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2396 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2397 rootdepth = wrootattr.depth;
2325 2398
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2399 XGetWindowAttributes (disp, parent[0], &wattr);
2327 2400
2328 if (rootdepth != wattr.depth) 2401 if (rootdepth != wattr.depth)
2329 { 2402 {
2330 if (am_transparent) 2403 if (am_transparent)
2331 { 2404 {
2332 pchanged = 1; 2405 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2407 am_transparent = am_pixmap_trans = 0;
2335 } 2408 }
2336 2409
2337 return pchanged; /* Don't try any more */ 2410 return pchanged; /* Don't try any more */
2338 } 2411 }
2339 2412
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2413 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2414 XSync (disp, False);
2342 2415
2343 /* 2416 /*
2344 * Make the frame window set by the window manager have 2417 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2418 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2419 * windows for each client, so we have to take care about that.
2347 */ 2420 */
2348 i = (xa[XA_XROOTPMAP_ID] 2421 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2422 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2423 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2424 &nitems, &bytes_after, &prop) == Success);
2352 2425
2353 if (!i || prop == NULL) 2426 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2427 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2428 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2430 &nitems, &bytes_after, &prop) == Success);
2358 2431
2359 if (!i || prop == NULL 2432 if (!i || prop == NULL
2360#if TINTING 2433#if TINTING
… …
2379 Window cr; 2452 Window cr;
2380 XImage *image; 2453 XImage *image;
2381 GC gc; 2454 GC gc;
2382 XGCValues gcvalue; 2455 XGCValues gcvalue;
2383 2456
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2457 XTranslateCoordinates (disp, parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2458 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2459 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2460 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2461 nx = ny = 0;
2389 2462
… …
2399 nh += sy; 2472 nh += sy;
2400 ny = -sy; 2473 ny = -sy;
2401 sy = 0; 2474 sy = 0;
2402 } 2475 }
2403 2476
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2477 min_it (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2478 min_it (nh, (unsigned int) (wrootattr.height - sy));
2406 2479
2407 XSync (display->display, False); 2480 XSync (disp, False);
2408 allowedxerror = -1; 2481 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2483
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2484 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2485 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2486 allowedxerror = 0;
2414 2487
2415 if (image == NULL) 2488 if (image == NULL)
2416 { 2489 {
2417 if (am_transparent && am_pixmap_trans) 2490 if (am_transparent && am_pixmap_trans)
2418 { 2491 {
2419 pchanged = 1; 2492 pchanged = 1;
2420 if (TermWin.pixmap != None) 2493 if (pixmap != None)
2421 { 2494 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2495 XFreePixmap (disp, pixmap);
2423 TermWin.pixmap = None; 2496 pixmap = None;
2424 } 2497 }
2425 } 2498 }
2426 2499
2427 am_pixmap_trans = 0; 2500 am_pixmap_trans = 0;
2428 } 2501 }
2429 else 2502 else
2430 { 2503 {
2431 if (TermWin.pixmap != None) 2504 if (pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (disp, pixmap);
2433 2506
2434#if TINTING 2507#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2508 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2509 {
2437 unsigned short rm, gm, bm; 2510 unsigned short rm, gm, bm;
… …
2441 2514
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2515 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2516 }
2444#endif 2517#endif
2445 2518
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2519 pixmap = XCreatePixmap (disp, vt,
2447 szHint.width, szHint.height, image->depth); 2520 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2522 XPutImage (disp, pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2523 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2524 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2525 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2527 XClearWindow (disp, parent[0]);
2455 2528
2456 if (!am_transparent || !am_pixmap_trans) 2529 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2530 pchanged = 1;
2458 2531
2459 am_transparent = am_pixmap_trans = 1; 2532 am_transparent = am_pixmap_trans = 1;
2460 } 2533 }
2461 } 2534 }
2462 2535
2463 if (am_pixmap_trans) 2536 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465 else 2538 else
2466 { 2539 {
2467 unsigned int n; 2540 unsigned int n;
2468 /* 2541 /*
2469 * InheritPixmap transparency 2542 * InheritPixmap transparency
2470 */ 2543 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472 { 2545 {
2473 oldp = TermWin.parent[i]; 2546 oldp = parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2547 XQueryTree (disp, parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2548 &parent[i], &list, &n);
2476 XFree (list); 2549 XFree (list);
2477 2550
2478 if (TermWin.parent[i] == display->root) 2551 if (parent[i] == display->root)
2479 { 2552 {
2480 if (oldp != None) 2553 if (oldp != None)
2481 pchanged = 1; 2554 pchanged = 1;
2482 2555
2483 break; 2556 break;
2484 } 2557 }
2485 2558
2486 if (oldp != TermWin.parent[i]) 2559 if (oldp != parent[i])
2487 pchanged = 1; 2560 pchanged = 1;
2488 } 2561 }
2489 2562
2490 n = 0; 2563 n = 0;
2491 2564
2492 if (pchanged) 2565 if (pchanged)
2493 { 2566 {
2494 for (; n < (unsigned int)i; n++) 2567 for (; n < (unsigned int)i; n++)
2495 { 2568 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2569 XGetWindowAttributes (disp, parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2571 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500 break; 2573 break;
2501 } 2574 }
2502 } 2575 }
2503 } 2576 }
2504 2577
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2578 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506 { 2579 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2582 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2583 /* XXX: also turn off Opt_transparent? */
2511 } 2584 }
2512 else 2585 else
2513 { 2586 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2589 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2590 sleep (1);
2518#endif 2591#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2592 for (n = 0; n < (unsigned int)i; n++)
2520 { 2593 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2595 XClearWindow (disp, parent[n]);
2523 } 2596 }
2524 2597
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526 am_transparent = 1; 2599 am_transparent = 1;
2527 } 2600 }
2528 2601
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2603 parent[i] = None;
2531 } 2604 }
2532 2605
2533 if (scrollBar.win) 2606 if (scrollBar.win)
2534 { 2607 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2609 scrollBar.setIdle ();
2537 scrollbar_show (0); 2610 scrollbar_show (0);
2538 } 2611 }
2539 2612
2540 if (am_transparent) 2613 if (am_transparent)
… …
2578 // some window managers resize the window early, and these programs 2651 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2652 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2653 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2654 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2655 // resized.
2583 if (seen_resize) 2656 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2657 kill (-cmd_pid, SIGWINCH);
2585 } 2658 }
2586 2659
2587 /* Read a text string from the input buffer */ 2660 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2661 unicode_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2662 bool refreshnow = false;
2590 int nlines = 0; 2663 int nlines = 0;
2591 unicode_t *str = buf; 2664 unicode_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ);
2592 2666
2593 for (;;) 2667 for (;;)
2594 { 2668 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2670 break;
2597 2671
2598 *str++ = ch; 2672 *str++ = ch;
2599 2673
2600 if (ch == C0_LF) 2674 if (ch == C0_LF || str >= eol)
2601 { 2675 {
2676 if (ch == C0_LF)
2602 nlines++; 2677 nlines++;
2678
2603 refresh_count++; 2679 refresh_count++;
2604 2680
2605 if (!(options & Opt_jumpScroll) 2681 if (!(options & Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2683 {
2608 refreshnow = true; 2684 refreshnow = true;
2609 ch = NOCHAR; 2685 ch = NOCHAR;
2610 break; 2686 break;
2611 } 2687 }
2612 2688
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2689 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2690 if (nlines >= nrow - 1)
2615 { 2691 {
2616 scr_add_lines (buf, nlines, str - buf); 2692 scr_add_lines (buf, nlines, str - buf);
2617 nlines = 0; 2693 nlines = 0;
2618 str = buf; 2694 str = buf;
2695 eol = str + min (ncol, UBUFSIZ);
2619 } 2696 }
2620 }
2621 2697
2622 if (str >= buf + UBUFSIZ) 2698 if (str >= eol)
2623 { 2699 {
2700 if (eol >= buf + UBUFSIZ)
2701 {
2624 ch = NOCHAR; 2702 ch = NOCHAR;
2625 break; 2703 break;
2704 }
2705 else
2706 eol = min (eol + ncol, buf + UBUFSIZ);
2707 }
2708
2626 } 2709 }
2627 2710
2628 seq_begin = cmdbuf_ptr; 2711 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2712 ch = next_char ();
2630 } 2713 }
… …
3174 { 3257 {
3175 switch (priv) 3258 switch (priv)
3176 { 3259 {
3177 case '>': 3260 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 3261 if (ch == CSI_DA) /* secondary device attributes */
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180 break; 3263 break;
3181 case '?': 3264 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 3266 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 3267 break;
… …
3289 3372
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3373 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 3374 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3378 break;
3296 3379
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3381 tt_write ((const unsigned char *)VT100_ANS,
3299 (unsigned int) (sizeof (VT100_ANS) - 1)); 3382 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3496rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3497{
3415 int x, y; 3498 int x, y;
3416 XWindowAttributes wattr; 3499 XWindowAttributes wattr;
3417 Window wdummy; 3500 Window wdummy;
3501 dDisp;
3418 3502
3419 if (nargs == 0) 3503 if (nargs == 0)
3420 return; 3504 return;
3421 3505
3422 switch (args[0]) 3506 switch (args[0])
3423 { 3507 {
3424 /* 3508 /*
3425 * commands 3509 * commands
3426 */ 3510 */
3427 case 1: /* deiconify window */ 3511 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3512 XMapWindow (disp, parent[0]);
3429 break; 3513 break;
3430 case 2: /* iconify window */ 3514 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3515 XIconifyWindow (disp, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3516 break;
3434 case 3: /* set position (pixels) */ 3517 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3518 XMoveWindow (disp, parent[0], args[1], args[2]);
3436 break; 3519 break;
3437 case 4: /* set size (pixels) */ 3520 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3522 break;
3440 case 5: /* raise window */ 3523 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3524 XRaiseWindow (disp, parent[0]);
3442 break; 3525 break;
3443 case 6: /* lower window */ 3526 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3527 XLowerWindow (disp, parent[0]);
3445 break; 3528 break;
3446 case 7: /* refresh window */ 3529 case 7: /* refresh window */
3447 scr_touch (true); 3530 scr_touch (true);
3448 break; 3531 break;
3449 case 8: /* set size (chars) */ 3532 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3533 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3534 (unsigned int) (args[1] * fheight));
3452 break; 3535 break;
3453 3536
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3537 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3538 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3539 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3540 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3541 (unsigned int) (args[1] * fheight));
3459 break; 3542 break;
3460 3543
3461 3544
3462 /* 3545 /*
3463 * reports - some output format copied from XTerm 3546 * reports - some output format copied from XTerm
3464 */ 3547 */
3465 case 11: /* report window state */ 3548 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3549 XGetWindowAttributes (disp, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3551 break;
3469 case 13: /* report window position */ 3552 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3554 XTranslateCoordinates (disp, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3555 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3556 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3557 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3558 break;
3476 case 14: /* report window size (pixels) */ 3559 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3560 XGetWindowAttributes (disp, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3562 break;
3480 case 18: /* report text area size (chars) */ 3563 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3564 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3565 break;
3483 case 19: /* report window size (chars) */ 3566 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3567 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3568 break;
3486 case 20: /* report icon label */ 3569 case 20: /* report icon label */
3487 { 3570 {
3488 char *s; 3571 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3572 XGetIconName (disp, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3574 XFree (s);
3492 } 3575 }
3493 break; 3576 break;
3494 case 21: /* report window title */ 3577 case 21: /* report window title */
3495 { 3578 {
3496 char *s; 3579 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3580 XFetchName (disp, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3582 XFree (s);
3500 } 3583 }
3501 break; 3584 break;
3502 } 3585 }
… …
3535 else if (ch < 0x20) 3618 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3619 return NULL; /* other control character - exit */
3537 3620
3538 seen_esc = false; 3621 seen_esc = false;
3539 3622
3540 if (n >= sizeof (string) - 1) 3623 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3624 // stop at some sane length
3542 return NULL; 3625 return NULL;
3543 3626
3544 if (ch == C0_SYN) 3627 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 (); 3628 string[n++] = cmd_get8 ();
… …
3613 set_window_color (color, str); 3696 set_window_color (color, str);
3614} 3697}
3615 3698
3616/* 3699/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3700 * 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 */ 3701 */
3641void 3702void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3643{ 3704{
3644 int changed = 0; 3705 int changed = 0;
3645 int color; 3706 int color;
3646 char *buf, *name; 3707 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3708 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3709 int saveop = op;
3710 dDisp;
3649 3711
3650 assert (str != NULL); 3712 assert (str != NULL);
3651 switch (op) 3713 switch (op)
3652 { 3714 {
3653 case XTerm_name: 3715 case XTerm_name:
… …
3669 unsigned long bytes_after; 3731 unsigned long bytes_after;
3670 unsigned char *value = 0; 3732 unsigned char *value = 0;
3671 const char *str = ""; 3733 const char *str = "";
3672 3734
3673 if (prop 3735 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3736 && XGetWindowProperty (disp, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3737 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3738 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3739 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3740 && actual_type != None
3679 && actual_format == 8) 3741 && actual_format == 8)
… …
3691 { 3753 {
3692 *eq = 0; 3754 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3755 set_utf8_property (display->atom (str), eq + 1);
3694 } 3756 }
3695 else 3757 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3758 XDeleteProperty (disp, parent[0],
3697 display->atom (str)); 3759 display->atom (str));
3698 } 3760 }
3699 break; 3761 break;
3700 3762
3701 case XTerm_Color: 3763 case XTerm_Color:
… …
3742 break; 3804 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3805#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD: 3806 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break; 3808 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL: 3809 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break; 3811 break;
3753 case XTerm_Color_RV: 3812 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break; 3814 break;
3815 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3817 break;
3756#endif 3818#endif
3757#if TRANSPARENT && TINTING 3819#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3820 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760 check_our_parents (); 3822 check_our_parents ();
3761 if (am_transparent) 3823 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3824 want_full_refresh = want_refresh = 1;
3763 break; 3825 break;
3764#endif 3826#endif
… …
3798 3860
3799 case XTerm_logfile: 3861 case XTerm_logfile:
3800 // TODO, when secure mode? 3862 // TODO, when secure mode?
3801 break; 3863 break;
3802 3864
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0
3872 case XTerm_dumpscreen: /* no error notices */
3873 {
3874 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 {
3877 scr_dump (fd);
3878 close (fd);
3879 }
3880 }
3881 break;
3882#endif
3803 case XTerm_font: 3883 case XTerm_font:
3804 op = URxvt_font; 3884 op = URxvt_font;
3805 case URxvt_font: 3885 case URxvt_font:
3806#if ENABLE_STYLES 3886#if ENABLE_STYLES
3807 case URxvt_boldFont: 3887 case URxvt_boldFont:
3808 case URxvt_italicFont: 3888 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3889 case URxvt_boldItalicFont:
3810#endif 3890#endif
3811 if (query) 3891 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3892 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3894 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3895 resp);
3816 else 3896 else
3817 { 3897 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3898 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3899
… …
3822 set_fonts (); 3902 set_fonts ();
3823 } 3903 }
3824 break; 3904 break;
3825 3905
3826#if ENABLE_FRILLS 3906#if ENABLE_FRILLS
3827 case XTerm_locale: 3907 case URxvt_locale:
3828 if (query) 3908 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3830 else 3910 else
3831 { 3911 {
3832 set_locale (str); 3912 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3913 pty.set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3914 init_xlocale ();
3836# endif
3837 } 3915 }
3838 break; 3916 break;
3839#endif
3840 3917
3841#ifdef MENUBAR 3918 case URxvt_view_up:
3842 case XTerm_Menu: 3919 case URxvt_view_down:
3843 if (options & Opt_insecure) 3920 int lines = atoi (str);
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3921
3845 break; 3922 if (lines)
3846#endif 3923 scr_page (op == URxvt_view_up ? UP : DN, lines);
3847#if 0
3848 case XTerm_dumpscreen: /* no error notices */
3849 { 3924 else
3850 int fd;
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852 { 3925 {
3853 scr_dump (fd); 3926 scr_erase_savelines ();
3854 close (fd);
3855 } 3927 }
3856 } 3928
3857 break; 3929 break;
3858#endif 3930#endif
3859 } 3931 }
3860} 3932}
3861/*----------------------------------------------------------------------*/ 3933/*----------------------------------------------------------------------*/
… …
3994 */ 4066 */
3995 PrivMode (1, PrivMode_vt52); 4067 PrivMode (1, PrivMode_vt52);
3996 break; 4068 break;
3997 case 3: /* 80/132 */ 4069 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4070 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4071 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4072 break;
4001 case 4: /* smooth scrolling */ 4073 case 4: /* smooth scrolling */
4002 if (state) 4074 if (state)
4003 options &= ~Opt_jumpScroll; 4075 options &= ~Opt_jumpScroll;
4004 else 4076 else
… …
4321 } 4393 }
4322 4394
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4395 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4396 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4398 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4399}
4329 4400
4330/*----------------------- end-of-file (C source) -----------------------*/ 4401/*----------------------- end-of-file (C source) -----------------------*/
4331 4402

Diff Legend

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