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