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

Diff Legend

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