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.270 by root, Wed Jan 18 10:31:37 2006 UTC

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

Diff Legend

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