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

Diff Legend

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