ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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