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

Diff Legend

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