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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2006 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755
73
74#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
77#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
78#define ISO_14755_MASK 0x0fffffffUL
79
80#if ISO_14755
81static unsigned short iso14755_symtab[] = {
82 // keysym, unicode
83 XK_Left, 0x2190,
84 XK_KP_Left, 0x2190,
85 XK_Up, 0x2191,
86 XK_KP_Up, 0x2191,
87 XK_Right, 0x2192,
88 XK_KP_Right, 0x2192,
89 XK_Down, 0x2193,
90 XK_KP_Down, 0x2193,
91 XK_Linefeed, 0x21b4,
92 XK_Return, 0x21b5,
93 XK_KP_Enter, 0x21b5,
94
95 XK_Prior, 0x21de,
96 XK_Next, 0x21df,
97 XK_Tab, 0x21e5,
98 XK_ISO_Left_Tab, 0x21e6,
99 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7,
101
102 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0,
110 XK_Home, 0x21f1,
111 XK_End, 0x21f2,
112
113 XK_Execute, 0x2318,
114 XK_Begin, 0x2320,
115 XK_Delete, 0x2326,
116 XK_Clear, 0x2327,
117 XK_BackSpace, 0x232b,
118 XK_Insert, 0x2380,
119 XK_Control_L, 0x2388,
120 XK_Control_R, 0x2388,
121 XK_Pause, 0x2389,
122 XK_Break, 0x238a,
123 XK_Escape, 0x238b,
124 XK_Undo, 0x238c,
125 XK_Print, 0x2399,
126
127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
135 XK_KP_Space, 0x2422,
136#endif
137 0,
138};
139
140void
141rxvt_term::iso14755_54 (int x, int y)
142{
143 x = Pixel2Col (x);
144 y = Pixel2Row (y);
145
146 if (!IN_RANGE_EXC (x, 0, ncol)
147 || !IN_RANGE_EXC (y, 0, nrow))
148 return;
149
150 for (;;)
151 {
152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
155
156 if (t != NOCHAR || !x)
157 {
158 iso14755_51 (l.t[x], l.r[x], x, y);
159 iso14755buf = ISO_14755_54;
160 break;
161 }
162
163 x--;
164 }
165}
166
167void
168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname;
173 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176
177# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch))
179 {
180 len = rxvt_composite.expand (ch, 0);
181 alloc = chr = new wchar_t[len];
182 rxvt_composite.expand (ch, chr);
183 }
184 else
185# endif
186 {
187 ch2 = ch;
188
189 alloc = 0;
190 chr = &ch2;
191 len = 1;
192 }
193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220
221 for (int y = 0; y < len; y++)
222 {
223 char buf[9];
224
225 ch = *chr++;
226
227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '=');
230# if !UNICODE3
231 if (ch >= 0x10000)
232 ch = 0xfffd;
233# endif
234 scr_overlay_set (11, y, ch, r);
235 scr_overlay_set (12, y, NOCHAR, r);
236 }
237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
243# if ENABLE_COMBINING
244 if (alloc)
245 delete [] alloc;
246# endif
247}
248#endif
249
250void
251rxvt_term::commit_iso14755 ()
252{
253 wchar_t ch[2];
254
255 ch[0] = iso14755buf & ISO_14755_MASK;
256 ch[1] = 0;
257
258 if (iso14755buf & ISO_14755_51)
259 {
260 char mb[16];
261 int len;
262
263 // allow verbatim 0-bytes and control-bytes to be entered
264 if (ch[0] >= 0x20)
265 len = wcstombs (mb, ch, 16);
266 else
267 {
268 mb[0] = ch[0];
269 len = 1;
270 }
271
272 if (len > 0)
273 tt_write (mb, len);
274 else
275 scr_bell ();
276 }
277
278 iso14755buf = 0;
279}
280
281int
282rxvt_term::hex_keyval (XKeyEvent &ev)
283{
284 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++)
287 {
288 KeySym k = XLookupKeysym (&ev, index);
289
290 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
291 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
292 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
293 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
294 }
295
296 return -1;
297}
298#endif
56 299
57/*{{{ Convert the keypress event into a string */ 300/*{{{ Convert the keypress event into a string */
58void 301void
59rxvt_term::lookup_key (XKeyEvent &ev) 302rxvt_term::lookup_key (XKeyEvent &ev)
60{ 303{
… …
63 KeySym keysym; 306 KeySym keysym;
64#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
66#endif 309#endif
67 int valid_keysym; 310 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
69 312
70 /* 313 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
73 * 316 *
74 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
75 */ 318 */
76 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
79 322
80 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
81 { 324 {
82 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 331#ifdef USE_XIM
89 if (Input_Context) 332 if (Input_Context)
90 { 333 {
91 Status status_return; 334 Status status_return;
92 335
336#if 0
93#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
97 else 341 else
342#endif
98#endif 343#endif
99 { 344 {
100 wchar_t wkbuf[KBUFSZ + 1]; 345 wchar_t wkbuf[KBUFSZ + 1];
101 346
102 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
106 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
109 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 357 SET_LOCALE (locale);
111 358
112 if (status_return == XLookupChars 359 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
134 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
135 } 382 }
136 else 383 else
137#endif 384#endif
138 { 385 {
139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
140 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
141 } 388 }
142 389
143 if (valid_keysym) 390 if (valid_keysym)
144 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
145 if (TermWin.saveLines) 397 if (saveLines)
146 { 398 {
147#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 400 if (!ctrl && !meta)
149 {
150#else 401#else
151 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
403#endif
152 { 404 {
153#endif
154 int lnsppg; 405 int lnsppg;
155 406
156#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
158#else 409#else
159 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
160#endif 411#endif
161 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
162 { 413 {
163 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
164 return; 415 return;
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 459 {
209 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
211 } 462 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 464 {
214 switch (keysym) 465 switch (keysym)
215 { 466 {
216 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
219 return; 470 return;
471#if TODO
220 /* rxvt extras */ 472 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 474 change_font (FONT_UP);
223 return; 475 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 477 change_font (FONT_DN);
226 return; 478 return;
479#endif
227 } 480 }
228 } 481 }
229 } 482 }
230#ifdef PRINTPIPE 483
231 if (keysym == XK_Print) 484#if ENABLE_FRILLS || ISO_14755
232 { 485 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 486 if (shft && ctrl)
234 return;
235 } 487 {
236#endif 488 int hv;
237 489
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (iso14755buf & ISO_14755_51
239 { 491 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 492 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 493 {
243 unsigned int l; 494 commit_iso14755 ();
244 const unsigned char *kbuf0; 495 iso14755buf = ISO_14755_51;
245 496# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 497 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 498# endif
254 ) 499 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 500 }
259 501 else if ((hv = hex_keyval (ev)) >= 0)
260 tt_write (kbuf0, l); 502 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51;
505# if ISO_14755
506 iso14755_51 (iso14755buf & ISO_14755_MASK);
507# endif
261 return; 508 return;
262 } 509 }
263 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
264#endif 514# endif
515 iso14755buf = 0;
516 }
517 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
522 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif
527 }
528#endif
529
530#ifdef PRINTPIPE
531 if (keysym == XK_Print)
532 {
533 scr_printscreen (ctrl | shft);
534 return;
535 }
536#endif
537
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 {
265 { 540 {
266 newlen = 1; 541 newlen = 1;
267 switch (keysym) 542 switch (keysym)
268 { 543 {
269#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 545 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
272 { 547 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
276 } 551 }
277 else 552 else
278 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
279 break; 554 break;
280#endif 555#endif
281#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
282 case XK_Delete: 567 case XK_Delete:
283 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
284 break; 569 break;
285#endif 570#endif
286 case XK_Tab: 571 case XK_Tab:
287 if (shft) 572 if (shft)
288 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
289 else 574 else
290 { 575 {
291#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 577 if (ctrl)
293 meta = 1; 578 meta = 1;
… …
299 newlen = 0; 584 newlen = 0;
300 } 585 }
301 break; 586 break;
302 587
303#ifdef XK_KP_Left 588#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
309 { 594 {
310 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 597 break;
313 } 598 }
314 else 599 else
315 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
318#endif 603#endif
319 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 610 /* do Shift first */
326 if (shft) 611 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 613 else if (ctrl)
329 { 614 {
330 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 617 }
333 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
335 break; 620 break;
336 621
337#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
339 case XK_KP_Prior: 624 case XK_KP_Prior:
340 /* allow shift to override */ 625 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
342 { 627 {
343 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
344 break; 629 break;
345 } 630 }
346 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
347# endif 632# endif
348 case XK_Prior: 633 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
350 break; 635 break;
351# ifdef XK_KP_Next 636# ifdef XK_KP_Next
352 case XK_KP_Next: 637 case XK_KP_Next:
353 /* allow shift to override */ 638 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
355 { 640 {
356 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
357 break; 642 break;
358 } 643 }
359 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
360# endif 645# endif
361 case XK_Next: 646 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
363 break; 648 break;
364#endif 649#endif
365 case XK_KP_Enter: 650 case XK_KP_Enter:
366 /* allow shift to override */ 651 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
368 { 653 {
369 STRCPY (kbuf, "\033OM"); 654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
370 } 666 }
371 else 667 else
372 { 668 {
373 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
375 } 671 }
376 break; 672 break;
377 673
378#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
379 case XK_KP_Begin: 675 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
381 break; 677 break;
382 678
383 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op");
385 break;
386
387 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On");
389 break;
390#endif 679#endif
391 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
397 break; 686 break;
398 687
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 704 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
417 { 706 {
418 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 709 }
421 else 710 else
422 { 711 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
425 } 714 }
426 break; 715 break;
427 716
428 case XK_Find: 717 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
430 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
431 case XK_Insert: 731 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
433 break; 733 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 735 case DXK_Remove:
436 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
437#endif 737#endif
438 case XK_Execute: 738 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
440 break; 740 break;
441 case XK_Select: 741 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
443 break; 743 break;
444#ifdef XK_KP_End 744#ifdef XK_KP_End
445 case XK_KP_End: 745 case XK_KP_End:
446 /* allow shift to override */ 746 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
448 { 748 {
449 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
450 break; 750 break;
451 } 751 }
452 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
453#endif 753#endif
454 case XK_End: 754 case XK_End:
455 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
456 break; 756 break;
457#ifdef XK_KP_Home 757#ifdef XK_KP_Home
458 case XK_KP_Home: 758 case XK_KP_Home:
459 /* allow shift to override */ 759 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
461 { 761 {
462 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
463 break; 763 break;
464 } 764 }
465 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
466#endif 766#endif
467 case XK_Home: 767 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
469 break; 769 break;
470 770
471#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 773
… …
525#undef FKEY 825#undef FKEY
526 default: 826 default:
527 newlen = 0; 827 newlen = 0;
528 break; 828 break;
529 } 829 }
830
530 if (newlen) 831 if (newlen)
531 len = STRLEN (kbuf); 832 len = strlen (kbuf);
532 } 833 }
533 834
534 /* 835 /*
535 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
536 */ 837 */
… …
543 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
544 { 845 {
545 len = 1; 846 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
548 else 854 else
549 { 855 {
550#ifdef META8_OPTION 856#ifdef META8_OPTION
551 /* set 8-bit on */ 857 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
553 { 859 {
554 unsigned char *ch; 860 char *ch;
555 861
556 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
557 *ch |= 0x80; 863 *ch |= 0x80;
558 864
559 meta = 0; 865 meta = 0;
… …
561#endif 867#endif
562 /* nil */ ; 868 /* nil */ ;
563 } 869 }
564 } 870 }
565 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
566 if (len <= 0) 875 if (len <= 0)
567 return; /* not mapped */ 876 return; /* not mapped */
568 877
569 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
570 if (TermWin.view_start) 879 if (view_start)
571 { 880 {
572 TermWin.view_start = 0; 881 view_start = 0;
573 want_refresh = 1; 882 want_refresh = 1;
574 } 883 }
575 884
576 /* 885 /*
577 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
592#ifdef META8_OPTION 901#ifdef META8_OPTION
593 && meta_char == C0_ESC 902 && meta_char == C0_ESC
594#endif 903#endif
595 ) 904 )
596 { 905 {
597 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
598 tt_write (&ch, 1); 907 tt_write (&ch, 1);
599 } 908 }
600 909
601#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
602 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
610#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
611 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
612} 921}
613/*}}} */ 922/*}}} */
614 923
615#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
618unsigned int 927unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
620{ 929{
621 unsigned int n, s; 930 unsigned int n, s;
622 931
623 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 934
626 if (n > 0 && s < count) 935 if (n > 0 && s < count)
627 { 936 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 937 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 939 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 940 cmdbuf_endp -= n;
632 s += n; 941 s += n;
633 } 942 }
634 943
635 if (count > s) 944 if (count > s)
636 { 945 {
637 rxvt_print_error ("data loss: cmd_write too large"); 946 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 947 count = s;
639 } 948 }
640 949
641 for (; count--;) 950 for (; count--;)
642 *cmdbuf_endp++ = *str++; 951 *cmdbuf_endp++ = *str++;
643 952
644 cmd_parse (); 953 cmd_parse ();
645 954
646 return 0; 955 return 0;
647} 956}
648#endif /* MENUBAR_MAX */ 957#endif
649 958
650void 959void
651rxvt_term::flush () 960rxvt_term::flush ()
652{ 961{
962 flush_ev.stop ();
963
653#ifdef TRANSPARENT 964#ifdef TRANSPARENT
654 if (want_full_refresh) 965 if (want_full_refresh)
655 { 966 {
656 want_full_refresh = 0; 967 want_full_refresh = 0;
657 scr_clear (); 968 scr_clear ();
658 scr_touch (false); 969 scr_touch (false);
659 want_refresh = 1;
660 } 970 }
661#endif 971#endif
662 972
663 if (want_refresh) 973 if (want_refresh)
664 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
665 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
666 scrollbar_show (1); 1015 scrollbar_show (1);
667#ifdef USE_XIM 1016#ifdef USE_XIM
668 IMSendSpot (); 1017 IMSendSpot ();
669#endif 1018#endif
670
671 } 1019 }
672 1020
673 display->flush (); 1021 display->flush ();
674} 1022}
675 1023
… …
677rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
678{ 1026{
679 SET_R (this); 1027 SET_R (this);
680 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
681 1029
1030 display->flush ();
1031
1032 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034}
1035
1036void
1037rxvt_term::flush_cb (time_watcher &w)
1038{
1039 SET_R (this);
1040 SET_LOCALE (locale);
1041
1042 refresh_limit = 1;
1043 refresh_count = 0;
682 flush (); 1044 flush ();
683} 1045}
684 1046
685#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
686void 1048void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 1067 }
706} 1068}
707#endif 1069#endif
708 1070
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void
1073rxvt_term::cont_scroll_cb (time_watcher &w)
1074{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 }
1082}
1083#endif
1084
1085#ifdef SELECTION_SCROLLING
1086void
1087rxvt_term::sel_scroll_cb (time_watcher &w)
1088{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 }
1096}
1097#endif
1098
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void
1101rxvt_term::slip_wheel_cb (time_watcher &w)
1102{
1103 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed))
1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 }
1115}
1116#endif
1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
709bool 1136bool
710rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
711{ 1138{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1140
1141 if (CBUFSIZ == n)
1142 {
1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1144 n = 0;
1145 }
713 1146
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
717 1150
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
719 1152
720 if (n > 0) 1153 if (r > 0)
721 { 1154 {
722 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
723 return true; 1156 return true;
724 } 1157 }
725 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
726 destroy (); 1170 destroy ();
1171 }
727 1172
728 return false; 1173 return false;
729} 1174}
730 1175
731void 1176void
732rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1178{
734 SET_R (this); 1179 SET_R (this);
735 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
736 1181
1182 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ())
1185 if (cmd_parse ())
1186 break;
1187
737 if (revents & EVENT_WRITE) 1188 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1189 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1190}
759 1191
760bool 1192void
761rxvt_term::cmd_parse () 1193rxvt_term::pointer_unblank ()
762{ 1194{
763 bool flag = false; 1195 XDefineCursor (display->display, vt, TermWin_cursor);
764 uint32_t ch = NOCHAR; 1196 recolour_cursor ();
765 1197
766 for (;;) 1198#ifdef POINTER_BLANK
767 { 1199 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1200
771 if (ch == NOCHAR) // TODO: improve 1201 if (OPTION (Opt_pointerBlank))
772 break; 1202 pointer_ev.start (NOW + pointerBlankDelay);
773 1203#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868uint32_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1204}
920 1205
921#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
922void 1207void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
936{ 1209{
937 if (! (Options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
938 return; 1211 return;
939 1212
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
941 XFlush (display->display); 1214 XFlush (display->display);
942 1215
943 hidden_pointer = 1; 1216 hidden_pointer = 1;
944} 1217}
945 1218
… …
962 x = ev.x; 1235 x = ev.x;
963 y = ev.y; 1236 y = ev.y;
964 pixel_position (&x, &y); 1237 pixel_position (&x, &y);
965 1238
966 if (MEvent.button == AnyButton) 1239 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1240 button_number = 3;
969 }
970 else 1241 else
971 { 1242 {
972 button_number = MEvent.button - Button1; 1243 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1244 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1245 if (button_number >= 3)
975 button_number += (64 - 3); 1246 button_number += (64 - 3);
976 } 1247 }
977 1248
978 if (PrivateModes & PrivMode_MouseX10) 1249 if (priv_modes & PrivMode_MouseX10)
979 { 1250 {
980 /* 1251 /*
981 * do not report ButtonRelease 1252 * do not report ButtonRelease
982 * no state info allowed 1253 * no state info allowed
983 */ 1254 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1273#endif
1003
1004 } 1274 }
1005 1275
1006#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1278 if (key_state & 16)
1009 fputc ('C', stderr); 1279 fputc ('C', stderr);
1010 if (key_state & 4) 1280 if (key_state & 4)
1011 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1285 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1287 button_number,
1018 x + 1, 1288 x + 1,
1019 y + 1); 1289 y + 1);
1020#else 1290#endif
1291
1021 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
1023 (32 + x + 1), 1294 (32 + x + 1),
1024 (32 + y + 1)); 1295 (32 + y + 1));
1025#endif
1026} 1296}
1027 1297
1028#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
1029void 1299void
1030rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
1037 1307
1038/*{{{ process an X event */ 1308/*{{{ process an X event */
1039void 1309void
1040rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
1041{ 1311{
1312 dDisp;
1313
1042 SET_R (this); 1314 SET_R (this);
1043 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1044 1316
1045#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1047 {
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 }
1056#endif
1057
1058#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 {
1061 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease)
1064 if (hidden_pointer)
1065 pointer_unblank ();
1066
1067 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank ();
1069 }
1070#endif
1071
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1077 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1319 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1128#endif
1129 1320
1130 switch (ev.type) 1321 switch (ev.type)
1131 { 1322 {
1132 case KeyPress: 1323 case KeyPress:
1324#if ISO_14755
1325 if (!(iso14755buf & ISO_14755_52))
1326#endif
1133 lookup_key (ev.xkey); 1327 lookup_key (ev.xkey);
1328
1329 break;
1330
1331 case KeyRelease:
1332 {
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1334 KeySym ks;
1335
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif
1338
1339#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support
1341 if (iso14755buf)
1342 if (iso14755buf & ISO_14755_52)
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347# if ISO_14755
1348 // iso14755 part 5.2 handling: release time
1349 // first: controls
1350 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f)))
1353 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1355 commit_iso14755 ();
1356 goto skip_switch;
1357 }
1358
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks)
1361 {
1362 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 ();
1364 goto skip_switch;
1365 }
1366
1367 scr_bell ();
1368# endif
1369 iso14755buf = 0;
1370 break;
1371 }
1372 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1373 {
1374# if ENABLE_OVERLAY
1375 scr_overlay_off ();
1376# endif
1377 if (iso14755buf & ISO_14755_51)
1378 commit_iso14755 ();
1379#if ISO_14755
1380 else if (iso14755buf & ISO_14755_STARTED)
1381 {
1382 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1383
1384 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1385 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1386 }
1387# endif
1388 else
1389 iso14755buf = 0;
1390 }
1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1134 break; 1395 break;
1135 1396
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 if (! (ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R)
1140 mouse_slip_wheel_speed = 0; 1401 mouse_slip_wheel_speed = 0;
1141 else 1402#endif
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1403 break;
1150 } 1404 }
1151#endif
1152 1405
1153 case ButtonPress: 1406 case ButtonPress:
1154 button_press (ev.xbutton); 1407 button_press (ev.xbutton);
1155 break; 1408 break;
1156 1409
… …
1158 button_release (ev.xbutton); 1411 button_release (ev.xbutton);
1159 break; 1412 break;
1160 1413
1161 case ClientMessage: 1414 case ClientMessage:
1162 if (ev.xclient.format == 32 1415 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1417 {
1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1418 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1164 destroy (); 1419 destroy ();
1420#if ENABLE_EWMH
1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422 XSendEvent (disp, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &ev);
1425#endif
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1165#ifdef OFFIX_DND 1436#ifdef OFFIX_DND
1166 /* OffiX Dnd (drag 'n' drop) protocol */ 1437 /* OffiX Dnd (drag 'n' drop) protocol */
1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1168 && (ev.xclient.data.l[0] == DndFile 1439 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1440 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1441 || ev.xclient.data.l[0] == DndLink))
1171 { 1442 {
1172 /* Get Dnd data */ 1443 /* Get Dnd data */
1173 Atom ActualType; 1444 Atom ActualType;
1174 int ActualFormat; 1445 int ActualFormat;
1175 unsigned char *data; 1446 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1447 unsigned long Size, RemainingBytes;
1177 1448
1178 XGetWindowProperty (display->display, display->root, 1449 XGetWindowProperty (disp, display->root,
1179 xa[XA_DNDSELECTION], 1450 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1451 0L, 1000000L,
1181 False, AnyPropertyType, 1452 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1453 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1454 &Size, &RemainingBytes,
1184 &data); 1455 &data);
1185 XChangeProperty (display->display, display->root, 1456 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1457 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1191 } 1460 }
1192#endif /* OFFIX_DND */ 1461#endif /* OFFIX_DND */
1193 break; 1462 break;
1194 1463
1195 case MappingNotify: 1464 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1465 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1466 break;
1198 1467
1199 /* 1468 /*
1200 * XXX: this is not the _current_ arrangement 1469 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1470 * Here's my conclusion:
… …
1220 break; 1489 break;
1221 } 1490 }
1222 break; 1491 break;
1223 1492
1224 case FocusIn: 1493 case FocusIn:
1225 if (!TermWin.focus) 1494 focus_in ();
1495 break;
1496
1497 case FocusOut:
1498 focus_out ();
1499 break;
1500
1501 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0])
1226 { 1503 {
1227 TermWin.focus = 1; 1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1228 want_refresh = 1; 1505 ;
1229#ifdef USE_XIM
1230 if (Input_Context != NULL)
1231 XSetICFocus (Input_Context);
1232#endif
1233#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1236#endif
1237 1506
1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508 {
1509 seen_resize = 1;
1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511 }
1512
1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514 if (OPTION (Opt_transparent))
1515 check_our_parents ();
1516#endif
1238 } 1517 }
1239 break; 1518 break;
1240 1519
1241 case FocusOut:
1242 if (TermWin.focus)
1243 {
1244 TermWin.focus = 0;
1245 want_refresh = 1;
1246#ifdef USE_XIM
1247 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context);
1249#endif
1250#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink)
1252 cursor_blink_ev.stop ();
1253 hidden_cursor = 0;
1254#endif
1255
1256 }
1257 break;
1258
1259 case ConfigureNotify: 1520 case PropertyNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1521 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1261 { 1522 && ev.xproperty.state == PropertyNewValue)
1262 int height, width; 1523 selection_property (ev.xproperty.window, ev.xproperty.atom);
1263 1524
1264 do
1265 { /* Wrap lots of configures into one */
1266 width = ev.xconfigure.width;
1267 height = ev.xconfigure.height;
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1272 if (szHint.width != width || szHint.height != height)
1273 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1275 resize_all_windows (width, height, 1);
1276 }
1277#ifdef DEBUG_SIZE
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent)
1285 {
1286 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif
1291
1292 }
1293 break; 1525 break;
1294 1526
1295 case SelectionClear: 1527 case SelectionClear:
1296 display->set_selection_owner (0); 1528 selection_clear ();
1297 break; 1529 break;
1298 1530
1299 case SelectionNotify: 1531 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1532 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1533 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1534 break;
1304 1535
1305 case SelectionRequest: 1536 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1307 break; 1538 break;
1308 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1309 case UnmapNotify: 1548 case UnmapNotify:
1310 TermWin.mapped = 0; 1549 mapped = 0;
1311#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1313#endif 1552#endif
1314 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1315
1316 case MapNotify:
1317 TermWin.mapped = 1;
1318#ifdef TEXT_BLINK
1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1320#endif
1321 break; 1554 break;
1322 1555
1323#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1324 case ReparentNotify: 1557 case ReparentNotify:
1325 rootwin_cb (ev); 1558 rootwin_cb (ev);
1326 break; 1559 break;
1327#endif /* TRANSPARENT */ 1560#endif /* TRANSPARENT */
1328 1561
1329 case GraphicsExpose: 1562 case GraphicsExpose:
1330 case Expose: 1563 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1332 { 1565 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1566 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1570
1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1576
1341 // ev.xexpose.width, TermWin.height, False); 1577 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1578 }
1345 else 1579 else
1346 { 1580 {
1347 XEvent unused_event; 1581 XEvent unused_event;
1348 1582
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1350 Expose, 1584 ;
1351 &unused_event)) ; 1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1586 ;
1353 GraphicsExpose, 1587
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1588 if (isScrollbarWindow (ev.xany.window))
1356 { 1589 {
1357 scrollBar.setIdle (); 1590 scrollBar.setIdle ();
1358 scrollbar_show (0); 1591 scrollbar_show (0);
1359 } 1592 }
1360#ifdef MENUBAR 1593#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1595 menubar_expose ();
1363#endif 1596#endif
1597
1598#ifdef TRANSPARENT
1599 if (am_transparent && ev.xany.window == parent[0])
1600 XClearWindow (disp, ev.xany.window);
1601#endif
1364 } 1602 }
1365 break; 1603 break;
1366 1604
1367 case MotionNotify: 1605 case MotionNotify:
1368#ifdef POINTER_BLANK 1606#ifdef POINTER_BLANK
… …
1374 { 1612 {
1375 menubar_control (ev.xbutton); 1613 menubar_control (ev.xbutton);
1376 break; 1614 break;
1377 } 1615 }
1378#endif 1616#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1618 break;
1381 1619
1382 if (ev.xany.window == TermWin.vt) 1620 if (ev.xany.window == vt)
1383 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1625 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1387 ; 1627 ;
1388 1628
1389 XQueryPointer (display->display, TermWin.vt, 1629 XQueryPointer (disp, vt,
1390 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1633 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1635 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1637 {
1398#endif 1638#endif
1639#if ISO_14755
1640 // 5.4
1641 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1642 {
1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1644 break;
1645 }
1646#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1649
1401#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1653 {
1405 int dist; 1654 int dist;
1406
1407 pending_scroll_selection=1;
1408 1655
1409 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
1411 */ 1658 */
1412 if (scroll_selection_delay<=0) 1659 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1661
1415 /* save the event params so we can highlight 1662 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1663 * the selection in the pending-scroll loop
1417 */ 1664 */
1418 selection_save_x=ev.xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1668
1423 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1425 { 1671 {
1426 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1428 } 1674 }
1429 else 1675 else
1430 { 1676 {
1431 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1678 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1679 }
1680
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1681 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1;
1437 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1439 } 1686 }
1440 else 1687 else
1441 { 1688 {
1442 /* we are within the text window, so we 1689 /* we are within the text window, so we
1443 * shouldn't be scrolling 1690 * shouldn't be scrolling
1444 */ 1691 */
1445 pending_scroll_selection = 0; 1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop();
1446 } 1694 }
1447#endif 1695#endif
1448#ifdef MOUSE_THRESHOLD 1696#ifdef MOUSE_THRESHOLD
1449
1450 } 1697 }
1451#endif 1698#endif
1452
1453 } 1699 }
1454 } 1700 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1702 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1703 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1458 MotionNotify, &ev)) ; 1704 MotionNotify, &ev))
1705 ;
1706
1459 XQueryPointer (display->display, scrollBar.win, 1707 XQueryPointer (disp, scrollBar.win,
1460 &unused_root, &unused_child, 1708 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1710 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1711 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1713 scrollbar_size ());
1466 scr_refresh (refresh_type); 1714 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1715 refresh_limit = 0;
1468 scrollbar_show (1); 1716 scrollbar_show (1);
1469 } 1717 }
1470 break; 1718 break;
1471 } 1719 }
1472}
1473 1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1749}
1750
1751void
1752rxvt_term::focus_in ()
1753{
1754 if (!focus)
1755 {
1756 focus = 1;
1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 {
1764 IMSetStatusPosition ();
1765 XSetICFocus (Input_Context);
1766 }
1767#endif
1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_focused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::focus_out ()
1784{
1785 if (focus)
1786 {
1787 focus = 0;
1788 want_refresh = 1;
1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1795 iso14755buf = 0;
1796# if ENABLE_OVERLAY
1797 scr_overlay_off ();
1798# endif
1799 }
1800#endif
1801#if USE_XIM
1802 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context);
1804#endif
1805#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink))
1807 cursor_blink_ev.stop ();
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817 }
1818}
1819
1820#if TRANSPARENT
1474void 1821void
1475rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1823{
1477 SET_R (this); 1824 SET_R (this);
1478 SET_LOCALE (locale); 1825 SET_LOCALE (locale);
1479 1826
1480 switch (ev.type) 1827 switch (ev.type)
1481 { 1828 {
1482 case PropertyNotify: 1829 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /* 1830 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1495 */ 1833 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1834 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1836 return;
1501 }
1502 1837
1503 /* FALLTHROUGH */ 1838 /* FALLTHROUGH */
1504 case ReparentNotify: 1839 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1841 want_refresh = want_full_refresh = 1;
1508 break; 1842 break;
1509#endif
1510 } 1843 }
1511} 1844}
1845#endif
1512 1846
1513void 1847void
1514rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1515{ 1849{
1516 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1517 1851
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1519 if (!bypass_keystate) 1854 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1856
1521 /* 1857 /*
1522 * VT window processing of button press 1858 * VT window processing of button press
1523 */ 1859 */
1524 if (ev.window == TermWin.vt) 1860 if (ev.window == vt)
1525 { 1861 {
1862#if ISO_14755
1863 // 5.4
1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865 {
1866 iso14755_54 (ev.x, ev.y);
1867 return;
1868 }
1869#endif
1870
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1871 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1872
1527 if (reportmode) 1873 if (reportmode)
1528 { 1874 {
1529 /* mouse report from vt window */ 1875 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1876 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1877 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1534 { 1880 {
1535 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1536 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1537 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1538 { 1885 {
1539 /* only report double clicks */ 1886 /* only report double clicks */
1540 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1541 mouse_report (ev); 1888 mouse_report (ev);
… …
1560 } 1907 }
1561 else 1908 else
1562 { 1909 {
1563 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1565 switch (ev.button) 1914 switch (ev.button)
1566 { 1915 {
1567 case Button1: 1916 case Button1:
1917 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */
1919#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask);
1921#else
1922 selection.rect = false;
1923#endif
1924
1568 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1927 {
1571 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1573 else 1930 else
1574 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1575 } 1932 }
1576 else 1933 else
1577 { 1934 {
1578 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1579 MEvent.clicks++; 1936 MEvent.clicks++;
1580 else 1937 else
1581 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1582 1939
1583 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1584 } 1941 }
1585 1942
1586 MEvent.button = Button1; 1943 MEvent.button = Button1;
1587 break; 1944 break;
1588 1945
1589 case Button3: 1946 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1592 else 1949 else
1593 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1951
1594 MEvent.button = Button3; 1952 MEvent.button = Button3;
1595 break; 1953 break;
1596 } 1954 }
1597 } 1955 }
1956
1598 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1599 return; 1958 return;
1600 } 1959 }
1601 1960
1602 /* 1961 /*
… …
1668 upordown = 1; /* down */ 2027 upordown = 1; /* down */
1669 } 2028 }
1670 if (upordown) 2029 if (upordown)
1671 { 2030 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2032 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 2033#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 2035 {
1677 if (upordown < 0) 2036 if (upordown < 0)
1678 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
1694 break; 2053 break;
1695 case R_SB_ALIGN_BOTTOM: 2054 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 2055 csrO = scrollBar.bot - scrollBar.top;
1697 break; 2056 break;
1698 } 2057 }
2058
1699 if (scrollBar.style == R_SB_XTERM 2059 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 2060 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 2061 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 2063
1704 scrollBar.setMotion (); 2064 scrollBar.setMotion ();
1705 break; 2065 break;
1706 2066
1707 case Button1: 2067 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2068 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1712 case Button3: 2072 case Button3:
1713 if (scrollBar.style != R_SB_XTERM) 2073 if (scrollBar.style != R_SB_XTERM)
1714 { 2074 {
1715 if (scrollbar_above_slider (ev.y)) 2075 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1); 2077 scr_page (UP, nrow - 1);
1718# else 2078# else
1719 scr_page (UP, TermWin.nrow / 4); 2079 scr_page (UP, nrow / 4);
1720# endif 2080# endif
1721 else if (scrollbar_below_slider (ev.y)) 2081 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1); 2083 scr_page (DN, nrow - 1);
1724# else 2084# else
1725 scr_page (DN, TermWin.nrow / 4); 2085 scr_page (DN, nrow / 4);
1726# endif 2086# endif
1727 else 2087 else
1728 scrollBar.setMotion (); 2088 scrollBar.setMotion ();
1729 } 2089 }
1730 else 2090 else
1731 { 2091 {
1732 scr_page ((ev.button == Button1 ? DN : UP), 2092 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 2093 (nrow
1734 * scrollbar_position (ev.y) 2094 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 2095 / scrollbar_size ()));
1736 } 2096 }
2097
1737 break; 2098 break;
1738 } 2099 }
1739 } 2100 }
2101
1740 return; 2102 return;
1741 } 2103 }
2104
1742#if MENUBAR 2105#if MENUBAR
1743 /* 2106 /*
1744 * Menubar window processing of button press 2107 * Menubar window processing of button press
1745 */ 2108 */
1746 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
1753{ 2116{
1754 int reportmode = 0; 2117 int reportmode = 0;
1755 2118
1756 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 2120 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 2122
1760 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
1761 { 2124 {
1762 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
1763 scrollbar_show (0); 2126 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 2128 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 2129#endif
1767
1768 } 2130 }
2131
1769#ifdef SELECTION_SCROLLING 2132#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 2133 if (sel_scroll_ev.active)
2134 sel_scroll_ev.stop();
1771#endif 2135#endif
2136
1772 if (ev.window == TermWin.vt) 2137 if (ev.window == vt)
1773 { 2138 {
2139#if ISO_14755
2140 // 5.4
2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142 return;
2143#endif
1774 if (reportmode) 2144 if (reportmode)
1775 { 2145 {
1776 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1793 mouse_report (ev); 2163 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2165 return;
1796 } 2166 }
2167
1797 /* 2168 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2170 * when overriding mouse reporting
1800 */ 2171 */
1801 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2173 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
1805 2179
1806 switch (ev.button) 2180 switch (ev.button)
1807 { 2181 {
1808 case Button1: 2182 case Button1:
1809 case Button3: 2183 case Button3:
… …
1817 case Button5: 2191 case Button5:
1818 { 2192 {
1819 int i; 2193 int i;
1820 page_dirn v; 2194 page_dirn v;
1821 2195
1822 v = (ev.button == Button4) ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2197
1823 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1824 i = 1; 2199 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2200 else if (OPTION (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1827 else 2202 else
1828 i = 5; 2203 i = 5;
2204
1829# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1831 { 2207 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211
2212 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2214
2215 slip_wheel_ev.start ();
1834 } 2216 }
2217 else
2218 {
1835# endif 2219# endif
1836# ifdef JUMP_MOUSE_WHEEL 2220# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1); 2221 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2222 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1); 2223 scrollbar_show (1);
2224# else
2225 while (i--)
2226 {
2227 scr_page (v, 1);
2228 scr_refresh (SMOOTH_REFRESH);
2229 scrollbar_show (1);
2230 }
2231# endif
2232# ifdef MOUSE_SLIP_WHEELING
1846 } 2233 }
1847# endif 2234#endif
1848
1849 } 2235 }
1850 break; 2236 break;
1851#endif 2237#endif
1852
1853 } 2238 }
1854 } 2239 }
1855#ifdef MENUBAR 2240#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2241 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2242 menubar_control (ev);
1858#endif 2243#endif
1859} 2244}
1860 2245
1861
1862#ifdef TRANSPARENT 2246#ifdef TRANSPARENT
2247#if TINTING
2248/* taken from aterm-0.4.2 */
2249
2250typedef uint32_t RUINT32T;
2251
2252void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2253{
2254 int sh_r, sh_g, sh_b;
2255 RUINT32T mask_r, mask_g, mask_b;
2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259 int i;
2260
2261 Visual *visual = display->visual;
2262
2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264
2265 /* for convenience */
2266 mask_r = visual->red_mask;
2267 mask_g = visual->green_mask;
2268 mask_b = visual->blue_mask;
2269
2270 /* boring lookup table pre-initialization */
2271 switch (srcImage->bits_per_pixel) {
2272 case 15:
2273 if ((mask_r != 0x7c00) ||
2274 (mask_g != 0x03e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+32;
2281 sh_r = 10;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 16:
2286 if ((mask_r != 0xf800) ||
2287 (mask_g != 0x07e0) ||
2288 (mask_b != 0x001f))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2291 lookup_r = lookup;
2292 lookup_g = lookup+32;
2293 lookup_b = lookup+32+64;
2294 sh_r = 11;
2295 sh_g = 5;
2296 sh_b = 0;
2297 break;
2298 case 24:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 case 32:
2312 if ((mask_r != 0xff0000) ||
2313 (mask_g != 0x00ff00) ||
2314 (mask_b != 0x0000ff))
2315 return;
2316 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2317 lookup_r = lookup;
2318 lookup_g = lookup+256;
2319 lookup_b = lookup+256+256;
2320 sh_r = 16;
2321 sh_g = 8;
2322 sh_b = 0;
2323 break;
2324 default:
2325 return; /* we do not support this color depth */
2326 }
2327
2328 /* prepare limits for color transformation (each channel is handled separately) */
2329 if (shade < 0) {
2330 shade = -shade;
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = 65535-rm;
2335 lower_lim_g = 65535-gm;
2336 lower_lim_b = 65535-bm;
2337
2338 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2339 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2340 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2341
2342 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2343 } else {
2344 if (shade < 0) shade = 0;
2345 if (shade > 100) shade = 100;
2346
2347 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2348
2349 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2350 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2351 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2352 }
2353
2354 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2355 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2356 {
2357 unsigned int tmp;
2358
2359 tmp = lower_lim_r;
2360 lower_lim_r = lower_lim_b;
2361 lower_lim_b = tmp;
2362
2363 tmp = upper_lim_r;
2364 upper_lim_r = upper_lim_b;
2365 upper_lim_b = tmp;
2366 }
2367
2368 /* fill our lookup tables */
2369 for (i = 0; i <= mask_r>>sh_r; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2373 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2374 lookup_r[i] = (tmp/65535)<<sh_r;
2375 }
2376 for (i = 0; i <= mask_g>>sh_g; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2380 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2381 lookup_g[i] = (tmp/65535)<<sh_g;
2382 }
2383 for (i = 0; i <= mask_b>>sh_b; i++)
2384 {
2385 RUINT32T tmp;
2386 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2387 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2388 lookup_b[i] = (tmp/65535)<<sh_b;
2389 }
2390
2391 /* apply table to input image (replacing colors by newly calculated ones) */
2392 switch (srcImage->bits_per_pixel)
2393 {
2394 case 15:
2395 {
2396 unsigned short *p1, *pf, *p, *pl;
2397 p1 = (unsigned short *) srcImage->data;
2398 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0x7c00)>>10] |
2406 lookup_g[(*p & 0x03e0)>> 5] |
2407 lookup_b[(*p & 0x001f)];
2408 }
2409 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 case 16:
2414 {
2415 unsigned short *p1, *pf, *p, *pl;
2416 p1 = (unsigned short *) srcImage->data;
2417 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xf800)>>11] |
2425 lookup_g[(*p & 0x07e0)>> 5] |
2426 lookup_b[(*p & 0x001f)];
2427 }
2428 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 case 24:
2433 {
2434 unsigned char *p1, *pf, *p, *pl;
2435 p1 = (unsigned char *) srcImage->data;
2436 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2437 while (p1 < pf)
2438 {
2439 p = p1;
2440 pl = p1 + srcImage->width * 3;
2441 for (; p < pl; p += 3)
2442 {
2443 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2444 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2445 p[2] = lookup_r[(p[2] & 0x0000ff)];
2446 }
2447 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2448 }
2449 break;
2450 }
2451 case 32:
2452 {
2453 RUINT32T *p1, *pf, *p, *pl;
2454 p1 = (RUINT32T *) srcImage->data;
2455 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2456
2457 while (p1 < pf)
2458 {
2459 p = p1;
2460 pl = p1 + srcImage->width;
2461 for (; p < pl; p++)
2462 {
2463 *p = lookup_r[(*p & 0xff0000)>>16] |
2464 lookup_g[(*p & 0x00ff00)>> 8] |
2465 lookup_b[(*p & 0x0000ff)] |
2466 (*p & ~0xffffff);
2467 }
2468 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2469 }
2470 break;
2471 }
2472 }
2473
2474 free (lookup);
2475}
2476#endif
2477
1863/* 2478/*
1864 * Check our parents are still who we think they are. 2479 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2480 * Do transparency updates if required
1866 */ 2481 */
1867int 2482int
1868rxvt_term::check_our_parents () 2483rxvt_term::check_our_parents ()
1869{ 2484{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2485 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2486 unsigned long nitems, bytes_after;
1872 Atom atype; 2487 Atom atype;
1873 unsigned char *prop = NULL; 2488 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2489 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2490 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2491 XWindowAttributes wattr, wrootattr;
2492 dDisp;
1877 2493
1878 pchanged = 0; 2494 pchanged = 0;
1879 2495
1880 if (! (Options & Opt_transparent)) 2496 if (!OPTION (Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2497 return pchanged; /* Don't try any more */
1882 2498
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2499 XGetWindowAttributes (disp, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2500 rootdepth = wrootattr.depth;
1885 2501
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2502 XGetWindowAttributes (disp, parent[0], &wattr);
2503
1887 if (rootdepth != wattr.depth) 2504 if (rootdepth != wattr.depth)
1888 { 2505 {
1889 if (am_transparent) 2506 if (am_transparent)
1890 { 2507 {
1891 pchanged = 1; 2508 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2510 am_transparent = am_pixmap_trans = 0;
1895 } 2511 }
2512
1896 return pchanged; /* Don't try any more */ 2513 return pchanged; /* Don't try any more */
1897 } 2514 }
1898 2515
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2516 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2517 XSync (disp, False);
1901 2518
1902 /* 2519 /*
1903 * Make the frame window set by the window manager have 2520 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2521 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2522 * windows for each client, so we have to take care about that.
1906 */ 2523 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2524 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2527 &nitems, &bytes_after, &prop) == Success);
2528
1911 if (!i || prop == NULL) 2529 if (!i || prop == NULL)
2530 i = (xa[XA_ESETROOT_PMAP_ID]
2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533 &nitems, &bytes_after, &prop) == Success);
2534
2535 if (!i || prop == NULL
2536#if TINTING
2537 || !rs[Rs_color + Color_tint]
2538#endif
2539 )
1912 have_pixmap = 0; 2540 have_pixmap = 0;
1913 else 2541 else
1914 { 2542 {
1915 have_pixmap = 1; 2543 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2544 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2545 XFree (prop);
1918 } 2546 }
2547
1919 if (have_pixmap) 2548 if (have_pixmap)
1920 { 2549 {
1921 /* 2550 /*
1922 * Copy display->root pixmap transparency 2551 * Copy display->root pixmap transparency
1923 */ 2552 */
… …
1926 Window cr; 2555 Window cr;
1927 XImage *image; 2556 XImage *image;
1928 GC gc; 2557 GC gc;
1929 XGCValues gcvalue; 2558 XGCValues gcvalue;
1930 2559
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2560 XTranslateCoordinates (disp, parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2561 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2562 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2563 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2564 nx = ny = 0;
1936 2565
1937 if (sx < 0) 2566 if (sx < 0)
… …
1946 nh += sy; 2575 nh += sy;
1947 ny = -sy; 2576 ny = -sy;
1948 sy = 0; 2577 sy = 0;
1949 } 2578 }
1950 2579
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2580 min_it (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2581 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582
2583 XSync (disp, False);
1953 allowedxerror = -1; 2584 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2586
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2588 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2589 allowedxerror = 0;
2590
1959 if (image == NULL) 2591 if (image == NULL)
1960 { 2592 {
1961 if (am_transparent && am_pixmap_trans) 2593 if (am_transparent && am_pixmap_trans)
1962 { 2594 {
1963 pchanged = 1; 2595 pchanged = 1;
1964 if (TermWin.pixmap != None) 2596 if (pixmap != None)
1965 { 2597 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2598 XFreePixmap (disp, pixmap);
1967 TermWin.pixmap = None; 2599 pixmap = None;
1968 } 2600 }
1969 } 2601 }
2602
1970 am_pixmap_trans = 0; 2603 am_pixmap_trans = 0;
1971 } 2604 }
1972 else 2605 else
1973 { 2606 {
1974 if (TermWin.pixmap != None) 2607 if (pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2608 XFreePixmap (disp, pixmap);
2609
2610#if TINTING
2611 if (ISSET_PIXCOLOR (Color_tint))
2612 {
2613 unsigned short rm, gm, bm;
2614 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615
2616 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2617
2618 ShadeXImage (display, image, shade, rm, gm, bm);
2619 }
2620#endif
2621
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2622 pixmap = XCreatePixmap (disp, vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2623 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2625 XPutImage (disp, pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2626 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2627 XFreeGC (disp, gc);
1985 XDestroyImage (image); 2628 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1987 TermWin.pixmap); 2630 XClearWindow (disp, parent[0]);
2631
1988 if (!am_transparent || !am_pixmap_trans) 2632 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2633 pchanged = 1;
2634
1990 am_transparent = am_pixmap_trans = 1; 2635 am_transparent = am_pixmap_trans = 1;
1991 } 2636 }
1992 } 2637 }
1993 2638
1994 if (!am_pixmap_trans) 2639 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 else
1995 { 2642 {
1996 unsigned int n; 2643 unsigned int n;
1997 /* 2644 /*
1998 * InheritPixmap transparency 2645 * InheritPixmap transparency
1999 */ 2646 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2648 {
2004 oldp = TermWin.parent[i]; 2649 oldp = parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2650 XQueryTree (disp, parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2651 &parent[i], &list, &n);
2007 XFree (list); 2652 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2653
2009 if (TermWin.parent[i] == display->root) 2654 if (parent[i] == display->root)
2010 { 2655 {
2011 if (oldp != None) 2656 if (oldp != None)
2012 pchanged = 1; 2657 pchanged = 1;
2658
2013 break; 2659 break;
2014 } 2660 }
2661
2015 if (oldp != TermWin.parent[i]) 2662 if (oldp != parent[i])
2016 pchanged = 1; 2663 pchanged = 1;
2017 } 2664 }
2018 2665
2019 n = 0; 2666 n = 0;
2020 2667
2021 if (pchanged) 2668 if (pchanged)
2022 { 2669 {
2023 for (; n < (unsigned int)i; n++) 2670 for (; n < (unsigned int)i; n++)
2024 { 2671 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2672 XGetWindowAttributes (disp, parent[n], &wattr);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2674 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2030 break; 2676 break;
2031 } 2677 }
2032 } 2678 }
2033 } 2679 }
2034 2680
2035 if (n > (int) (sizeof (TermWin.parent) 2681 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2682 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2684 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt,
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2685 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2686 /* XXX: also turn off Opt_transparent? */
2045 } 2687 }
2046 else 2688 else
2047 { 2689 {
2690#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2691 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2692 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2693 sleep (1);
2058# endif 2694#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2695 for (n = 0; n < (unsigned int)i; n++)
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2696 {
2062 ParentRelative); 2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2698 XClearWindow (disp, parent[n]);
2064 ParentRelative); 2699 }
2700
2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2065 am_transparent = 1; 2702 am_transparent = 1;
2066 } 2703 }
2067 2704
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2706 parent[i] = None;
2707 }
2708
2709 if (scrollBar.win)
2070 } 2710 {
2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2712 scrollBar.setIdle ();
2713 scrollbar_show (0);
2714 }
2715
2716 if (am_transparent)
2717 {
2718 want_refresh = want_full_refresh = 1;
2719 if (am_pixmap_trans)
2720 flush ();
2721 }
2722
2071 return pchanged; 2723 return pchanged;
2072} 2724}
2073#endif 2725#endif
2074 2726
2075/*}}} */ 2727/*}}} */
2728
2729bool
2730rxvt_term::cmd_parse ()
2731{
2732 bool flag = false;
2733 wchar_t ch = NOCHAR;
2734 char *seq_begin; // remember start of esc-sequence here
2735
2736 for (;;)
2737 {
2738 if (ch == NOCHAR)
2739 {
2740 seq_begin = cmdbuf_ptr;
2741 ch = next_char ();
2742
2743 if (ch == NOCHAR)
2744 break;
2745 }
2746
2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2748 {
2749 if (!seen_input)
2750 {
2751 seen_input = 1;
2752 // many badly-written programs (e.g. jed) contain a race condition:
2753 // they first read the screensize and then install a SIGWINCH handler.
2754 // some window managers resize the window early, and these programs
2755 // then sometimes get the size wrong.
2756 // unfortunately other programs are even more buggy and dislike
2757 // being sent SIGWINCH, so only do it when we were in fact being
2758 // resized.
2759 if (seen_resize && cmd_pid)
2760 kill (-cmd_pid, SIGWINCH);
2761 }
2762
2763 /* Read a text string from the input buffer */
2764 wchar_t buf[UBUFSIZ];
2765 bool refreshnow = false;
2766 int nlines = 0;
2767 wchar_t *str = buf;
2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2769
2770 for (;;)
2771 {
2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2773 break;
2774
2775 *str++ = ch;
2776
2777 if (ch == C0_LF || str >= eol)
2778 {
2779 if (ch == C0_LF)
2780 nlines++;
2781
2782 refresh_count++;
2783
2784 if (!OPTION (Opt_jumpScroll)
2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2786 {
2787 refreshnow = true;
2788 refresh_count = 0;
2789 ch = NOCHAR;
2790 break;
2791 }
2792
2793 // scr_add_lines only works for nlines <= nrow - 1.
2794 if (nlines >= nrow - 1)
2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2797 scr_add_lines (buf, str - buf, nlines);
2798
2799 nlines = 0;
2800 str = buf;
2801 eol = str + min (ncol, UBUFSIZ);
2802 }
2803
2804 if (str >= eol)
2805 {
2806 if (eol >= buf + UBUFSIZ)
2807 {
2808 ch = NOCHAR;
2809 break;
2810 }
2811 else
2812 eol = min (eol + ncol, buf + UBUFSIZ);
2813 }
2814
2815 }
2816
2817 seq_begin = cmdbuf_ptr;
2818 ch = next_char ();
2819 }
2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2822 scr_add_lines (buf, str - buf, nlines);
2823
2824 /*
2825 * If there have been a lot of new lines, then update the screen
2826 * What the heck I'll cheat and only refresh less than every page-full.
2827 * the number of pages between refreshes is refresh_limit, which
2828 * is incremented here because we must be doing flat-out scrolling.
2829 */
2830 if (refreshnow)
2831 {
2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833 refresh_limit++;
2834 else
2835 {
2836 flag = true;
2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2839 }
2840 }
2841
2842 }
2843 else
2844 {
2845 try
2846 {
2847 process_nonprinting (ch);
2848 }
2849 catch (const class out_of_input &o)
2850 {
2851 // we ran out of input, retry later
2852 cmdbuf_ptr = seq_begin;
2853 break;
2854 }
2855
2856 ch = NOCHAR;
2857 }
2858 }
2859
2860 return flag;
2861}
2862
2863// read the next character
2864wchar_t
2865rxvt_term::next_char ()
2866{
2867 while (cmdbuf_ptr < cmdbuf_endp)
2868 {
2869 // assume 7-bit to be ascii ALWAYS
2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2871 return *cmdbuf_ptr++;
2872
2873 wchar_t wc;
2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2875
2876 if (len == (size_t)-2)
2877 {
2878 // the mbstate stores incomplete sequences. didn't know this :/
2879 cmdbuf_ptr = cmdbuf_endp;
2880 break;
2881 }
2882
2883 if (len == (size_t)-1)
2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2885
2886 // assume wchar == unicode
2887 cmdbuf_ptr += len;
2888 return wc & UNICODE_MASK;
2889 }
2890
2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2901}
2902
2903/* rxvt_cmd_getc () - Return next input character */
2904/*
2905 * Return the next input character after first passing any keyboard input
2906 * to the command.
2907 */
2908wchar_t
2909rxvt_term::cmd_getc ()
2910{
2911 wchar_t c = next_char ();
2912
2913 if (c == NOCHAR)
2914 throw out_of_input;
2915
2916 return c;
2917}
2918
2919uint32_t
2920rxvt_term::cmd_get8 ()
2921{
2922 uint32_t c = next_octet ();
2923
2924 if (c == NOCHAR)
2925 throw out_of_input;
2926
2927 return c;
2928}
2076 2929
2077/*{{{ print pipe */ 2930/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2931/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2932#ifdef PRINTPIPE
2080FILE * 2933FILE *
2081rxvt_term::popen_printer () 2934rxvt_term::popen_printer ()
2082{ 2935{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2936 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2937
2085 if (stream == NULL) 2938 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2939 rxvt_warn ("can't open printer pipe, not printing.\n");
2940
2087 return stream; 2941 return stream;
2088} 2942}
2089 2943
2090int 2944int
2091rxvt_term::pclose_printer (FILE *stream) 2945rxvt_term::pclose_printer (FILE *stream)
2092{ 2946{
2093 fflush (stream); 2947 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2948 return pclose (stream);
2100# endif
2101} 2949}
2102 2950
2103/* 2951/*
2104 * simulate attached vt100 printer 2952 * simulate attached vt100 printer
2105 */ 2953 */
2106void 2954void
2107rxvt_term::process_print_pipe () 2955rxvt_term::process_print_pipe ()
2108{ 2956{
2109 int done; 2957 int done;
2110 FILE *fd; 2958 FILE *fd;
2111 2959
2112 if ((fd = popen_printer ()) == NULL) 2960 if ((fd = popen_printer ()) == NULL)
2113 return; 2961 return;
2114 2962
2115 /* 2963 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2964 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2965 * is received.
2118 */ 2966 */
2119 for (done = 0; !done;) 2967 for (done = 0; !done;)
2120 { 2968 {
2121 unsigned char buf[8]; 2969 unsigned char buf[8];
2122 unsigned char ch; 2970 unicode_t ch;
2123 unsigned int i, len; 2971 unsigned int i, len;
2124 2972
2125 if ((ch = cmd_getc ()) != C0_ESC) 2973 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2974 {
2127 if (putc (ch, fd) == EOF) 2975 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2976 break; /* done = 1 */
… …
2143 { 2991 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2992 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2993 break; /* done = 1 */
2146 } 2994 }
2147 } 2995 }
2996
2148 for (i = 0; i < len; i++) 2997 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2998 if (putc (buf[i], fd) == EOF)
2150 { 2999 {
2151 done = 1; 3000 done = 1;
2152 break; 3001 break;
2153 } 3002 }
2154 } 3003 }
2155 } 3004 }
3005
2156 pclose_printer (fd); 3006 pclose_printer (fd);
2157} 3007}
2158#endif /* PRINTPIPE */ 3008#endif /* PRINTPIPE */
2159/*}}} */ 3009/*}}} */
2160 3010
2161/* *INDENT-OFF* */ 3011/* *INDENT-OFF* */
2162enum { 3012enum {
2163 C1_40 = 0x40, 3013 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3014 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 3015 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 3016 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 3017 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 3018};
2169/* *INDENT-ON* */ 3019/* *INDENT-ON* */
2170 3020
2171/*{{{ process non-printing single characters */ 3021/*{{{ process non-printing single characters */
2172void 3022void
2173rxvt_term::process_nonprinting (unsigned char ch) 3023rxvt_term::process_nonprinting (unicode_t ch)
2174{ 3024{
2175 switch (ch) 3025 switch (ch)
2176 { 3026 {
3027 case C0_ESC:
3028 process_escape_seq ();
3029 break;
2177 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2179 tt_write ( 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 3033 else
2183 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 3035 break;
2186 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2187 scr_bell (); 3037 scr_bell ();
2188 break; 3038 break;
2189 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 3054 scr_charset_choose (1);
2205 break; 3055 break;
2206 case C0_SI: /* shift in - acs */ 3056 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3057 scr_charset_choose (0);
2208 break; 3058 break;
3059
3060#ifdef EIGHT_BIT_CONTROLS
3061 // 8-bit controls
3062 case 0x90: /* DCS */
3063 process_dcs_seq ();
3064 break;
3065 case 0x9b: /* CSI */
3066 process_csi_seq ();
3067 break;
3068 case 0x9d: /* CSI */
3069 process_osc_seq ();
3070 break;
3071#endif
2209 } 3072 }
2210} 3073}
2211/*}}} */ 3074/*}}} */
2212 3075
2213 3076
2214/*{{{ process VT52 escape sequences */ 3077/*{{{ process VT52 escape sequences */
2215void 3078void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 3079rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 3080{
2218 int row, col; 3081 int row, col;
2219 3082
2220 switch (ch) 3083 switch (ch)
2221 { 3084 {
… …
2273 3136
2274/*{{{ process escape sequences */ 3137/*{{{ process escape sequences */
2275void 3138void
2276rxvt_term::process_escape_seq () 3139rxvt_term::process_escape_seq ()
2277{ 3140{
2278 unsigned char ch = cmd_getc (); 3141 unicode_t ch = cmd_getc ();
2279 3142
2280 if (PrivateModes & PrivMode_vt52) 3143 if (priv_modes & PrivMode_vt52)
2281 { 3144 {
2282 process_escape_vt52 (ch); 3145 process_escape_vt52 (ch);
2283 return; 3146 return;
2284 } 3147 }
2285 3148
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 3163 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 3164 break;
2302 case '+': 3165 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 3166 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 3167 break;
2305#ifndef NO_FRILLS 3168#if ENABLE_FRILLS
2306 case '6': 3169 case '6':
2307 scr_backindex (); 3170 scr_backindex ();
2308 break; 3171 break;
2309#endif 3172#endif
2310 case '7': 3173 case '7':
2311 scr_cursor (SAVE); 3174 scr_cursor (SAVE);
2312 break; 3175 break;
2313 case '8': 3176 case '8':
2314 scr_cursor (RESTORE); 3177 scr_cursor (RESTORE);
2315 break; 3178 break;
2316#ifndef NO_FRILLS 3179#if ENABLE_FRILLS
2317 case '9': 3180 case '9':
2318 scr_forwardindex (); 3181 scr_forwardindex ();
2319 break; 3182 break;
2320#endif 3183#endif
2321 case '=': 3184 case '=':
… …
2331 break; 3194 break;
2332 3195
2333 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
2335 { 3198 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2338 } 3201 }
2339 break; 3202 break;
2340 3203
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
2342 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
2352 case C1_RI: /* ESC M */ 3215 case C1_RI: /* ESC M */
2353 scr_index (DN); 3216 scr_index (DN);
2354 break; 3217 break;
2355 3218
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3219 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3220 /*case C1_SS2: scr_single_shift (2); break; */
2358 3221
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3222 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3223 /*case C1_SS3: scr_single_shift (3); break; */
2361 3224
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3225 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3226 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3227 process_dcs_seq ();
2365 break; 3228 break;
2366 3229
2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2368 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
2369 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2371 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
2372 3234
2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2374 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
2375 process_csi_seq (); 3237 process_csi_seq ();
… …
2380 process_osc_seq (); 3242 process_osc_seq ();
2381 break; 3243 break;
2382 3244
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3245 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3246 case 'c':
3247 mbstate.reset ();
2385 scr_poweron (); 3248 scr_poweron ();
2386 scrollbar_show (1); 3249 scrollbar_show (1);
2387 break; 3250 break;
2388 3251
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3252 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3264
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3265/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3266/* *INDENT-OFF* */
2404enum { 3267enum {
2405 CSI_ICH = 0x40, 3268 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3269 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3270 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3271 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3272 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3273 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3274 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3289 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3290 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3291 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3292 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3293 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3294 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3295 };
2433/* *INDENT-ON* */ 3296/* *INDENT-ON* */
2434 3297
2435void 3298void
2436rxvt_term::process_csi_seq () 3299rxvt_term::process_csi_seq ()
2437{ 3300{
2438 unsigned char ch, priv, i; 3301 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3302 unsigned int nargs, p;
2440 int n, ndef; 3303 int n, ndef;
2441 int arg[ESC_ARGS]; 3304 int arg[ESC_ARGS];
2442 3305
2443 for (nargs = ESC_ARGS; nargs > 0;) 3306 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3307 arg[--nargs] = 0;
2445 3308
2446 priv = 0; 3309 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3311 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3312 { /* '<' '=' '>' '?' */
2450 priv = ch; 3313 priv = ch;
2451 ch = cmd_getc (); 3314 ch = cmd_getc ();
2452 } 3315 }
3316
2453 /* read any numerical arguments */ 3317 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3318 for (n = -1; ch < CSI_ICH; )
2455 { 3319 {
2456 if (isdigit (ch)) 3320 if (isdigit (ch))
2457 { 3321 {
… …
2464 { 3328 {
2465 if (nargs < ESC_ARGS) 3329 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3330 arg[nargs++] = n;
2467 n = -1; 3331 n = -1;
2468 } 3332 }
2469 else if (ch == '\b') 3333 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 3334 process_nonprinting (ch);
2481 } 3335
2482 ch = cmd_getc (); 3336 ch = cmd_getc ();
2483 } 3337 }
2484 3338
2485 if (ch > CSI_7F) 3339 if (ch > CSI_7F)
2486 return; 3340 return;
… …
2508 { 3362 {
2509 switch (priv) 3363 switch (priv)
2510 { 3364 {
2511 case '>': 3365 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 3366 if (ch == CSI_DA) /* secondary device attributes */
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3367 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2514 break; 3368 break;
2515 case '?': 3369 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 3371 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 3372 break;
… …
2623 3477
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3478 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 3479 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 3480 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 3483 break;
2630 3484
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3487 break;
2635 3488
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
2638 break; 3491 break;
… …
2644 tt_printf ("\033[0n"); 3497 tt_printf ("\033[0n");
2645 break; 3498 break;
2646 case 6: /* CPR requested */ 3499 case 6: /* CPR requested */
2647 scr_report_position (); 3500 scr_report_position ();
2648 break; 3501 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3502 case 7: /* unofficial extension */
3503 if (OPTION (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3504 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3505 break;
2653#endif
2654 case 8: /* unofficial extension */ 3506 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3508 break;
2657 } 3509 }
2658 break; 3510 break;
2659 3511
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3512 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3545 break;
2694 3546
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3547 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3548 if (arg[0] == 4)
2697 scr_insert_mode (0); 3549 scr_insert_mode (0);
3550 else if (arg[0] == 20)
3551 priv_modes &= ~PrivMode_LFNL;
2698 break; 3552 break;
2699 3553
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3554 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3555 if (arg[0] == 4)
2702 scr_insert_mode (1); 3556 scr_insert_mode (1);
3557 else if (arg[0] == 20)
3558 priv_modes |= PrivMode_LFNL;
2703 break; 3559 break;
2704 3560
2705 /* 3561 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3562 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3563 */
… …
2719 break; 3575 break;
2720 case CSI_75: 3576 case CSI_75:
2721 scr_cursor (RESTORE); 3577 scr_cursor (RESTORE);
2722 break; 3578 break;
2723 3579
2724#ifndef NO_FRILLS 3580#if ENABLE_FRILLS
2725 case CSI_74: 3581 case CSI_74:
2726 process_window_ops (arg, nargs); 3582 process_window_ops (arg, nargs);
2727 break; 3583 break;
2728#endif 3584#endif
2729 3585
2730 case CSI_78: /* DECREQTPARM */ 3586 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3587 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3588 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3589 break;
2734 3590
2735 default: 3591 default:
2736 break; 3592 break;
2737 } 3593 }
2738} 3594}
2739/*}}} */ 3595/*}}} */
2740 3596
2741#ifndef NO_FRILLS 3597#if ENABLE_FRILLS
2742/* ARGSUSED */ 3598/* ARGSUSED */
2743void 3599void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3600rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3601{
2746 int x, y; 3602 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3603 XWindowAttributes wattr;
2751 Window wdummy; 3604 Window wdummy;
3605 dDisp;
2752 3606
2753 if (nargs == 0) 3607 if (nargs == 0)
2754 return; 3608 return;
3609
2755 switch (args[0]) 3610 switch (args[0])
2756 { 3611 {
2757 /* 3612 /*
2758 * commands 3613 * commands
2759 */ 3614 */
2760 case 1: /* deiconify window */ 3615 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3616 XMapWindow (disp, parent[0]);
2762 break; 3617 break;
2763 case 2: /* iconify window */ 3618 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3619 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3620 break;
2767 case 3: /* set position (pixels) */ 3621 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3622 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3623 break;
2770 case 4: /* set size (pixels) */ 3624 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3626 break;
2773 case 5: /* raise window */ 3627 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3628 XRaiseWindow (disp, parent[0]);
2775 break; 3629 break;
2776 case 6: /* lower window */ 3630 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3631 XLowerWindow (disp, parent[0]);
2778 break; 3632 break;
2779 case 7: /* refresh window */ 3633 case 7: /* refresh window */
2780 scr_touch (true); 3634 scr_touch (true);
2781 break; 3635 break;
2782 case 8: /* set size (chars) */ 3636 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3637 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
2785 break; 3639 break;
3640
3641 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3642 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3643 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3644 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3645 (unsigned int) (args[1] * fheight));
2790 break; 3646 break;
3647
3648
2791 /* 3649 /*
2792 * reports - some output format copied from XTerm 3650 * reports - some output format copied from XTerm
2793 */ 3651 */
2794 case 11: /* report window state */ 3652 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3655 break;
2798 case 13: /* report window position */ 3656 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3658 XTranslateCoordinates (disp, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3659 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3660 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3661 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3662 break;
2805 case 14: /* report window size (pixels) */ 3663 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3664 XGetWindowAttributes (disp, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3666 break;
3667 case 18: /* report text area size (chars) */
3668 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669 break;
2809 case 18: /* report window size (chars) */ 3670 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3671 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3672 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3673 case 20: /* report icon label */
3674 {
3675 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3676 XGetIconName (disp, parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s);
3679 }
2816 break; 3680 break;
2817 case 21: /* report window title */ 3681 case 21: /* report window title */
3682 {
3683 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3684 XFetchName (disp, parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3686 XFree (s);
3687 }
2820 break; 3688 break;
2821#endif
2822
2823 } 3689 }
2824} 3690}
2825#endif 3691#endif
2826 3692
2827/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
2828/* 3694/*
2829 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3696 * ends_how is terminator used. returned input must be free()'d
2831 */ 3697 */
2832unsigned char * 3698char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3700{
2835 int seen_esc = 0; /* seen escape? */ 3701 unicode_t ch;
3702 bool seen_esc = false;
2836 unsigned int n = 0; 3703 unsigned int n = 0;
2837 unsigned char *s; 3704 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3705
2840 for (; (ch = cmd_getc ());) 3706 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3707 {
2842 if (ch == C0_BEL 3708 if (seen_esc)
2843 || ch == CHAR_ST 3709 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3710 if (ch == 0x5c) /* 7bit ST */
2845 break; 3711 break;
3712 else
3713 return NULL;
3714 }
2846 if (ch == C0_ESC) 3715 else if (ch == C0_ESC)
2847 { 3716 {
2848 seen_esc = 1; 3717 seen_esc = true;
2849 continue; 3718 continue;
2850 } 3719 }
2851 else if (ch == '\t') 3720 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3721 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3722 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3723 return NULL; /* other control character - exit */
2855 if (n < sizeof (string) - 1) 3724
3725 seen_esc = false;
3726
3727 if (n >= STRING_MAX - 1)
3728 // stop at some sane length
3729 return NULL;
3730
3731 if (ch == C0_SYN)
3732 string[n++] = cmd_get8 ();
3733 else
2856 string[n++] = ch; 3734 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3735 }
3736
2859 string[n++] = '\0'; 3737 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3738
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3740
2864 return s; 3741 return rxvt_wcstombs (string);
2865} 3742}
2866 3743
2867/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
2868/* 3745/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3747 */
2871void 3748void
2872rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
2873{ 3750{
2874 unsigned char eh, *s; 3751 char *s;
3752 unicode_t eh;
3753
2875 /* 3754 /*
2876 * Not handled yet 3755 * Not handled yet
2877 */ 3756 */
2878 s = get_to_st (&eh); 3757 s = get_to_st (eh);
2879 if (s) 3758 if (s)
2880 free (s); 3759 free (s);
3760
2881 return; 3761 return;
2882} 3762}
2883 3763
2884/*----------------------------------------------------------------------*/ 3764/*----------------------------------------------------------------------*/
2885/* 3765/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3766 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3767 */
2888void 3768void
2889rxvt_term::process_osc_seq () 3769rxvt_term::process_osc_seq ()
2890{ 3770{
2891 unsigned char ch, eh, *s; 3771 unicode_t ch, eh;
2892 int arg; 3772 int arg;
2893 3773
2894 ch = cmd_getc (); 3774 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
2897 3777
2898 if (ch == ';') 3778 if (ch == ';')
2899 { 3779 {
2900 s = get_to_st (&eh); 3780 char *s = get_to_st (eh);
3781
2901 if (s) 3782 if (s)
2902 { 3783 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
2915 free (s); 3785 free (s);
2916 } 3786 }
2917 } 3787 }
2918} 3788}
3789
3790void
3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792{
3793 if (str[0] == '?' && !str[1])
3794 {
3795 unsigned short r, g, b;
3796 pix_colors_focused[color].get (display, r, g, b);
3797 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3798 }
3799 else
3800 set_window_color (color, str);
3801}
3802
2919/* 3803/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title
2922 * 1 = change iconName
2923 * 2 = change title
2924 * 4 = change color
2925 * 12 = change text color
2926 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour
2928 * 18 = change bold character color
2929 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented)
2931 * 50 = change font
2932 *
2933 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap
2936 * 39 = change default fg color
2937 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
2941 */ 3805 */
2942void 3806void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2944{ 3808{
2945 int changed = 0; 3809 int changed = 0;
2946 int color; 3810 int color;
2947 char *buf, *name; 3811 char *buf, *name;
3812 bool query = str[0] == '?' && !str[1];
3813 int saveop = op;
3814 dDisp;
2948 3815
2949 assert (str != NULL); 3816 assert (str != NULL);
2950 switch (op) 3817 switch (op)
2951 { 3818 {
2952 case XTerm_name: 3819 case XTerm_name:
2953 set_title (str); 3820 set_title (str);
2954 /* FALLTHROUGH */ 3821 /* FALLTHROUGH */
2955 case XTerm_iconName: 3822 case XTerm_iconName:
2956 set_iconName (str); 3823 set_icon_name (str);
2957 break; 3824 break;
2958 case XTerm_title: 3825 case XTerm_title:
2959 set_title (str); 3826 set_title (str);
2960 break; 3827 break;
3828 case XTerm_property:
3829 if (str[0] == '?')
3830 {
3831 Atom prop = display->atom (str + 1);
3832 Atom actual_type;
3833 int actual_format;
3834 unsigned long nitems;
3835 unsigned long bytes_after;
3836 unsigned char *value = 0;
3837 const char *str = "";
3838
3839 if (prop
3840 && XGetWindowProperty (disp, parent[0],
3841 prop, 0, 1<<16, 0, AnyPropertyType,
3842 &actual_type, &actual_format,
3843 &nitems, &bytes_after, &value) == Success
3844 && actual_type != None
3845 && actual_format == 8)
3846 str = (const char *)(value);
3847
3848 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3849
3850 XFree (value);
3851 }
3852 else
3853 {
3854 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3855
3856 if (eq)
3857 {
3858 *eq = 0;
3859 set_utf8_property (display->atom (str), eq + 1);
3860 }
3861 else
3862 XDeleteProperty (disp, parent[0],
3863 display->atom (str));
3864 }
3865 break;
3866
2961 case XTerm_Color: 3867 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3868 for (buf = (char *)str; buf && *buf;)
2963 { 3869 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3870 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3871 break;
3872
2966 *name++ = '\0'; 3873 *name++ = '\0';
2967 color = atoi (buf); 3874 color = atoi (buf);
3875
2968 if (color < 0 || color >= TOTAL_COLORS) 3876 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3877 break;
3878
2970 if ((buf = STRCHR (name, ';')) != NULL) 3879 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3880 *buf++ = '\0';
3881
3882 if (name[0] == '?' && !name[1])
3883 {
3884 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 }
3888 else
2972 set_window_color (color + minCOLOR, name); 3889 set_window_color (color + minCOLOR, name);
2973 } 3890 }
3891 break;
3892 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894 break;
3895 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2974 break; 3897 break;
2975#ifndef NO_CURSORCOLOR 3898#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3899 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3901 break;
2979#endif 3902#endif
2980 case XTerm_Color_pointer: 3903 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3904 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3905 break;
3906 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3908 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3909#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3910 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3911 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2986 break; 3912 break;
2987 case XTerm_Color_UL: 3913 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3915 break;
2990 case XTerm_Color_RV: 3916 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3918 break;
2993#endif 3919 case URxvt_Color_IT:
2994 3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
2995 case XTerm_Menu:
2996 /*
2997 * rxvt_menubar_dispatch () violates the constness of the string,
2998 * so DON'T do it here
2999 */
3000 break; 3921 break;
3922#endif
3923#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3926 check_our_parents ();
3927 if (am_transparent)
3928 want_full_refresh = want_refresh = 1;
3929 break;
3930#endif
3931
3001 case XTerm_Pixmap: 3932 case XTerm_Pixmap:
3002 if (*str != ';') 3933 if (*str != ';')
3003 { 3934 {
3004#if XPM_BACKGROUND 3935#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3936 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3937 set_bgPixmap (str); /* change pixmap */
3007#endif 3938#endif
3008 scr_touch (true); 3939 scr_touch (true);
3009 } 3940 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3941 while ((str = strchr (str, ';')) != NULL)
3011 { 3942 {
3012 str++; 3943 str++;
3013#if XPM_BACKGROUND 3944#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3945 changed += scale_pixmap (str);
3015#endif 3946#endif
3016
3017 } 3947 }
3948
3018 if (changed) 3949 if (changed)
3019 { 3950 {
3020#ifdef XPM_BACKGROUND 3951#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3952 resize_pixmap ();
3022#endif 3953#endif
… …
3028 set_window_color (Color_fg, str); 3959 set_window_color (Color_fg, str);
3029 break; 3960 break;
3030 case XTerm_restoreBG: 3961 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3962 set_window_color (Color_bg, str);
3032 break; 3963 break;
3964
3033 case XTerm_logfile: 3965 case XTerm_logfile:
3966 // TODO, when secure mode?
3967 break;
3968
3969#ifdef MENUBAR
3970 case URxvt_Menu:
3971 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3034 break; 3973 break;
3035 case XTerm_font:
3036 change_font (str);
3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif 3974#endif
3057#if 0 3975#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3976 case XTerm_dumpscreen: /* no error notices */
3059 { 3977 {
3060 int fd; 3978 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3979 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3980 {
3063 scr_dump (fd); 3981 scr_dump (fd);
3064 close (fd); 3982 close (fd);
3065 } 3983 }
3066 } 3984 }
3067 break; 3985 break;
3068#endif 3986#endif
3987 case XTerm_font:
3988 op = URxvt_font;
3989 case URxvt_font:
3990#if ENABLE_STYLES
3991 case URxvt_boldFont:
3992 case URxvt_italicFont:
3993 case URxvt_boldItalicFont:
3994#endif
3995 if (query)
3996 tt_printf ("\33]%d;%-.250s%c", saveop,
3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3998 ? fontset[op - URxvt_font]->fontdesc : "",
3999 resp);
4000 else
4001 {
4002 const char *&res = rs[Rs_font + (op - URxvt_font)];
3069 4003
4004 res = strdup (str);
4005 allocated.push_back ((void *)res);
4006 set_fonts ();
4007 }
4008 break;
4009
4010#if ENABLE_FRILLS
4011 case URxvt_locale:
4012 if (query)
4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014 else
4015 {
4016 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8);
4018 init_xlocale ();
4019 }
4020 break;
4021
4022 case URxvt_view_up:
4023 case URxvt_view_down:
4024 {
4025 int lines = atoi (str);
4026
4027 if (lines)
4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
4029 else
4030 scr_erase_savelines ();
4031 }
4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
4040 break;
4041#endif
3070 } 4042 }
3071} 4043}
3072/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
3073 4045
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4046/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 4054 * so no need for fancy checking
3083 */ 4055 */
3084int 4056int
3085rxvt_term::privcases (int mode, unsigned long bit) 4057rxvt_term::privcases (int mode, unsigned long bit)
3086{ 4058{
3087 int state; 4059 int state;
3088 4060
3089 if (mode == 's') 4061 if (mode == 's')
3090 { 4062 {
3091 SavedModes |= (PrivateModes & bit); 4063 SavedModes |= (priv_modes & bit);
3092 return -1; 4064 return -1;
3093 } 4065 }
3094 else 4066 else
3095 { 4067 {
3096 if (mode == 'r') 4068 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4069 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 4070 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4071 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 4072 PrivMode (state, bit);
3101 } 4073 }
4074
3102 return state; 4075 return state;
3103} 4076}
3104 4077
3105/* we're not using priv _yet_ */ 4078/* we're not using priv _yet_ */
3106void 4079void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4080rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 4081{
3109 unsigned int i, j; 4082 unsigned int i, j;
3110 int state; 4083 int state;
4084
3111 static const struct 4085 static const struct
3112 { 4086 {
3113 const int argval; 4087 const int argval;
3114 const unsigned long bit; 4088 const unsigned long bit;
3115 } 4089 }
4090
3116 argtopriv[] = { 4091 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 4092 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 4093 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 4094 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 4095 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 4096 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 4097 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 4098 { 7, PrivMode_Autowrap },
4099 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 4100 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 4101#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 4102 { menuBar_esc, PrivMode_menuBar },
3127#endif 4103#endif
4104 // 18, 19 printing-related
4105 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 4106#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 4107 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 4108#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 4109 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 4110 { 40, PrivMode_132OK },
4111 // 41 xterm more fixes NYI
4112 // 45 margin bell NYI
4113 // 46 start logging
3134 { 47, PrivMode_Screen }, 4114 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 4115 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 4116#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 4117 { 67, PrivMode_BackSpace },
3138#endif 4118#endif
3139 { 1000, PrivMode_MouseX11 }, 4119 { 1000, PrivMode_MouseX11 },
4120 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4121 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4122 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 4123 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 4124 { 1011, PrivMode_Keypress }, // rxvt extension
4125 // 1035 enable modifiers for alt, numlock NYI
4126 // 1036 send ESC for meta keys NYI
4127 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 4128 { 1047, PrivMode_Screen },
4129 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4130 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4131 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 4132 };
3145 4133
3146 if (nargs == 0) 4134 if (nargs == 0)
3147 return; 4135 return;
3148 4136
… …
3163 state = privcases (mode, argtopriv[j].bit); 4151 state = privcases (mode, argtopriv[j].bit);
3164 break; 4152 break;
3165 } 4153 }
3166 4154
3167 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 4156 switch (arg[i])
3170 { 4157 {
4158#if ENABLE_STYLES
4159 case 1021:
4160 if (mode)
4161 SET_OPTION (Opt_intensityStyles);
4162 else
4163 CLR_OPTION (Opt_intensityStyles);
4164
4165 scr_touch (true);
4166 break;
4167#endif
3171 case 1048: /* alternative cursor save */ 4168 case 1048: /* alternative cursor save */
4169 case 1049:
4170 if (OPTION (Opt_secondaryScreen))
3172 if (mode == 0) 4171 if (mode == 0)
3173 scr_cursor (RESTORE); 4172 scr_cursor (RESTORE);
3174 else if (mode == 1) 4173 else if (mode == 1)
3175 scr_cursor (SAVE); 4174 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 break; 4175 break;
4176 }
4177
4178 if (state >= 0)
4179 /* extra handling for values with valid 0 or 1 state */
4180 switch (arg[i])
4181 {
4182 /* case 1: - application cursor keys */
4183 case 2: /* VT52 mode */
4184 /* oddball mode. should be set regardless of set/reset
4185 * parameter. Return from VT52 mode with an ESC < from
4186 * within VT52 mode
4187 */
4188 PrivMode (1, PrivMode_vt52);
4189 break;
3192 case 3: /* 80/132 */ 4190 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4191 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4192 set_widthheight (((state ? 132 : 80) * fwidth), height);
3195 break; 4193 break;
3196 case 4: /* smooth scrolling */ 4194 case 4: /* smooth scrolling */
3197 if (state) 4195 if (!state)
3198 Options &= ~Opt_jumpScroll; 4196 SET_OPTION (Opt_jumpScroll);
3199 else 4197 else
3200 Options |= Opt_jumpScroll; 4198 CLR_OPTION (Opt_jumpScroll);
3201 break; 4199 break;
3202 case 5: /* reverse video */ 4200 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4201 scr_rvideo_mode (state);
3204 break; 4202 break;
3205 case 6: /* relative/absolute origins */ 4203 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4204 scr_relative_origin (state);
3207 break; 4205 break;
3208 case 7: /* autowrap */ 4206 case 7: /* autowrap */
3209 scr_autowrap (state); 4207 scr_autowrap (state);
3210 break; 4208 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4209 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4210 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4211 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4212 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4213 break;
3216#ifdef menuBar_esc 4214#ifdef menuBar_esc
3217 case menuBar_esc: 4215 case menuBar_esc:
3218#ifdef MENUBAR 4216#ifdef MENUBAR
3219 map_menuBar (state); 4217 map_menuBar (state);
3220#endif 4218#endif
3221 break; 4219 break;
3222#endif 4220#endif
3223#ifdef scrollBar_esc 4221#ifdef scrollBar_esc
3224 case scrollBar_esc: 4222 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4223 if (scrollbar_mapping (state))
3226 { 4224 {
3227 resize_all_windows (0, 0, 0); 4225 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4226 scr_touch (true);
3229 } 4227 }
3230 break; 4228 break;
3231#endif 4229#endif
3232 case 25: /* visible/invisible cursor */ 4230 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4231 scr_cursor_visible (state);
3234 break; 4232 break;
3235 /* case 35: - shift keys */ 4233 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4234 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4235 case 47: /* secondary screen */
3238 scr_change_screen (state); 4236 scr_change_screen (state);
3239 break; 4237 break;
3240 /* case 66: - application key pad */ 4238 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4239 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4240 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4241 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4242 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4243 break;
3246#if 0 4244#if 0
3247 case 1001: 4245 case 1001:
3248 break; /* X11 mouse highlighting */ 4246 break; /* X11 mouse highlighting */
3249#endif 4247#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4248 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 4249 if (!state)
3252 Options &= ~Opt_scrollTtyOutput; 4250 SET_OPTION (Opt_scrollTtyOutput);
3253 else 4251 else
3254 Options |= Opt_scrollTtyOutput; 4252 CLR_OPTION (Opt_scrollTtyOutput);
3255 break; 4253 break;
3256 case 1011: /* scroll to bottom on key press */ 4254 case 1011: /* scroll to bottom on key press */
3257 if (state) 4255 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4256 SET_OPTION (Opt_scrollTtyKeypress);
3259 else 4257 else
3260 Options &= ~Opt_scrollTtyKeypress; 4258 CLR_OPTION (Opt_scrollTtyKeypress);
3261 break; 4259 break;
3262 case 1047: /* secondary screen w/ clearing */ 4260 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4261 if (OPTION (Opt_secondaryScreen))
3264 if (current_screen != PRIMARY) 4262 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4263 scr_erase_screen (2);
3266 scr_change_screen (state); 4264 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4265 break;
4266 case 1049: /* secondary screen w/ clearing first */
4267 scr_change_screen (state);
4268 if (OPTION (Opt_secondaryScreen))
4269 if (current_screen != PRIMARY)
4270 scr_erase_screen (2);
4271 break;
4272 default:
4273 break;
3270 } 4274 }
3271 } 4275 }
3272} 4276}
3273/*}}} */ 4277/*}}} */
3274 4278
3275/*{{{ process sgr sequences */ 4279/*{{{ process sgr sequences */
3276void 4280void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4281rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4282{
3279 unsigned int i; 4283 unsigned int i;
3280 short rendset; 4284 short rendset;
3281 int rendstyle; 4285 int rendstyle;
3282 4286
3283 if (nargs == 0) 4287 if (nargs == 0)
3284 { 4288 {
3285 scr_rendition (0, ~RS_None); 4289 scr_rendition (0, ~RS_None);
3286 return; 4290 return;
3287 } 4291 }
4292
3288 for (i = 0; i < nargs; i++) 4293 for (i = 0; i < nargs; i++)
3289 { 4294 {
3290 rendset = -1; 4295 rendset = -1;
3291 switch (arg[i]) 4296 switch (arg[i])
3292 { 4297 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4299 rendset = 0, rendstyle = ~RS_None;
3295 break; 4300 break;
3296 case 1: 4301 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4302 rendset = 1, rendstyle = RS_Bold;
3298 break; 4303 break;
4304 //case 2: // low intensity
4305 case 3:
4306 rendset = 1, rendstyle = RS_Italic;
4307 break;
3299 case 4: 4308 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4309 rendset = 1, rendstyle = RS_Uline;
3301 break; 4310 break;
3302 case 5: 4311 case 5: // slowly blinking
4312 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4313 rendset = 1, rendstyle = RS_Blink;
3304 break; 4314 break;
4315 //case 6: // scoansi light background
3305 case 7: 4316 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4317 rendset = 1, rendstyle = RS_RVid;
3307 break; 4318 break;
3308 case 22: 4319 case 8:
4320 // invisible. NYI
4321 break;
4322 //case 9: // crossed out
4323 //case 10: // scoansi acs off, primary font
4324 //case 11: // scoansi acs on, first alt font
4325 //case 12: // scoansi acs on, |0x80, second alt font
4326 //...
4327 //case 19: // ninth alt font
4328 //case 20: // gothic
4329 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4330 rendset = 0, rendstyle = RS_Bold;
4331 break;
4332 case 22: // normal intensity
4333 rendset = 0, rendstyle = RS_Bold;
4334 break;
4335 case 23: // disable italic
4336 rendset = 0, rendstyle = RS_Italic;
3310 break; 4337 break;
3311 case 24: 4338 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4339 rendset = 0, rendstyle = RS_Uline;
3313 break; 4340 break;
3314 case 25: 4341 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4342 rendset = 0, rendstyle = RS_Blink;
3316 break; 4343 break;
4344 case 26: // variable spacing (iso 8613)
4345 rendset = 0, rendstyle = RS_Blink;
4346 break;
3317 case 27: 4347 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4348 rendset = 0, rendstyle = RS_RVid;
3319 break; 4349 break;
4350 //case 28: // visible. NYI
4351 //case 29: // not crossed-out
3320 } 4352 }
4353
3321 if (rendset != -1) 4354 if (rendset != -1)
3322 { 4355 {
3323 scr_rendition (rendset, rendstyle); 4356 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4357 continue; /* for (;i;) */
3325 } 4358 }
… …
3332 case 33: 4365 case 33:
3333 case 34: 4366 case 34:
3334 case 35: 4367 case 35:
3335 case 36: 4368 case 36:
3336 case 37: 4369 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4370 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4371 break;
3340#ifdef TTY_256COLOR 4372 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4373 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4374 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4375 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4376 i += 2;
3347 } 4377 }
3348 break; 4378 break;
3349#endif
3350 case 39: /* default fg */ 4379 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4380 scr_color (Color_fg, Color_fg);
3352 break; 4381 break;
3353 4382
3354 case 40: 4383 case 40:
… …
3357 case 43: 4386 case 43:
3358 case 44: 4387 case 44:
3359 case 45: 4388 case 45:
3360 case 46: 4389 case 46:
3361 case 47: 4390 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4391 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4392 break;
3365#ifdef TTY_256COLOR 4393 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4394 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4395 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4396 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4397 i += 2;
3372 } 4398 }
3373 break; 4399 break;
3374#endif
3375 case 49: /* default bg */ 4400 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4401 scr_color (Color_bg, Color_bg);
3377 break; 4402 break;
3378 4403
3379#ifndef NO_BRIGHTCOLOR 4404 //case 50: // not variable spacing
4405
4406#if ENABLE_FRILLS
3380 case 90: 4407 case 90:
3381 case 91: /* set bright fg color */ 4408 case 91: /* set bright fg color */
3382 case 92: 4409 case 92:
3383 case 93: 4410 case 93:
3384 case 94: 4411 case 94:
3385 case 95: 4412 case 95:
3386 case 96: 4413 case 96:
3387 case 97: 4414 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4415 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4416 break;
3391 case 100: 4417 case 100:
3392 case 101: /* set bright bg color */ 4418 case 101: /* set bright bg color */
3393 case 102: 4419 case 102:
3394 case 103: 4420 case 103:
3395 case 104: 4421 case 104:
3396 case 105: 4422 case 105:
3397 case 106: 4423 case 106:
3398 case 107: 4424 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4425 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4426 break;
3402#endif 4427#endif
3403
3404 } 4428 }
3405 } 4429 }
3406} 4430}
3407/*}}} */ 4431/*}}} */
3408 4432
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4433/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4434void
3411rxvt_term::process_graphics () 4435rxvt_term::process_graphics ()
3412{ 4436{
3413 unsigned char ch, cmd = cmd_getc (); 4437 unicode_t ch, cmd = cmd_getc ();
3414 4438
3415 if (cmd == 'Q') 4439 if (cmd == 'Q')
3416 { /* query graphics */ 4440 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4441 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4442 return;
3419 } 4443 }
3420 /* swallow other graphics sequences until terminating ':' */ 4444 /* swallow other graphics sequences until terminating ':' */
3421 do 4445 do
3422 ch = cmd_getc (); 4446 ch = cmd_getc ();
… …
3432 */ 4456 */
3433void 4457void
3434rxvt_term::tt_printf (const char *fmt,...) 4458rxvt_term::tt_printf (const char *fmt,...)
3435{ 4459{
3436 va_list arg_ptr; 4460 va_list arg_ptr;
3437 unsigned char buf[256]; 4461 char buf[256];
3438 4462
3439 va_start (arg_ptr, fmt); 4463 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4464 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4465 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4466 tt_write (buf, strlen (buf));
3443} 4467}
3444 4468
3445/* ---------------------------------------------------------------------- */ 4469/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4470/* Write data to the pty as typed by the user, pasted with the mouse,
3447 * or generated by us in response to a query ESC sequence. 4471 * or generated by us in response to a query ESC sequence.
3448 */ 4472 */
4473const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4474
3449void 4475void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4476rxvt_term::tt_write (const char *data, unsigned int len)
3451{ 4477{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4478 if (pty.pty < 0)
4479 return;
3453 4480
3454 if (len) 4481 if (v_buflen == 0)
4482 {
4483 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4484
4485 if ((unsigned int)written == len)
4486 return;
4487
4488 data += written;
4489 len -= written;
3455 { 4490 }
4491
4492 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4493
4494 memcpy (v_buffer + v_buflen, data, len);
4495 v_buflen += len;
4496
4497 pty_ev.set (EVENT_READ | EVENT_WRITE);
4498}
4499
4500void rxvt_term::pty_write ()
4501{
4502 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4503
4504 if (written > 0)
4505 {
4506 v_buflen -= written;
4507
3456 if (v_buflen == 0) 4508 if (v_buflen == 0)
3457 { 4509 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3460 if ((unsigned int)written == len)
3461 return;
3462
3463 data += written;
3464 len -= written;
3465 }
3466
3467
3468 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3469
3470 memcpy (v_buffer + v_buflen, data, len);
3471 v_buflen += len;
3472 }
3473
3474 for (;;)
3475 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3477
3478 if (written > 0)
3479 {
3480 v_buflen -= written;
3481
3482 if (v_buflen == 0)
3483 {
3484 free (v_buffer); 4510 free (v_buffer);
3485 v_buffer = 0; 4511 v_buffer = 0;
3486 v_buflen = 0; 4512 v_buflen = 0;
3487 4513
3488 pty_ev.set (EVENT_READ); 4514 pty_ev.set (EVENT_READ);
3489 return;
3490 }
3491
3492 memmove (v_buffer, v_buffer + written, v_buflen);
3493 }
3494 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3495 // original code just ignores this...
3496 destroy ();
3497 else
3498 {
3499 pty_ev.set (EVENT_READ | EVENT_WRITE);
3500 return; 4515 return;
3501 } 4516 }
4517
4518 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4519 }
4520 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4521 pty_ev.set (EVENT_READ);
3503} 4522}
3504 4523
3505/*----------------------- end-of-file (C source) -----------------------*/ 4524/*----------------------- end-of-file (C source) -----------------------*/
3506 4525

Diff Legend

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