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

Diff Legend

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