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

Diff Legend

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