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

Diff Legend

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