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.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.226 by root, Sun Jan 1 15:03:49 2006 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.
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
53#ifdef KEYSYM_RESOURCE 57#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 58# include "keyboard.h"
55#endif 59#endif
56 60
57#include <cwchar>
58#include <csignal> 61#include <csignal>
59 62
60/*----------------------------------------------------------------------*/ 63/*----------------------------------------------------------------------*/
61 64
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 65#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
118 XK_Escape, 0x238b, 121 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 122 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 123 XK_Print, 0x2399,
121 124
122 XK_space, 0x2423, 125 XK_space, 0x2423,
126
127#ifdef XK_KP_Begin
128 XK_KP_Prior, 0x21de,
129 XK_KP_Next, 0x21df,
130 XK_KP_Begin, 0x2320,
131 XK_KP_Insert, 0x2380,
132 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
134#endif
124 0, 135 0,
125}; 136};
126 137
127void 138void
128rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
129{ 140{
130 x = Pixel2Col (x); 141 x = Pixel2Col (x);
131 y = Pixel2Row (y); 142 y = Pixel2Row (y);
132 143
133 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 146 return;
136 147
137 for (;;) 148 for (;;)
138 { 149 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
140 153
141 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
142 { 155 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 156 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
146 break; 158 break;
147 } 159 }
148 160
149 x--; 161 x--;
150 } 162 }
151
152} 163}
153#endif
154 164
155#if ENABLE_OVERLAY
156void 165void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 167{
159 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 169 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 170 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 171 int len;
163 172
173 fname = rxvt_utf8towcs (f->name);
174
164#if ENABLE_COMBINING 175# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
166 { 177 {
167 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
170 } 181 }
171 else 182 else
172#endif 183# endif
173 { 184 {
174 ch2 = ch; 185 ch2 = ch;
175 186
176 alloc = 0; 187 alloc = 0;
177 chr = &ch2; 188 chr = &ch2;
178 len = 1; 189 len = 1;
179 } 190 }
180 191
181 int width = strlen (f->name); 192 char attr[80]; // plenty
182 193
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = wcswidth (fname, wcslen (fname));
205
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
215 scr_overlay_new (x, y, width, len + 2);
184 216
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 218
187 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
188 { 220 {
191 ch = *chr++; 223 ch = *chr++;
192 224
193 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
196#if !UNICODE3 228# if !UNICODE3
197 if (ch >= 0x10000) 229 if (ch >= 0x10000)
198 ch = 0xfffd; 230 ch = 0xfffd;
199#endif 231# endif
200 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
202 } 234 }
203 235
236 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 237 scr_overlay_set (0, len + 1, fname);
205 238
239 free (fname);
240
206#if ENABLE_COMBINING 241# if ENABLE_COMBINING
207 if (alloc) 242 if (alloc)
208 delete [] alloc; 243 delete [] alloc;
209#endif 244# endif
210} 245}
211#endif 246#endif
212 247
213void 248void
214rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 312 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 313 * escape sequence to toggle the Keypad.
279 * 314 *
280 * Always permit `shift' to override the current setting 315 * Always permit `shift' to override the current setting
281 */ 316 */
282 shft = (ev.state & ShiftMask); 317 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 318 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 319 meta = ev.state & ModMetaMask;
285 320
286 if (numlock_state || (ev.state & ModNumLockMask)) 321 if (numlock_state || (ev.state & ModNumLockMask))
287 { 322 {
288 numlock_state = (ev.state & ModNumLockMask); 323 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 324 PrivMode ((!numlock_state), PrivMode_aplKP);
309 344
310 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
314 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
317 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 355 SET_LOCALE (locale);
319 356
320 if (status_return == XLookupChars 357 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
353#ifdef KEYSYM_RESOURCE 390#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 391 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 392 return;
356#endif 393#endif
357 394
358 if (TermWin.saveLines) 395 if (saveLines)
359 { 396 {
360#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 398 if (!ctrl && !meta)
362#else 399#else
363 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
364#endif 401#endif
365 { 402 {
366 int lnsppg; 403 int lnsppg;
367 404
368#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 407#else
371 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
372#endif 409#endif
373 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
374 { 411 {
375 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
376 return; 413 return;
513 else 550 else
514 strcpy (kbuf, key_backspace); 551 strcpy (kbuf, key_backspace);
515 break; 552 break;
516#endif 553#endif
517#ifndef NO_DELETE_KEY 554#ifndef NO_DELETE_KEY
555# ifdef XK_KP_Prior
556 case XK_KP_Delete:
557 /* allow shift to override */
558 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
559 {
560 strcpy (kbuf, "\033On");
561 break;
562 }
563 /* FALLTHROUGH */
564# endif
518 case XK_Delete: 565 case XK_Delete:
519 strcpy (kbuf, key_delete); 566 strcpy (kbuf, key_delete);
520 break; 567 break;
521#endif 568#endif
522 case XK_Tab: 569 case XK_Tab:
625#ifdef XK_KP_Begin 672#ifdef XK_KP_Begin
626 case XK_KP_Begin: 673 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 674 strcpy (kbuf, "\033Ou");
628 break; 675 break;
629 676
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 677#endif
638 case XK_KP_F1: /* "\033OP" */ 678 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 679 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 680 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 681 case XK_KP_F4: /* "\033OS" */
673 break; 713 break;
674 714
675 case XK_Find: 715 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 716 strcpy (kbuf, "\033[1~");
677 break; 717 break;
718
719#ifdef XK_KP_End
720 case XK_KP_Insert:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Op");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
678 case XK_Insert: 729 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 730 strcpy (kbuf, "\033[2~");
680 break; 731 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 732#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 733 case DXK_Remove:
817 } 868 }
818 869
819 if (len <= 0) 870 if (len <= 0)
820 return; /* not mapped */ 871 return; /* not mapped */
821 872
822 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 874 if (view_start)
824 { 875 {
825 TermWin.view_start = 0; 876 view_start = 0;
826 want_refresh = 1; 877 want_refresh = 1;
827 } 878 }
828 879
829 /* 880 /*
830 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
933 SET_LOCALE (locale); 984 SET_LOCALE (locale);
934 985
935 display->flush (); 986 display->flush ();
936 987
937 if (want_refresh && !flush_ev.active) 988 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 989 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 990}
940 991
941void 992void
942rxvt_term::flush_cb (time_watcher &w) 993rxvt_term::flush_cb (time_watcher &w)
943{ 994{
1007{ 1058{
1008 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1062 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1063 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1064 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1065 mouse_slip_wheel_speed = 0;
1015 1066
1016 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1068 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033 1084
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1037 1088
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039 1090
1040 if (n > 0) 1091 if (r > 0)
1041 { 1092 {
1042 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1043 return true; 1094 return true;
1044 } 1095 }
1045 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
1046 destroy (); 1107 destroy ();
1108 }
1047 1109
1048 return false; 1110 return false;
1049} 1111}
1050 1112
1051void 1113void
1065} 1127}
1066 1128
1067void 1129void
1068rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1069{ 1131{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1133 recolour_cursor ();
1072 1134
1073#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1136 hidden_pointer = 0;
1075 1137
1076 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1140#endif
1079} 1141}
1080 1142
1081#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1082void 1144void
1083rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1084{ 1146{
1085 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1086 return; 1148 return;
1087 1149
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1151 XFlush (display->display);
1090 1152
1091 hidden_pointer = 1; 1153 hidden_pointer = 1;
1092} 1154}
1093 1155
1188 1250
1189 SET_R (this); 1251 SET_R (this);
1190 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1191 1253
1192#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1194 { 1256 {
1195 if (hidden_cursor) 1257 if (hidden_cursor)
1196 { 1258 {
1197 hidden_cursor = 0; 1259 hidden_cursor = 0;
1198 want_refresh = 1; 1260 want_refresh = 1;
1201 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1202 } 1264 }
1203#endif 1265#endif
1204 1266
1205#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1206 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1207 { 1269 {
1208 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1209 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1210 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1211 if (hidden_pointer) 1273 if (hidden_pointer)
1309 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1310 break; 1372 break;
1311 1373
1312 case ClientMessage: 1374 case ClientMessage:
1313 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1314 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1315 destroy (); 1379 destroy ();
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1316#ifdef OFFIX_DND 1396#ifdef OFFIX_DND
1317 /* OffiX Dnd (drag 'n' drop) protocol */ 1397 /* OffiX Dnd (drag 'n' drop) protocol */
1318 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319 && (ev.xclient.data.l[0] == DndFile 1399 && (ev.xclient.data.l[0] == DndFile
1320 || ev.xclient.data.l[0] == DndDir 1400 || ev.xclient.data.l[0] == DndDir
1321 || ev.xclient.data.l[0] == DndLink)) 1401 || ev.xclient.data.l[0] == DndLink))
1322 { 1402 {
1323 /* Get Dnd data */ 1403 /* Get Dnd data */
1324 Atom ActualType; 1404 Atom ActualType;
1325 int ActualFormat; 1405 int ActualFormat;
1326 unsigned char *data; 1406 unsigned char *data;
1369 break; 1449 break;
1370 } 1450 }
1371 break; 1451 break;
1372 1452
1373 case FocusIn: 1453 case FocusIn:
1374 if (!TermWin.focus) 1454 focus_in ();
1455 break;
1456
1457 case FocusOut:
1458 focus_out ();
1459 break;
1460
1461 case ConfigureNotify:
1462 if (ev.xconfigure.window == parent[0])
1375 { 1463 {
1376 TermWin.focus = 1;
1377 want_refresh = 1;
1378#ifdef USE_XIM
1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1382 XSetICFocus (Input_Context);
1383 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1395#endif
1396
1397 }
1398 break;
1399
1400 case FocusOut:
1401 if (TermWin.focus)
1402 {
1403 TermWin.focus = 0;
1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1412#ifdef USE_XIM
1413 if (Input_Context != NULL)
1414 XUnsetICFocus (Input_Context);
1415#endif
1416#ifdef CURSOR_BLINK
1417 if (options & Opt_cursorBlink)
1418 cursor_blink_ev.stop ();
1419 hidden_cursor = 0;
1420#endif
1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1428 }
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == TermWin.parent[0])
1433 {
1434 int height, width;
1435
1436 do
1437 { /* Wrap lots of configures into one */
1438 width = ev.xconfigure.width;
1439 height = ev.xconfigure.height;
1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1441 }
1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ;
1443 1466
1444 if (szHint.width != width || szHint.height != height) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1468 {
1446 seen_resize = 1; 1469 seen_resize = 1;
1447 resize_all_windows (width, height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1471 }
1449 1472
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1452 check_our_parents (); 1475 check_our_parents ();
1453#endif 1476#endif
1454 } 1477 }
1455 break; 1478 break;
1456 1479
1473 case SelectionRequest: 1496 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1475 break; 1498 break;
1476 1499
1477 case UnmapNotify: 1500 case UnmapNotify:
1478 TermWin.mapped = 0; 1501 mapped = 0;
1479#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1481#endif 1504#endif
1482 break; 1505 break;
1483 1506
1484 case MapNotify: 1507 case MapNotify:
1485 TermWin.mapped = 1; 1508 mapped = 1;
1486#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1511#endif
1489 break; 1512 break;
1490 1513
1494 break; 1517 break;
1495#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1496 1519
1497 case GraphicsExpose: 1520 case GraphicsExpose:
1498 case Expose: 1521 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1500 { 1523 {
1501 do 1524 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1528
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1530
1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1511 1534
1512 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1513 } 1536 }
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1553 menubar_expose ();
1531#endif 1554#endif
1532 1555
1533#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (disp, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1536#endif 1559#endif
1537 } 1560 }
1538 break; 1561 break;
1539 1562
1550 } 1573 }
1551#endif 1574#endif
1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1576 break;
1554 1577
1555 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1556 { 1579 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1581 {
1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1583 ;
1561 1584
1562 XQueryPointer (disp, TermWin.vt, 1585 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1565 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1566 &ev.xbutton.state); 1589 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
1579#endif 1602#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1582 1605
1583#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1609 {
1587 int dist; 1610 int dist;
1588 1611
1589 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1598 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1599 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1601 1624
1602 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1603 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1604 { 1627 {
1605 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1606 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1607 } 1630 }
1608 else 1631 else
1609 { 1632 {
1610 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1612 } 1635 }
1613 1636
1614 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1639 + 1;
1617 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1619 } 1642 }
1620 else 1643 else
1621 { 1644 {
1622 /* we are within the text window, so we 1645 /* we are within the text window, so we
1650 } 1673 }
1651 break; 1674 break;
1652 } 1675 }
1653} 1676}
1654 1677
1678void
1679rxvt_term::focus_in ()
1680{
1681 if (!focus)
1682 {
1683 focus = 1;
1684 want_refresh = 1;
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 {
1688 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context);
1690 }
1691#endif
1692#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1695#endif
1696#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade])
1698 {
1699 pix_colors = pix_colors_focused;
1700 scr_recolour ();
1701 }
1702#endif
1703 }
1704}
1705
1706void
1707rxvt_term::focus_out ()
1708{
1709 if (focus)
1710 {
1711 focus = 0;
1712 want_refresh = 1;
1713
1714#if ENABLE_FRILLS || ISO_14755
1715 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY
1718 scr_overlay_off ();
1719#endif
1720#if USE_XIM
1721 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context);
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.stop ();
1727 hidden_cursor = 0;
1728#endif
1729#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade])
1731 {
1732 pix_colors = pix_colors_unfocused;
1733 scr_recolour ();
1734 }
1735#endif
1736 }
1737}
1738
1655#if TRANSPARENT 1739#if TRANSPARENT
1656void 1740void
1657rxvt_term::rootwin_cb (XEvent &ev) 1741rxvt_term::rootwin_cb (XEvent &ev)
1658{ 1742{
1659 SET_R (this); 1743 SET_R (this);
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1671 return; 1755 return;
1672 1756
1673 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1674 case ReparentNotify: 1758 case ReparentNotify:
1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1676 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1677 break; 1761 break;
1678 } 1762 }
1679} 1763}
1680#endif 1764#endif
1689 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690 1774
1691 /* 1775 /*
1692 * VT window processing of button press 1776 * VT window processing of button press
1693 */ 1777 */
1694 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1695 { 1779 {
1696#if ISO_14755 1780#if ISO_14755
1697 // 5.4 1781 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 { 1783 {
1904 case Button3: 1988 case Button3:
1905 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1906 { 1990 {
1907 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1908# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1909 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1910# else 1994# else
1911 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1912# endif 1996# endif
1913 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1915 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1916# else 2000# else
1917 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1918# endif 2002# endif
1919 else 2003 else
1920 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1921 } 2005 }
1922 else 2006 else
1923 { 2007 {
1924 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1925 (TermWin.nrow 2009 (nrow
1926 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1927 / scrollbar_size ())); 2011 / scrollbar_size ()));
1928 } 2012 }
1929 2013
1930 break; 2014 break;
1962#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
1963 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
1965#endif 2049#endif
1966 2050
1967 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
1968 { 2052 {
1969#if ISO_14755 2053#if ISO_14755
1970 // 5.4 2054 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return; 2056 return;
2022 2106
2023 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2024 2108
2025 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2026 i = 1; 2110 i = 1;
2027 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2028 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2029 else 2113 else
2030 i = 5; 2114 i = 5;
2031 2115
2032# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2033 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2034 { 2118 {
2035 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2036 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2037 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2038 2122
2039 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041 2125
2042 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
2318 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2319 dDisp; 2403 dDisp;
2320 2404
2321 pchanged = 0; 2405 pchanged = 0;
2322 2406
2323 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2324 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2325 2409
2326 XGetWindowAttributes (disp, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2327 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2328 2412
2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2330 2414
2331 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2332 { 2416 {
2333 if (am_transparent) 2417 if (am_transparent)
2334 { 2418 {
2335 pchanged = 1; 2419 pchanged = 1;
2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2337 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2338 } 2422 }
2339 2423
2340 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2341 } 2425 }
2382 Window cr; 2466 Window cr;
2383 XImage *image; 2467 XImage *image;
2384 GC gc; 2468 GC gc;
2385 XGCValues gcvalue; 2469 XGCValues gcvalue;
2386 2470
2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2388 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2389 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2390 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2391 nx = ny = 0; 2475 nx = ny = 0;
2392 2476
2402 nh += sy; 2486 nh += sy;
2403 ny = -sy; 2487 ny = -sy;
2404 sy = 0; 2488 sy = 0;
2405 } 2489 }
2406 2490
2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2409 2493
2410 XSync (disp, False); 2494 XSync (disp, False);
2411 allowedxerror = -1; 2495 allowedxerror = -1;
2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2413 2497
2418 if (image == NULL) 2502 if (image == NULL)
2419 { 2503 {
2420 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2421 { 2505 {
2422 pchanged = 1; 2506 pchanged = 1;
2423 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2424 { 2508 {
2425 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2426 TermWin.pixmap = None; 2510 pixmap = None;
2427 } 2511 }
2428 } 2512 }
2429 2513
2430 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2431 } 2515 }
2432 else 2516 else
2433 { 2517 {
2434 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2435 XFreePixmap (disp, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2436 2520
2437#if TINTING 2521#if TINTING
2438 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2439 { 2523 {
2440 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
2444 2528
2445 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2446 } 2530 }
2447#endif 2531#endif
2448 2532
2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2450 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2453 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2454 XFreeGC (disp, gc); 2538 XFreeGC (disp, gc);
2455 XDestroyImage (image); 2539 XDestroyImage (image);
2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2457 XClearWindow (disp, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2458 2542
2459 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2460 pchanged = 1; 2544 pchanged = 1;
2461 2545
2462 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2463 } 2547 }
2464 } 2548 }
2465 2549
2466 if (am_pixmap_trans) 2550 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2468 else 2552 else
2469 { 2553 {
2470 unsigned int n; 2554 unsigned int n;
2471 /* 2555 /*
2472 * InheritPixmap transparency 2556 * InheritPixmap transparency
2473 */ 2557 */
2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2475 { 2559 {
2476 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2477 XQueryTree (disp, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2478 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2479 XFree (list); 2563 XFree (list);
2480 2564
2481 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2482 { 2566 {
2483 if (oldp != None) 2567 if (oldp != None)
2484 pchanged = 1; 2568 pchanged = 1;
2485 2569
2486 break; 2570 break;
2487 } 2571 }
2488 2572
2489 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2490 pchanged = 1; 2574 pchanged = 1;
2491 } 2575 }
2492 2576
2493 n = 0; 2577 n = 0;
2494 2578
2495 if (pchanged) 2579 if (pchanged)
2496 { 2580 {
2497 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2498 { 2582 {
2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2501 { 2585 {
2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2503 break; 2587 break;
2504 } 2588 }
2505 } 2589 }
2506 } 2590 }
2507 2591
2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2509 { 2593 {
2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = 0; 2596 am_transparent = 0;
2513 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2514 } 2598 }
2515 else 2599 else
2516 { 2600 {
2519 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2520 sleep (1); 2604 sleep (1);
2521#endif 2605#endif
2522 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2523 { 2607 {
2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2525 XClearWindow (disp, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2526 } 2610 }
2527 2611
2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2529 am_transparent = 1; 2613 am_transparent = 1;
2530 } 2614 }
2531 2615
2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2533 TermWin.parent[i] = None; 2617 parent[i] = None;
2534 } 2618 }
2535 2619
2536 if (scrollBar.win) 2620 if (scrollBar.win)
2537 { 2621 {
2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2581 // some window managers resize the window early, and these programs 2665 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2666 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2667 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2668 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2669 // resized.
2586 if (seen_resize) 2670 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2671 kill (-cmd_pid, SIGWINCH);
2588 } 2672 }
2589 2673
2590 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2676 bool refreshnow = false;
2593 int nlines = 0; 2677 int nlines = 0;
2594 unicode_t *str = buf; 2678 unicode_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2595 2680
2596 for (;;) 2681 for (;;)
2597 { 2682 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2684 break;
2600 2685
2601 *str++ = ch; 2686 *str++ = ch;
2602 2687
2603 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2604 { 2689 {
2690 if (ch == C0_LF)
2605 nlines++; 2691 nlines++;
2692
2606 refresh_count++; 2693 refresh_count++;
2607 2694
2608 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2697 {
2611 refreshnow = true; 2698 refreshnow = true;
2699 refresh_count = 0;
2612 ch = NOCHAR; 2700 ch = NOCHAR;
2613 break; 2701 break;
2614 } 2702 }
2615 2703
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2618 { 2706 {
2619 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2620 nlines = 0; 2708 nlines = 0;
2621 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2622 } 2711 }
2623 }
2624 2712
2625 if (str >= buf + UBUFSIZ) 2713 if (str >= eol)
2626 { 2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2627 ch = NOCHAR; 2717 ch = NOCHAR;
2628 break; 2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2629 } 2724 }
2630 2725
2631 seq_begin = cmdbuf_ptr; 2726 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2727 ch = next_char ();
2633 } 2728 }
2640 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2737 */
2643 if (refreshnow) 2738 if (refreshnow)
2644 { 2739 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2741 refresh_limit++;
2647 else 2742 else
2648 { 2743 {
2649 flag = true; 2744 flag = true;
2650 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
2746 flush_ev.stop ();
2651 } 2747 }
2652 } 2748 }
2653 2749
2654 } 2750 }
2655 else 2751 else
3177 { 3273 {
3178 switch (priv) 3274 switch (priv)
3179 { 3275 {
3180 case '>': 3276 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3277 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3278 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3279 break;
3184 case '?': 3280 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3281 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3282 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3283 break;
3292 3388
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3389 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3390 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3391 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3394 break;
3299 3395
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3397 tt_write ((const unsigned char *)VT100_ANS,
3302 (unsigned int) (sizeof (VT100_ANS) - 1)); 3398 (unsigned int) (sizeof (VT100_ANS) - 1));
3314 break; 3410 break;
3315 case 6: /* CPR requested */ 3411 case 6: /* CPR requested */
3316 scr_report_position (); 3412 scr_report_position ();
3317 break; 3413 break;
3318 case 7: /* unofficial extension */ 3414 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3415 if (OPTION (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3416 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3417 break;
3322 case 8: /* unofficial extension */ 3418 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3419 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3420 break;
3427 { 3523 {
3428 /* 3524 /*
3429 * commands 3525 * commands
3430 */ 3526 */
3431 case 1: /* deiconify window */ 3527 case 1: /* deiconify window */
3432 XMapWindow (disp, TermWin.parent[0]); 3528 XMapWindow (disp, parent[0]);
3433 break; 3529 break;
3434 case 2: /* iconify window */ 3530 case 2: /* iconify window */
3435 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3531 XIconifyWindow (disp, parent[0], display->screen);
3436 break; 3532 break;
3437 case 3: /* set position (pixels) */ 3533 case 3: /* set position (pixels) */
3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3534 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3535 break;
3440 case 4: /* set size (pixels) */ 3536 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3537 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3538 break;
3443 case 5: /* raise window */ 3539 case 5: /* raise window */
3444 XRaiseWindow (disp, TermWin.parent[0]); 3540 XRaiseWindow (disp, parent[0]);
3445 break; 3541 break;
3446 case 6: /* lower window */ 3542 case 6: /* lower window */
3447 XLowerWindow (disp, TermWin.parent[0]); 3543 XLowerWindow (disp, parent[0]);
3448 break; 3544 break;
3449 case 7: /* refresh window */ 3545 case 7: /* refresh window */
3450 scr_touch (true); 3546 scr_touch (true);
3451 break; 3547 break;
3452 case 8: /* set size (chars) */ 3548 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3549 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3550 (unsigned int) (args[1] * fheight));
3455 break; 3551 break;
3456 3552
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3553 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3554 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3555 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3556 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3557 (unsigned int) (args[1] * fheight));
3462 break; 3558 break;
3463 3559
3464 3560
3465 /* 3561 /*
3466 * reports - some output format copied from XTerm 3562 * reports - some output format copied from XTerm
3467 */ 3563 */
3468 case 11: /* report window state */ 3564 case 11: /* report window state */
3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3565 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3566 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3567 break;
3472 case 13: /* report window position */ 3568 case 13: /* report window position */
3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3570 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3571 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3572 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3573 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3574 break;
3479 case 14: /* report window size (pixels) */ 3575 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3576 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3577 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3578 break;
3483 case 18: /* report text area size (chars) */ 3579 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3580 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3581 break;
3486 case 19: /* report window size (chars) */ 3582 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3583 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3584 break;
3489 case 20: /* report icon label */ 3585 case 20: /* report icon label */
3490 { 3586 {
3491 char *s; 3587 char *s;
3492 XGetIconName (disp, TermWin.parent[0], &s); 3588 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3589 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3590 XFree (s);
3495 } 3591 }
3496 break; 3592 break;
3497 case 21: /* report window title */ 3593 case 21: /* report window title */
3498 { 3594 {
3499 char *s; 3595 char *s;
3500 XFetchName (disp, TermWin.parent[0], &s); 3596 XFetchName (disp, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3597 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3598 XFree (s);
3503 } 3599 }
3504 break; 3600 break;
3505 } 3601 }
3506} 3602}
3538 else if (ch < 0x20) 3634 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3635 return NULL; /* other control character - exit */
3540 3636
3541 seen_esc = false; 3637 seen_esc = false;
3542 3638
3543 if (n >= sizeof (string) - 1) 3639 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3640 // stop at some sane length
3545 return NULL; 3641 return NULL;
3546 3642
3547 if (ch == C0_SYN) 3643 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3644 string[n++] = cmd_get8 ();
3616 set_window_color (color, str); 3712 set_window_color (color, str);
3617} 3713}
3618 3714
3619/* 3715/*
3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3716 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3621 * 0 = change iconName/title
3622 * 1 = change iconName
3623 * 2 = change title
3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
3627 * 12 = change text color
3628 * 13 = change mouse foreground color
3629 * 17 = change highlight character colour
3630 * 18 = change bold character color
3631 * 19 = change underlined character color
3632 * 46 = change logfile (not implemented)
3633 * 50 = change font
3634 *
3635 * rxvt extensions:
3636 * 20 = bg pixmap
3637 * 39 = change default fg color
3638 * 49 = change default bg color
3639 * 55 = dump scrollback buffer and all of screen
3640 * 701 = change locale
3641 * 702 = find font
3642 * 703 = menu
3643 */ 3717 */
3644void 3718void
3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3719rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3646{ 3720{
3647 int changed = 0; 3721 int changed = 0;
3673 unsigned long bytes_after; 3747 unsigned long bytes_after;
3674 unsigned char *value = 0; 3748 unsigned char *value = 0;
3675 const char *str = ""; 3749 const char *str = "";
3676 3750
3677 if (prop 3751 if (prop
3678 && XGetWindowProperty (disp, TermWin.parent[0], 3752 && XGetWindowProperty (disp, parent[0],
3679 prop, 0, 1<<16, 0, AnyPropertyType, 3753 prop, 0, 1<<16, 0, AnyPropertyType,
3680 &actual_type, &actual_format, 3754 &actual_type, &actual_format,
3681 &nitems, &bytes_after, &value) == Success 3755 &nitems, &bytes_after, &value) == Success
3682 && actual_type != None 3756 && actual_type != None
3683 && actual_format == 8) 3757 && actual_format == 8)
3695 { 3769 {
3696 *eq = 0; 3770 *eq = 0;
3697 set_utf8_property (display->atom (str), eq + 1); 3771 set_utf8_property (display->atom (str), eq + 1);
3698 } 3772 }
3699 else 3773 else
3700 XDeleteProperty (disp, TermWin.parent[0], 3774 XDeleteProperty (disp, parent[0],
3701 display->atom (str)); 3775 display->atom (str));
3702 } 3776 }
3703 break; 3777 break;
3704 3778
3705 case XTerm_Color: 3779 case XTerm_Color:
3746 break; 3820 break;
3747#ifndef NO_BOLD_UNDERLINE_REVERSE 3821#ifndef NO_BOLD_UNDERLINE_REVERSE
3748 case XTerm_Color_BD: 3822 case XTerm_Color_BD:
3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3823 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break; 3824 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3754 case XTerm_Color_UL: 3825 case XTerm_Color_UL:
3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3826 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756 break; 3827 break;
3757 case XTerm_Color_RV: 3828 case XTerm_Color_RV:
3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3829 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break; 3830 break;
3831 case URxvt_Color_IT:
3832 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3833 break;
3760#endif 3834#endif
3761#if TRANSPARENT && TINTING 3835#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint: 3836 case URxvt_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3837 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764 check_our_parents (); 3838 check_our_parents ();
3765 if (am_transparent) 3839 if (am_transparent)
3766 want_full_refresh = want_refresh = 1; 3840 want_full_refresh = want_refresh = 1;
3767 break; 3841 break;
3768#endif 3842#endif
3802 3876
3803 case XTerm_logfile: 3877 case XTerm_logfile:
3804 // TODO, when secure mode? 3878 // TODO, when secure mode?
3805 break; 3879 break;
3806 3880
3881#ifdef MENUBAR
3882 case URxvt_Menu:
3883 if (OPTION (Opt_insecure))
3884 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3885 break;
3886#endif
3887#if 0
3888 case XTerm_dumpscreen: /* no error notices */
3889 {
3890 int fd;
3891 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3892 {
3893 scr_dump (fd);
3894 close (fd);
3895 }
3896 }
3897 break;
3898#endif
3807 case XTerm_font: 3899 case XTerm_font:
3808 op = URxvt_font; 3900 op = URxvt_font;
3809 case URxvt_font: 3901 case URxvt_font:
3810#if ENABLE_STYLES 3902#if ENABLE_STYLES
3811 case URxvt_boldFont: 3903 case URxvt_boldFont:
3812 case URxvt_italicFont: 3904 case URxvt_italicFont:
3813 case URxvt_boldItalicFont: 3905 case URxvt_boldItalicFont:
3814#endif 3906#endif
3815 if (query) 3907 if (query)
3816 tt_printf ("\33]%d;%-.250s%c", saveop, 3908 tt_printf ("\33]%d;%-.250s%c", saveop,
3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3909 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3910 ? fontset[op - URxvt_font]->fontdesc : "",
3819 resp); 3911 resp);
3820 else 3912 else
3821 { 3913 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3914 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823 3915
3826 set_fonts (); 3918 set_fonts ();
3827 } 3919 }
3828 break; 3920 break;
3829 3921
3830#if ENABLE_FRILLS 3922#if ENABLE_FRILLS
3831 case XTerm_locale: 3923 case URxvt_locale:
3832 if (query) 3924 if (query)
3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3925 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3834 else 3926 else
3835 { 3927 {
3836 set_locale (str); 3928 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8); 3929 pty.set_utf8_mode (enc_utf8);
3838# ifdef USE_XIM
3839 im_cb (); 3930 init_xlocale ();
3840# endif
3841 } 3931 }
3842 break; 3932 break;
3843#endif
3844 3933
3845#ifdef MENUBAR 3934 case URxvt_view_up:
3846 case XTerm_Menu: 3935 case URxvt_view_down:
3847 if (options & Opt_insecure) 3936 int lines = atoi (str);
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3937
3849 break; 3938 if (lines)
3850#endif 3939 scr_page (op == URxvt_view_up ? UP : DN, lines);
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 { 3940 else
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3941 {
3857 scr_dump (fd); 3942 scr_erase_savelines ();
3858 close (fd);
3859 } 3943 }
3860 } 3944
3861 break; 3945 break;
3862#endif 3946#endif
3863 } 3947 }
3864} 3948}
3865/*----------------------------------------------------------------------*/ 3949/*----------------------------------------------------------------------*/
3974 } 4058 }
3975 4059
3976 /* extra handling for values with state unkept */ 4060 /* extra handling for values with state unkept */
3977 switch (arg[i]) 4061 switch (arg[i])
3978 { 4062 {
4063#if ENABLE_STYLES
4064 case 1021:
4065 if (mode)
4066 SET_OPTION (Opt_intensityStyles);
4067 else
4068 CLR_OPTION (Opt_intensityStyles);
4069
4070 scr_touch (true);
4071 break;
4072#endif
3979 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
3980 case 1049: 4074 case 1049:
3981 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
3982 if (mode == 0) 4076 if (mode == 0)
3983 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
3984 else if (mode == 1) 4078 else if (mode == 1)
3985 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
3986 break; 4080 break;
3998 */ 4092 */
3999 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
4000 break; 4094 break;
4001 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4002 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4004 break; 4098 break;
4005 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4006 if (state) 4100 if (!state)
4007 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4008 else 4102 else
4009 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4010 break; 4104 break;
4011 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4012 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4013 break; 4107 break;
4014 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
4055#if 0 4149#if 0
4056 case 1001: 4150 case 1001:
4057 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4058#endif 4152#endif
4059 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4060 if (state) 4154 if (!state)
4061 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4062 else 4156 else
4063 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4064 break; 4158 break;
4065 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4066 if (state) 4160 if (state)
4067 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4068 else 4162 else
4069 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4070 break; 4164 break;
4071 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4072 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4073 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4074 scr_erase_screen (2); 4168 scr_erase_screen (2);
4075 scr_change_screen (state); 4169 scr_change_screen (state);
4076 break; 4170 break;
4077 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4078 scr_change_screen (state); 4172 scr_change_screen (state);
4079 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4080 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4081 scr_erase_screen (2); 4175 scr_erase_screen (2);
4082 break; 4176 break;
4083 default: 4177 default:
4084 break; 4178 break;
4234 case 106: 4328 case 106:
4235 case 107: 4329 case 107:
4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4237 break; 4331 break;
4238#endif 4332#endif
4239
4240 } 4333 }
4241 } 4334 }
4242} 4335}
4243/*}}} */ 4336/*}}} */
4244 4337
4325 } 4418 }
4326 4419
4327 memmove (v_buffer, v_buffer + written, v_buflen); 4420 memmove (v_buffer, v_buffer + written, v_buflen);
4328 } 4421 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this... 4423 pty_ev.set (EVENT_READ);
4331 destroy ();
4332} 4424}
4333 4425
4334/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4335 4427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines