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

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

Diff Legend

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