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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.228 by root, Mon Jan 2 16:08:34 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);
1534 if (!bypass_keystate) 1800 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1536 /* 1803 /*
1537 * VT window processing of button press 1804 * VT window processing of button press
1538 */ 1805 */
1539 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1540 { 1807 {
1808#if ISO_14755
1809 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 {
1812 iso14755_54 (ev.x, ev.y);
1813 return;
1814 }
1815#endif
1816
1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1817 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1818
1542 if (reportmode) 1819 if (reportmode)
1543 { 1820 {
1544 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */ 1822 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state; 1823 MEvent.state = ev.state;
… …
1575 } 1852 }
1576 else 1853 else
1577 { 1854 {
1578 if (ev.button != MEvent.button) 1855 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0; 1856 MEvent.clicks = 0;
1857
1580 switch (ev.button) 1858 switch (ev.button)
1581 { 1859 {
1582 case Button1: 1860 case Button1:
1861 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */
1863#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask);
1865#else
1866 selection.rect = false;
1867#endif
1868
1583 /* allow shift+left click to extend selection */ 1869 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1585 { 1871 {
1586 if (MEvent.button == Button1 && clickintime) 1872 if (MEvent.button == Button1 && clickintime)
1587 selection_rotate (ev.x, ev.y); 1873 selection_rotate (ev.x, ev.y);
1588 else 1874 else
1589 selection_extend (ev.x, ev.y, 1); 1875 selection_extend (ev.x, ev.y, 1);
… …
1604 case Button3: 1890 case Button3:
1605 if (MEvent.button == Button3 && clickintime) 1891 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y); 1892 selection_rotate (ev.x, ev.y);
1607 else 1893 else
1608 selection_extend (ev.x, ev.y, 1); 1894 selection_extend (ev.x, ev.y, 1);
1895
1609 MEvent.button = Button3; 1896 MEvent.button = Button3;
1610 break; 1897 break;
1611 } 1898 }
1612 } 1899 }
1900
1613 MEvent.time = ev.time; 1901 MEvent.time = ev.time;
1614 return; 1902 return;
1615 } 1903 }
1616 1904
1617 /* 1905 /*
… …
1683 upordown = 1; /* down */ 1971 upordown = 1; /* down */
1684 } 1972 }
1685 if (upordown) 1973 if (upordown)
1686 { 1974 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1976 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1689#endif 1977#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1)) 1978 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 { 1979 {
1692 if (upordown < 0) 1980 if (upordown < 0)
1693 scrollBar.setUp (); 1981 scrollBar.setUp ();
… …
1709 break; 1997 break;
1710 case R_SB_ALIGN_BOTTOM: 1998 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top; 1999 csrO = scrollBar.bot - scrollBar.top;
1712 break; 2000 break;
1713 } 2001 }
2002
1714 if (scrollBar.style == R_SB_XTERM 2003 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y) 2004 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y)) 2005 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO, 2006 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1718 scrollbar_size ()); 2007
1719 scrollBar.setMotion (); 2008 scrollBar.setMotion ();
1720 break; 2009 break;
1721 2010
1722 case Button1: 2011 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2012 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1727 case Button3: 2016 case Button3:
1728 if (scrollBar.style != R_SB_XTERM) 2017 if (scrollBar.style != R_SB_XTERM)
1729 { 2018 {
1730 if (scrollbar_above_slider (ev.y)) 2019 if (scrollbar_above_slider (ev.y))
1731# ifdef RXVT_SCROLL_FULL 2020# ifdef RXVT_SCROLL_FULL
1732 scr_page (UP, TermWin.nrow - 1); 2021 scr_page (UP, nrow - 1);
1733# else 2022# else
1734 scr_page (UP, TermWin.nrow / 4); 2023 scr_page (UP, nrow / 4);
1735# endif 2024# endif
1736 else if (scrollbar_below_slider (ev.y)) 2025 else if (scrollbar_below_slider (ev.y))
1737# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1738 scr_page (DN, TermWin.nrow - 1); 2027 scr_page (DN, nrow - 1);
1739# else 2028# else
1740 scr_page (DN, TermWin.nrow / 4); 2029 scr_page (DN, nrow / 4);
1741# endif 2030# endif
1742 else 2031 else
1743 scrollBar.setMotion (); 2032 scrollBar.setMotion ();
1744 } 2033 }
1745 else 2034 else
1746 { 2035 {
1747 scr_page ((ev.button == Button1 ? DN : UP), 2036 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow 2037 (nrow
1749 * scrollbar_position (ev.y) 2038 * scrollbar_position (ev.y)
1750 / scrollbar_size ())); 2039 / scrollbar_size ()));
1751 } 2040 }
2041
1752 break; 2042 break;
1753 } 2043 }
1754 } 2044 }
1755 return; 2045 return;
1756 } 2046 }
… …
1768{ 2058{
1769 int reportmode = 0; 2059 int reportmode = 0;
1770 2060
1771 csrO = 0; /* reset csr Offset */ 2061 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate) 2062 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2063 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 2064
1775 if (scrollbar_isUpDn ()) 2065 if (scrollbar_isUpDn ())
1776 { 2066 {
1777 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
1778 scrollbar_show (0); 2068 scrollbar_show (0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 refresh_type &= ~SMOOTH_REFRESH; 2070 refresh_type &= ~SMOOTH_REFRESH;
1781#endif 2071#endif
1782
1783 } 2072 }
2073
1784#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0; 2075 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop();
1786#endif 2077#endif
2078
1787 if (ev.window == TermWin.vt) 2079 if (ev.window == vt)
1788 { 2080 {
2081#if ISO_14755
2082 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return;
2085#endif
1789 if (reportmode) 2086 if (reportmode)
1790 { 2087 {
1791 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1807 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1808 mouse_report (ev); 2105 mouse_report (ev);
1809#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1810 return; 2107 return;
1811 } 2108 }
2109
1812 /* 2110 /*
1813 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
1814 * when overriding mouse reporting 2112 * when overriding mouse reporting
1815 */ 2113 */
1816 if (PrivateModes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
1817 && bypass_keystate 2115 && bypass_keystate
1818 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
1819 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
1820 2118
1821 switch (ev.button) 2119 switch (ev.button)
… …
1832 case Button5: 2130 case Button5:
1833 { 2131 {
1834 int i; 2132 int i;
1835 page_dirn v; 2133 page_dirn v;
1836 2134
1837 v = (ev.button == Button4) ? UP : DN; 2135 v = ev.button == Button4 ? UP : DN;
2136
1838 if (ev.state & ShiftMask) 2137 if (ev.state & ShiftMask)
1839 i = 1; 2138 i = 1;
1840 else if ((Options & Opt_mouseWheelScrollPage)) 2139 else if (OPTION (Opt_mouseWheelScrollPage))
1841 i = TermWin.nrow - 1; 2140 i = nrow - 1;
1842 else 2141 else
1843 i = 5; 2142 i = 5;
2143
1844# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
1845 if (ev.state & ControlMask) 2145 if (ev.state & ControlMask)
1846 { 2146 {
1847 mouse_slip_wheel_speed += (v ? -1 : 1); 2147 mouse_slip_wheel_speed += v ? -1 : 1;
2148 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2149 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2150
2151 if (slip_wheel_ev.at < NOW)
1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2152 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2153
2154 slip_wheel_ev.start ();
1849 } 2155 }
2156 else
2157 {
1850# endif 2158# endif
1851# ifdef JUMP_MOUSE_WHEEL 2159# 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); 2160 scr_page (v, i);
1859 scr_refresh (SMOOTH_REFRESH); 2161 scr_refresh (SMOOTH_REFRESH);
1860 scrollbar_show (1); 2162 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING
1861 } 2172 }
1862# endif 2173#endif
1863
1864 } 2174 }
1865 break; 2175 break;
1866#endif 2176#endif
1867
1868 } 2177 }
1869 } 2178 }
1870#ifdef MENUBAR 2179#ifdef MENUBAR
1871 else if (isMenuBarWindow (ev.window)) 2180 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev); 2181 menubar_control (ev);
1873#endif 2182#endif
1874} 2183}
1875 2184
1876
1877#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2186#if TINTING
2187/* taken from aterm-0.4.2 */
2188
2189typedef uint32_t RUINT32T;
2190
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{
2193 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
2199
2200 Visual *visual = display->visual;
2201
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203
2204 /* for convenience */
2205 mask_r = visual->red_mask;
2206 mask_g = visual->green_mask;
2207 mask_b = visual->blue_mask;
2208
2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2282 } else {
2283 if (shade < 0) shade = 0;
2284 if (shade > 100) shade = 100;
2285
2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2287
2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2291 }
2292
2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2295 {
2296 unsigned int tmp;
2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 16:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0xf800)>>11] |
2364 lookup_g[(*p & 0x07e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xff0000)>>16] |
2403 lookup_g[(*p & 0x00ff00)>> 8] |
2404 lookup_b[(*p & 0x0000ff)] |
2405 (*p & ~0xffffff);
2406 }
2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 }
2412
2413 free (lookup);
2414}
2415#endif
2416
1878/* 2417/*
1879 * Check our parents are still who we think they are. 2418 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 2419 * Do transparency updates if required
1881 */ 2420 */
1882int 2421int
1883rxvt_term::check_our_parents () 2422rxvt_term::check_our_parents ()
1884{ 2423{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 2424 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 2425 unsigned long nitems, bytes_after;
1887 Atom atype; 2426 Atom atype;
1888 unsigned char *prop = NULL; 2427 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 2428 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 2429 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
1892 2432
1893 pchanged = 0; 2433 pchanged = 0;
1894 2434
1895 if (! (Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1896 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1897 2437
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1900 2440
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
2442
1902 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1903 { 2444 {
1904 if (am_transparent) 2445 if (am_transparent)
1905 { 2446 {
1906 pchanged = 1; 2447 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1910 } 2450 }
2451
1911 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1912 } 2453 }
1913 2454
1914 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
1915 XSync (display->display, False); 2456 XSync (disp, False);
1916 2457
1917 /* 2458 /*
1918 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1920 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
1921 */ 2462 */
1922 i = (xa[XA_XROOTPMAPID] != 0 2463 i = (xa[XA_XROOTPMAP_ID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 2466 &nitems, &bytes_after, &prop) == Success);
2467
1926 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
1927 have_pixmap = 0; 2479 have_pixmap = 0;
1928 else 2480 else
1929 { 2481 {
1930 have_pixmap = 1; 2482 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2483 rootpixmap = *(Pixmap *)prop;
1932 XFree (prop); 2484 XFree (prop);
1933 } 2485 }
2486
1934 if (have_pixmap) 2487 if (have_pixmap)
1935 { 2488 {
1936 /* 2489 /*
1937 * Copy display->root pixmap transparency 2490 * Copy display->root pixmap transparency
1938 */ 2491 */
… …
1941 Window cr; 2494 Window cr;
1942 XImage *image; 2495 XImage *image;
1943 GC gc; 2496 GC gc;
1944 XGCValues gcvalue; 2497 XGCValues gcvalue;
1945 2498
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2503 nx = ny = 0;
1951 2504
1952 if (sx < 0) 2505 if (sx < 0)
… …
1961 nh += sy; 2514 nh += sy;
1962 ny = -sy; 2515 ny = -sy;
1963 sy = 0; 2516 sy = 0;
1964 } 2517 }
1965 2518
1966 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
1967 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
1968 allowedxerror = -1; 2523 allowedxerror = -1;
1969 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1970 ZPixmap); 2525
1971 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1972 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
1973 allowedxerror = 0; 2528 allowedxerror = 0;
2529
1974 if (image == NULL) 2530 if (image == NULL)
1975 { 2531 {
1976 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
1977 { 2533 {
1978 pchanged = 1; 2534 pchanged = 1;
1979 if (TermWin.pixmap != None) 2535 if (pixmap != None)
1980 { 2536 {
1981 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
1982 TermWin.pixmap = None; 2538 pixmap = None;
1983 } 2539 }
1984 } 2540 }
2541
1985 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
1986 } 2543 }
1987 else 2544 else
1988 { 2545 {
1989 if (TermWin.pixmap != None) 2546 if (pixmap != None)
1990 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2556
2557 ShadeXImage (display, image, shade, rm, gm, bm);
2558 }
2559#endif
2560
1991 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
1992 (unsigned int)szHint.width,
1993 (unsigned int)szHint.height, 2562 szHint.width, szHint.height, image->depth);
1994 (unsigned int)image->depth);
1995 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1996 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
1997 nx, ny, (unsigned int)image->width,
1998 (unsigned int)image->height); 2565 nx, ny, image->width, image->height);
1999 XFreeGC (display->display, gc); 2566 XFreeGC (disp, gc);
2000 XDestroyImage (image); 2567 XDestroyImage (image);
2001 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2002 TermWin.pixmap); 2569 XClearWindow (disp, parent[0]);
2570
2003 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2004 pchanged = 1; 2572 pchanged = 1;
2573
2005 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2006 } 2575 }
2007 } 2576 }
2008 2577
2009 if (!am_pixmap_trans) 2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2010 { 2581 {
2011 unsigned int n; 2582 unsigned int n;
2012 /* 2583 /*
2013 * InheritPixmap transparency 2584 * InheritPixmap transparency
2014 */ 2585 */
2015 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2016 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2017 i++)
2018 { 2587 {
2019 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2020 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2021 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2022 XFree (list); 2591 XFree (list);
2023 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2592
2024 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2025 { 2594 {
2026 if (oldp != None) 2595 if (oldp != None)
2027 pchanged = 1; 2596 pchanged = 1;
2597
2028 break; 2598 break;
2029 } 2599 }
2600
2030 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2031 pchanged = 1; 2602 pchanged = 1;
2032 } 2603 }
2033 2604
2034 n = 0; 2605 n = 0;
2035 2606
2036 if (pchanged) 2607 if (pchanged)
2037 { 2608 {
2038 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2039 { 2610 {
2040 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2611 XGetWindowAttributes (disp, parent[n], &wattr);
2041 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2042 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2043 { 2613 {
2044 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2045 break; 2615 break;
2046 } 2616 }
2047 } 2617 }
2048 } 2618 }
2049 2619
2050 if (n > (int) (sizeof (TermWin.parent) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2051 / sizeof (TermWin.parent[0])))
2052 { 2621 {
2053 D_X ((stderr, "InheritPixmap Turning off")); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2054 XSetWindowBackground (display->display, TermWin.parent[0], 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2055 PixColors[Color_fg]);
2056 XSetWindowBackground (display->display, TermWin.vt,
2057 PixColors[Color_bg]);
2058 am_transparent = 0; 2624 am_transparent = 0;
2059 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2060 } 2626 }
2061 else 2627 else
2062 { 2628 {
2629#if WAIT_FOR_WM
2063 /* wait (an arbitrary period) for the WM to do its thing 2630 /* wait (an arbitrary period) for the WM to do its thing
2064 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
2065# ifdef HAVE_NANOSLEEP
2066 struct timespec rqt;
2067
2068 rqt.tv_sec = 1;
2069 rqt.tv_nsec = 0;
2070 nanosleep (&rqt, NULL);
2071# else
2072 sleep (1); 2632 sleep (1);
2073# endif 2633#endif
2074 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2075 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2076 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2635 {
2077 ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2078 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2637 XClearWindow (disp, parent[n]);
2079 ParentRelative); 2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2080 am_transparent = 1; 2641 am_transparent = 1;
2081 } 2642 }
2082 2643
2083 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2084 TermWin.parent[i] = None; 2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2085 } 2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2086 return pchanged; 2662 return pchanged;
2087} 2663}
2088#endif 2664#endif
2089 2665
2090/*}}} */ 2666/*}}} */
2667
2668bool
2669rxvt_term::cmd_parse ()
2670{
2671 bool flag = false;
2672 unicode_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here
2674
2675 for (;;)
2676 {
2677 if (ch == NOCHAR)
2678 {
2679 seq_begin = cmdbuf_ptr;
2680 ch = next_char ();
2681 }
2682
2683 if (ch == NOCHAR) // TODO: improve
2684 break;
2685
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 {
2688 if (!seen_input)
2689 {
2690 seen_input = 1;
2691 // many badly-written programs (e.g. jed) contain a race condition:
2692 // they first read the screensize and then install a SIGWINCH handler.
2693 // some window managers resize the window early, and these programs
2694 // then sometimes get the size wrong.
2695 // unfortunately other programs are even more buggy and dislike
2696 // being sent SIGWINCH, so only do it when we were in fact being
2697 // resized.
2698 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH);
2700 }
2701
2702 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ];
2704 bool refreshnow = false;
2705 int nlines = 0;
2706 unicode_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ);
2708
2709 for (;;)
2710 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break;
2713
2714 *str++ = ch;
2715
2716 if (ch == C0_LF || str >= eol)
2717 {
2718 if (ch == C0_LF)
2719 nlines++;
2720
2721 refresh_count++;
2722
2723 if (!OPTION (Opt_jumpScroll)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 {
2726 refreshnow = true;
2727 refresh_count = 0;
2728 ch = NOCHAR;
2729 break;
2730 }
2731
2732 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1)
2734 {
2735 scr_add_lines (buf, nlines, str - buf);
2736 nlines = 0;
2737 str = buf;
2738 eol = str + min (ncol, UBUFSIZ);
2739 }
2740
2741 if (str >= eol)
2742 {
2743 if (eol >= buf + UBUFSIZ)
2744 {
2745 ch = NOCHAR;
2746 break;
2747 }
2748 else
2749 eol = min (eol + ncol, buf + UBUFSIZ);
2750 }
2751
2752 }
2753
2754 seq_begin = cmdbuf_ptr;
2755 ch = next_char ();
2756 }
2757
2758 scr_add_lines (buf, nlines, str - buf);
2759
2760 /*
2761 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which
2764 * is incremented here because we must be doing flat-out scrolling.
2765 */
2766 if (refreshnow)
2767 {
2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2769 refresh_limit++;
2770 else
2771 {
2772 flag = true;
2773 scr_refresh (refresh_type);
2774 flush_ev.stop ();
2775 }
2776 }
2777
2778 }
2779 else
2780 {
2781 try
2782 {
2783 process_nonprinting (ch);
2784 }
2785 catch (const class out_of_input &o)
2786 {
2787 // we ran out of input, retry later
2788 cmdbuf_ptr = seq_begin;
2789 break;
2790 }
2791
2792 ch = NOCHAR;
2793 }
2794 }
2795
2796 return flag;
2797}
2798
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character
2809unicode_t
2810rxvt_term::next_char ()
2811{
2812 while (cmdbuf_ptr < cmdbuf_endp)
2813 {
2814 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++;
2817
2818 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820
2821 if (len == (size_t)-2)
2822 {
2823 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp;
2825 break;
2826 }
2827
2828 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830
2831 // assume wchar == unicode
2832 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK;
2834 }
2835
2836 return NOCHAR;
2837}
2838
2839/* rxvt_cmd_getc () - Return next input character */
2840/*
2841 * Return the next input character after first passing any keyboard input
2842 * to the command.
2843 */
2844unicode_t
2845rxvt_term::cmd_getc ()
2846{
2847 unicode_t c = next_char ();
2848
2849 if (c == NOCHAR)
2850 throw out_of_input;
2851
2852 return c;
2853}
2854
2855unicode_t
2856rxvt_term::cmd_get8 ()
2857{
2858 unicode_t c = next_octet ();
2859
2860 if (c == NOCHAR)
2861 throw out_of_input;
2862
2863 return c;
2864}
2091 2865
2092/*{{{ print pipe */ 2866/*{{{ print pipe */
2093/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2094#ifdef PRINTPIPE 2868#ifdef PRINTPIPE
2095FILE * 2869FILE *
2096rxvt_term::popen_printer () 2870rxvt_term::popen_printer ()
2097{ 2871{
2098 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2872 FILE *stream = popen (rs[Rs_print_pipe], "w");
2099 2873
2100 if (stream == NULL) 2874 if (stream == NULL)
2101 rxvt_print_error ("can't open printer pipe"); 2875 rxvt_warn ("can't open printer pipe, not printing.\n");
2876
2102 return stream; 2877 return stream;
2103} 2878}
2104 2879
2105int 2880int
2106rxvt_term::pclose_printer (FILE *stream) 2881rxvt_term::pclose_printer (FILE *stream)
2107{ 2882{
2108 fflush (stream); 2883 fflush (stream);
2109 /* pclose () reported not to work on SunOS 4.1.3 */
2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2111 /* pclose works provided SIGCHLD handler uses waitpid */
2112 return pclose (stream); /* return fclose (stream); */
2113# else
2114 return pclose (stream); 2884 return pclose (stream);
2115# endif
2116} 2885}
2117 2886
2118/* 2887/*
2119 * simulate attached vt100 printer 2888 * simulate attached vt100 printer
2120 */ 2889 */
2121void 2890void
2122rxvt_term::process_print_pipe () 2891rxvt_term::process_print_pipe ()
2123{ 2892{
2124 int done; 2893 int done;
2125 FILE *fd; 2894 FILE *fd;
2126 2895
2127 if ((fd = popen_printer ()) == NULL) 2896 if ((fd = popen_printer ()) == NULL)
2128 return; 2897 return;
2129 2898
2130 /* 2899 /*
2131 * Send all input to the printer until either ESC[4i or ESC[?4i 2900 * Send all input to the printer until either ESC[4i or ESC[?4i
2132 * is received. 2901 * is received.
2133 */ 2902 */
2134 for (done = 0; !done;) 2903 for (done = 0; !done;)
2135 { 2904 {
2136 unsigned char buf[8]; 2905 unsigned char buf[8];
2137 unsigned char ch; 2906 unicode_t ch;
2138 unsigned int i, len; 2907 unsigned int i, len;
2139 2908
2140 if ((ch = cmd_getc ()) != C0_ESC) 2909 if ((ch = cmd_getc ()) != C0_ESC)
2141 { 2910 {
2142 if (putc (ch, fd) == EOF) 2911 if (putc (ch, fd) == EOF)
2143 break; /* done = 1 */ 2912 break; /* done = 1 */
… …
2158 { 2927 {
2159 if ((buf[len++] = cmd_getc ()) == 'i') 2928 if ((buf[len++] = cmd_getc ()) == 'i')
2160 break; /* done = 1 */ 2929 break; /* done = 1 */
2161 } 2930 }
2162 } 2931 }
2932
2163 for (i = 0; i < len; i++) 2933 for (i = 0; i < len; i++)
2164 if (putc (buf[i], fd) == EOF) 2934 if (putc (buf[i], fd) == EOF)
2165 { 2935 {
2166 done = 1; 2936 done = 1;
2167 break; 2937 break;
2168 } 2938 }
2169 } 2939 }
2170 } 2940 }
2941
2171 pclose_printer (fd); 2942 pclose_printer (fd);
2172} 2943}
2173#endif /* PRINTPIPE */ 2944#endif /* PRINTPIPE */
2174/*}}} */ 2945/*}}} */
2175 2946
2176/* *INDENT-OFF* */ 2947/* *INDENT-OFF* */
2177enum { 2948enum {
2178 C1_40 = 0x40, 2949 C1_40 = 0x40,
2179 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2950 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2180 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2951 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2181 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2952 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2182 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2953 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2183}; 2954};
2184/* *INDENT-ON* */ 2955/* *INDENT-ON* */
2185 2956
2186/*{{{ process non-printing single characters */ 2957/*{{{ process non-printing single characters */
2187void 2958void
2188rxvt_term::process_nonprinting (unsigned char ch) 2959rxvt_term::process_nonprinting (unicode_t ch)
2189{ 2960{
2190 switch (ch) 2961 switch (ch)
2191 { 2962 {
2963 case C0_ESC:
2964 process_escape_seq ();
2965 break;
2192 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2193 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2194 tt_write (
2195 (const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2196 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2197 else 2970 else
2198 tt_write ((unsigned char *)VT100_ANS, 2971 tt_write ((unsigned char *)VT100_ANS,
2199 (unsigned int)STRLEN (VT100_ANS)); 2972 (unsigned int)strlen (VT100_ANS));
2200 break; 2973 break;
2201 case C0_BEL: /* bell */ 2974 case C0_BEL: /* bell */
2202 scr_bell (); 2975 scr_bell ();
2203 break; 2976 break;
2204 case C0_BS: /* backspace */ 2977 case C0_BS: /* backspace */
… …
2219 scr_charset_choose (1); 2992 scr_charset_choose (1);
2220 break; 2993 break;
2221 case C0_SI: /* shift in - acs */ 2994 case C0_SI: /* shift in - acs */
2222 scr_charset_choose (0); 2995 scr_charset_choose (0);
2223 break; 2996 break;
2997
2998#ifdef EIGHT_BIT_CONTROLS
2999 // 8-bit controls
3000 case 0x90: /* DCS */
3001 process_dcs_seq ();
3002 break;
3003 case 0x9b: /* CSI */
3004 process_csi_seq ();
3005 break;
3006 case 0x9d: /* CSI */
3007 process_osc_seq ();
3008 break;
3009#endif
2224 } 3010 }
2225} 3011}
2226/*}}} */ 3012/*}}} */
2227 3013
2228 3014
2229/*{{{ process VT52 escape sequences */ 3015/*{{{ process VT52 escape sequences */
2230void 3016void
2231rxvt_term::process_escape_vt52 (unsigned char ch) 3017rxvt_term::process_escape_vt52 (unicode_t ch)
2232{ 3018{
2233 int row, col; 3019 int row, col;
2234 3020
2235 switch (ch) 3021 switch (ch)
2236 { 3022 {
… …
2288 3074
2289/*{{{ process escape sequences */ 3075/*{{{ process escape sequences */
2290void 3076void
2291rxvt_term::process_escape_seq () 3077rxvt_term::process_escape_seq ()
2292{ 3078{
2293 unsigned char ch = cmd_getc (); 3079 unicode_t ch = cmd_getc ();
2294 3080
2295 if (PrivateModes & PrivMode_vt52) 3081 if (priv_modes & PrivMode_vt52)
2296 { 3082 {
2297 process_escape_vt52 (ch); 3083 process_escape_vt52 (ch);
2298 return; 3084 return;
2299 } 3085 }
2300 3086
… …
2315 scr_charset_set (2, (unsigned int)cmd_getc ()); 3101 scr_charset_set (2, (unsigned int)cmd_getc ());
2316 break; 3102 break;
2317 case '+': 3103 case '+':
2318 scr_charset_set (3, (unsigned int)cmd_getc ()); 3104 scr_charset_set (3, (unsigned int)cmd_getc ());
2319 break; 3105 break;
2320#ifndef NO_FRILLS 3106#if ENABLE_FRILLS
2321 case '6': 3107 case '6':
2322 scr_backindex (); 3108 scr_backindex ();
2323 break; 3109 break;
2324#endif 3110#endif
2325 case '7': 3111 case '7':
2326 scr_cursor (SAVE); 3112 scr_cursor (SAVE);
2327 break; 3113 break;
2328 case '8': 3114 case '8':
2329 scr_cursor (RESTORE); 3115 scr_cursor (RESTORE);
2330 break; 3116 break;
2331#ifndef NO_FRILLS 3117#if ENABLE_FRILLS
2332 case '9': 3118 case '9':
2333 scr_forwardindex (); 3119 scr_forwardindex ();
2334 break; 3120 break;
2335#endif 3121#endif
2336 case '=': 3122 case '=':
… …
2346 break; 3132 break;
2347 3133
2348 /* 8.3.87: NEXT LINE */ 3134 /* 8.3.87: NEXT LINE */
2349 case C1_NEL: /* ESC E */ 3135 case C1_NEL: /* ESC E */
2350 { 3136 {
2351 uint32_t nlcr[] = { '\n', '\r' }; 3137 unicode_t nlcr[] = { C0_LF, C0_CR };
2352 scr_add_lines (nlcr, 1, 2); 3138 scr_add_lines (nlcr, 1, 2);
2353 } 3139 }
2354 break; 3140 break;
2355 3141
2356 /* kidnapped escape sequence: Should be 8.3.48 */ 3142 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2367 case C1_RI: /* ESC M */ 3153 case C1_RI: /* ESC M */
2368 scr_index (DN); 3154 scr_index (DN);
2369 break; 3155 break;
2370 3156
2371 /* 8.3.142: SINGLE-SHIFT TWO */ 3157 /* 8.3.142: SINGLE-SHIFT TWO */
2372 /*case C1_SS2: scr_single_shift (2); break; */ 3158 /*case C1_SS2: scr_single_shift (2); break; */
2373 3159
2374 /* 8.3.143: SINGLE-SHIFT THREE */ 3160 /* 8.3.143: SINGLE-SHIFT THREE */
2375 /*case C1_SS3: scr_single_shift (3); break; */ 3161 /*case C1_SS3: scr_single_shift (3); break; */
2376 3162
2377 /* 8.3.27: DEVICE CONTROL STRING */ 3163 /* 8.3.27: DEVICE CONTROL STRING */
2378 case C1_DCS: /* ESC P */ 3164 case C1_DCS: /* ESC P */
2379 process_dcs_seq (); 3165 process_dcs_seq ();
2380 break; 3166 break;
… …
2395 process_osc_seq (); 3181 process_osc_seq ();
2396 break; 3182 break;
2397 3183
2398 /* 8.3.106: RESET TO INITIAL STATE */ 3184 /* 8.3.106: RESET TO INITIAL STATE */
2399 case 'c': 3185 case 'c':
3186 mbstate.reset ();
2400 scr_poweron (); 3187 scr_poweron ();
2401 scrollbar_show (1); 3188 scrollbar_show (1);
2402 break; 3189 break;
2403 3190
2404 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3191 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2416 3203
2417/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3204/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2418/* *INDENT-OFF* */ 3205/* *INDENT-OFF* */
2419enum { 3206enum {
2420 CSI_ICH = 0x40, 3207 CSI_ICH = 0x40,
2421 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3208 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2422 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3209 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2423 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3210 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2424 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3211 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2425 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3212 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2426 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3213 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2441 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3228 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2442 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3229 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2443 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3230 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2444 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3231 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2445 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3232 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2446 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3233 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2447 }; 3234 };
2448/* *INDENT-ON* */ 3235/* *INDENT-ON* */
2449 3236
2450void 3237void
2451rxvt_term::process_csi_seq () 3238rxvt_term::process_csi_seq ()
2452{ 3239{
2453 unsigned char ch, priv, i; 3240 unicode_t ch, priv, i;
2454 unsigned int nargs, p; 3241 unsigned int nargs, p;
2455 int n, ndef; 3242 int n, ndef;
2456 int arg[ESC_ARGS]; 3243 int arg[ESC_ARGS];
2457 3244
2458 for (nargs = ESC_ARGS; nargs > 0;) 3245 for (nargs = ESC_ARGS; nargs > 0;)
2459 arg[--nargs] = 0; 3246 arg[--nargs] = 0;
2460 3247
2461 priv = 0; 3248 priv = 0;
… …
2463 if (ch >= '<' && ch <= '?') 3250 if (ch >= '<' && ch <= '?')
2464 { /* '<' '=' '>' '?' */ 3251 { /* '<' '=' '>' '?' */
2465 priv = ch; 3252 priv = ch;
2466 ch = cmd_getc (); 3253 ch = cmd_getc ();
2467 } 3254 }
3255
2468 /* read any numerical arguments */ 3256 /* read any numerical arguments */
2469 for (n = -1; ch < CSI_ICH; ) 3257 for (n = -1; ch < CSI_ICH; )
2470 { 3258 {
2471 if (isdigit (ch)) 3259 if (isdigit (ch))
2472 { 3260 {
… …
2479 { 3267 {
2480 if (nargs < ESC_ARGS) 3268 if (nargs < ESC_ARGS)
2481 arg[nargs++] = n; 3269 arg[nargs++] = n;
2482 n = -1; 3270 n = -1;
2483 } 3271 }
2484 else if (ch == '\b') 3272 else if (IS_CONTROL (ch))
2485 {
2486 scr_backspace ();
2487 }
2488 else if (ch == C0_ESC)
2489 {
2490 process_escape_seq ();
2491 return;
2492 }
2493 else if (ch < ' ')
2494 {
2495 process_nonprinting (ch); 3273 process_nonprinting (ch);
2496 } 3274
2497 ch = cmd_getc (); 3275 ch = cmd_getc ();
2498 } 3276 }
2499 3277
2500 if (ch > CSI_7F) 3278 if (ch > CSI_7F)
2501 return; 3279 return;
… …
2523 { 3301 {
2524 switch (priv) 3302 switch (priv)
2525 { 3303 {
2526 case '>': 3304 case '>':
2527 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
2528 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2529 break; 3307 break;
2530 case '?': 3308 case '?':
2531 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2532 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
2533 break; 3311 break;
… …
2638 3416
2639 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2640 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
2641 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
2642 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2643 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2644 break; 3422 break;
2645 3423
2646 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2647 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write ((const unsigned char *)VT100_ANS,
2648 (unsigned int) (sizeof (VT100_ANS) - 1)); 3426 (unsigned int) (sizeof (VT100_ANS) - 1));
2649 break; 3427 break;
2650 3428
2651 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2652 process_sgr_mode (nargs, arg); 3430 process_sgr_mode (nargs, arg);
2653 break; 3431 break;
… …
2659 tt_printf ("\033[0n"); 3437 tt_printf ("\033[0n");
2660 break; 3438 break;
2661 case 6: /* CPR requested */ 3439 case 6: /* CPR requested */
2662 scr_report_position (); 3440 scr_report_position ();
2663 break; 3441 break;
2664#if defined (ENABLE_DISPLAY_ANSWER)
2665 case 7: /* unofficial extension */ 3442 case 7: /* unofficial extension */
3443 if (OPTION (Opt_insecure))
2666 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3444 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2667 break; 3445 break;
2668#endif
2669 case 8: /* unofficial extension */ 3446 case 8: /* unofficial extension */
2670 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2671 break; 3448 break;
2672 } 3449 }
2673 break; 3450 break;
2674 3451
2675 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3452 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2708 break; 3485 break;
2709 3486
2710 case CSI_RM: /* 8.3.107: RESET MODE */ 3487 case CSI_RM: /* 8.3.107: RESET MODE */
2711 if (arg[0] == 4) 3488 if (arg[0] == 4)
2712 scr_insert_mode (0); 3489 scr_insert_mode (0);
3490 else if (arg[0] == 20)
3491 priv_modes &= ~PrivMode_LFNL;
2713 break; 3492 break;
2714 3493
2715 case CSI_SM: /* 8.3.126: SET MODE */ 3494 case CSI_SM: /* 8.3.126: SET MODE */
2716 if (arg[0] == 4) 3495 if (arg[0] == 4)
2717 scr_insert_mode (1); 3496 scr_insert_mode (1);
3497 else if (arg[0] == 20)
3498 priv_modes |= PrivMode_LFNL;
2718 break; 3499 break;
2719 3500
2720 /* 3501 /*
2721 * PRIVATE USE beyond this point. All CSI_7? sequences here 3502 * PRIVATE USE beyond this point. All CSI_7? sequences here
2722 */ 3503 */
… …
2734 break; 3515 break;
2735 case CSI_75: 3516 case CSI_75:
2736 scr_cursor (RESTORE); 3517 scr_cursor (RESTORE);
2737 break; 3518 break;
2738 3519
2739#ifndef NO_FRILLS 3520#if ENABLE_FRILLS
2740 case CSI_74: 3521 case CSI_74:
2741 process_window_ops (arg, nargs); 3522 process_window_ops (arg, nargs);
2742 break; 3523 break;
2743#endif 3524#endif
2744 3525
2745 case CSI_78: /* DECREQTPARM */ 3526 case CSI_78: /* DECREQTPARM */
2746 if (arg[0] == 0 || arg[0] == 1) 3527 if (arg[0] == 0 || arg[0] == 1)
2747 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3528 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2748 /* FALLTHROUGH */ 3529 break;
2749 3530
2750 default: 3531 default:
2751 break; 3532 break;
2752 } 3533 }
2753} 3534}
2754/*}}} */ 3535/*}}} */
2755 3536
2756#ifndef NO_FRILLS 3537#if ENABLE_FRILLS
2757/* ARGSUSED */ 3538/* ARGSUSED */
2758void 3539void
2759rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3540rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2760{ 3541{
2761 int x, y; 3542 int x, y;
2762#if 0
2763 char *s;
2764#endif
2765 XWindowAttributes wattr; 3543 XWindowAttributes wattr;
2766 Window wdummy; 3544 Window wdummy;
3545 dDisp;
2767 3546
2768 if (nargs == 0) 3547 if (nargs == 0)
2769 return; 3548 return;
3549
2770 switch (args[0]) 3550 switch (args[0])
2771 { 3551 {
2772 /* 3552 /*
2773 * commands 3553 * commands
2774 */ 3554 */
2775 case 1: /* deiconify window */ 3555 case 1: /* deiconify window */
2776 XMapWindow (display->display, TermWin.parent[0]); 3556 XMapWindow (disp, parent[0]);
2777 break; 3557 break;
2778 case 2: /* iconify window */ 3558 case 2: /* iconify window */
2779 XIconifyWindow (display->display, TermWin.parent[0], 3559 XIconifyWindow (disp, parent[0], display->screen);
2780 DefaultScreen (display->display));
2781 break; 3560 break;
2782 case 3: /* set position (pixels) */ 3561 case 3: /* set position (pixels) */
2783 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3562 XMoveWindow (disp, parent[0], args[1], args[2]);
2784 break; 3563 break;
2785 case 4: /* set size (pixels) */ 3564 case 4: /* set size (pixels) */
2786 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2787 break; 3566 break;
2788 case 5: /* raise window */ 3567 case 5: /* raise window */
2789 XRaiseWindow (display->display, TermWin.parent[0]); 3568 XRaiseWindow (disp, parent[0]);
2790 break; 3569 break;
2791 case 6: /* lower window */ 3570 case 6: /* lower window */
2792 XLowerWindow (display->display, TermWin.parent[0]); 3571 XLowerWindow (disp, parent[0]);
2793 break; 3572 break;
2794 case 7: /* refresh window */ 3573 case 7: /* refresh window */
2795 scr_touch (true); 3574 scr_touch (true);
2796 break; 3575 break;
2797 case 8: /* set size (chars) */ 3576 case 8: /* set size (chars) */
2798 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3577 set_widthheight ((unsigned int) (args[2] * fwidth),
2799 (unsigned int) (args[1] * TermWin.fheight)); 3578 (unsigned int) (args[1] * fheight));
2800 break; 3579 break;
3580
3581 //case 9: NYI, TODO, restore maximized window or maximize window
2801 default: 3582 default:
2802 if (args[0] >= 24) /* set height (chars) */ 3583 if (args[0] >= 24) /* set height (chars) */
2803 set_widthheight ((unsigned int)TermWin.width, 3584 set_widthheight ((unsigned int)width,
2804 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
2805 break; 3586 break;
3587
3588
2806 /* 3589 /*
2807 * reports - some output format copied from XTerm 3590 * reports - some output format copied from XTerm
2808 */ 3591 */
2809 case 11: /* report window state */ 3592 case 11: /* report window state */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3593 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2812 break; 3595 break;
2813 case 13: /* report window position */ 3596 case 13: /* report window position */
2814 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (disp, parent[0], &wattr);
2815 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3598 XTranslateCoordinates (disp, parent[0], wattr.root,
2816 -wattr.border_width, -wattr.border_width, 3599 -wattr.border_width, -wattr.border_width,
2817 &x, &y, &wdummy); 3600 &x, &y, &wdummy);
2818 tt_printf ("\033[3;%d;%dt", x, y); 3601 tt_printf ("\033[3;%d;%dt", x, y);
2819 break; 3602 break;
2820 case 14: /* report window size (pixels) */ 3603 case 14: /* report window size (pixels) */
2821 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
2822 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2823 break; 3606 break;
3607 case 18: /* report text area size (chars) */
3608 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3609 break;
2824 case 18: /* report window size (chars) */ 3610 case 19: /* report window size (chars) */
2825 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2826 break; 3612 break;
2827#if 0 /* XXX: currently disabled due to security concerns */
2828 case 20: /* report icon label */ 3613 case 20: /* report icon label */
3614 {
3615 char *s;
2829 XGetIconName (display->display, TermWin.parent[0], &s); 3616 XGetIconName (disp, parent[0], &s);
2830 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3617 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3618 XFree (s);
3619 }
2831 break; 3620 break;
2832 case 21: /* report window title */ 3621 case 21: /* report window title */
3622 {
3623 char *s;
2833 XFetchName (display->display, TermWin.parent[0], &s); 3624 XFetchName (disp, parent[0], &s);
2834 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3625 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s);
3627 }
2835 break; 3628 break;
2836#endif
2837
2838 } 3629 }
2839} 3630}
2840#endif 3631#endif
2841 3632
2842/*----------------------------------------------------------------------*/ 3633/*----------------------------------------------------------------------*/
2843/* 3634/*
2844 * get input up until STRING TERMINATOR (or BEL) 3635 * get input up until STRING TERMINATOR (or BEL)
2845 * ends_how is terminator used. returned input must be free ()d 3636 * ends_how is terminator used. returned input must be free()'d
2846 */ 3637 */
2847unsigned char * 3638unsigned char *
2848rxvt_term::get_to_st (unsigned char *ends_how) 3639rxvt_term::get_to_st (unicode_t &ends_how)
2849{ 3640{
2850 int seen_esc = 0; /* seen escape? */ 3641 unicode_t ch;
3642 bool seen_esc = false;
2851 unsigned int n = 0; 3643 unsigned int n = 0;
2852 unsigned char *s; 3644 wchar_t string[STRING_MAX];
2853 unsigned char ch, string[STRING_MAX];
2854 3645
2855 for (; (ch = cmd_getc ());) 3646 while ((ch = cmd_getc ()) != NOCHAR)
2856 { 3647 {
2857 if (ch == C0_BEL 3648 if (seen_esc)
2858 || ch == CHAR_ST 3649 {
2859 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3650 if (ch == 0x5c) /* 7bit ST */
2860 break; 3651 break;
3652 else
3653 return NULL;
3654 }
2861 if (ch == C0_ESC) 3655 else if (ch == C0_ESC)
2862 { 3656 {
2863 seen_esc = 1; 3657 seen_esc = true;
2864 continue; 3658 continue;
2865 } 3659 }
2866 else if (ch == '\t') 3660 else if (ch == C0_BEL || ch == CHAR_ST)
2867 ch = ' '; /* translate '\t' to space */ 3661 break;
2868 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3662 else if (ch < 0x20)
2869 return NULL; /* other control character - exit */ 3663 return NULL; /* other control character - exit */
2870 if (n < sizeof (string) - 1) 3664
3665 seen_esc = false;
3666
3667 if (n >= STRING_MAX - 1)
3668 // stop at some sane length
3669 return NULL;
3670
3671 if (ch == C0_SYN)
3672 string[n++] = cmd_get8 ();
3673 else
2871 string[n++] = ch; 3674 string[n++] = ch;
2872 seen_esc = 0;
2873 } 3675 }
3676
2874 string[n++] = '\0'; 3677 string[n++] = '\0';
2875 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3678
2876 return NULL;
2877 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3679 ends_how = (ch == 0x5c ? C0_ESC : ch);
2878 STRNCPY (s, string, n); 3680
2879 return s; 3681 return (unsigned char *)rxvt_wcstombs (string);
2880} 3682}
2881 3683
2882/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
2883/* 3685/*
2884 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2885 */ 3687 */
2886void 3688void
2887rxvt_term::process_dcs_seq () 3689rxvt_term::process_dcs_seq ()
2888{ 3690{
2889 unsigned char eh, *s; 3691 unsigned char *s;
3692 unicode_t eh;
3693
2890 /* 3694 /*
2891 * Not handled yet 3695 * Not handled yet
2892 */ 3696 */
2893 s = get_to_st (&eh); 3697 s = get_to_st (eh);
2894 if (s) 3698 if (s)
2895 free (s); 3699 free (s);
3700
2896 return; 3701 return;
2897} 3702}
2898 3703
2899/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
2900/* 3705/*
2901 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3706 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2902 */ 3707 */
2903void 3708void
2904rxvt_term::process_osc_seq () 3709rxvt_term::process_osc_seq ()
2905{ 3710{
2906 unsigned char ch, eh, *s; 3711 unicode_t ch, eh;
2907 int arg; 3712 int arg;
2908 3713
2909 ch = cmd_getc (); 3714 ch = cmd_getc ();
2910 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3715 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2911 arg = arg * 10 + (ch - '0'); 3716 arg = arg * 10 + (ch - '0');
2912 3717
2913 if (ch == ';') 3718 if (ch == ';')
2914 { 3719 {
2915 s = get_to_st (&eh); 3720 unsigned char *s = get_to_st (eh);
3721
2916 if (s) 3722 if (s)
2917 { 3723 {
2918 /*
2919 * rxvt_menubar_dispatch () violates the constness of the string,
2920 * so do it here
2921 */
2922 if (arg == XTerm_Menu)
2923#if 0 /* XXX: currently disabled due to security concerns */
2924 menubar_dispatch ((char *)s);
2925#else
2926 (void)0;
2927#endif
2928 else
2929 xterm_seq (arg, (char *)s, eh); 3724 process_xterm_seq (arg, (char *)s, eh);
2930 free (s); 3725 free (s);
2931 } 3726 }
2932 } 3727 }
2933} 3728}
3729
3730void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3732{
3733 if (str[0] == '?' && !str[1])
3734 {
3735 unsigned short r, g, b;
3736 pix_colors_focused[color].get (display, r, g, b);
3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3738 }
3739 else
3740 set_window_color (color, str);
3741}
3742
2934/* 3743/*
2935 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2936 * 0 = change iconName/title
2937 * 1 = change iconName
2938 * 2 = change title
2939 * 4 = change color
2940 * 12 = change text color
2941 * 13 = change mouse foreground color
2942 * 17 = change highlight character colour
2943 * 18 = change bold character color
2944 * 19 = change underlined character color
2945 * 46 = change logfile (not implemented)
2946 * 50 = change font
2947 *
2948 * rxvt extensions:
2949 * 10 = menu (may change in future)
2950 * 20 = bg pixmap
2951 * 39 = change default fg color
2952 * 49 = change default bg color
2953 * 55 = dump scrollback buffer and all of screen
2954 * 701 = change locale
2955 * 702 = find font
2956 */ 3745 */
2957void 3746void
2958rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2959{ 3748{
2960 int changed = 0; 3749 int changed = 0;
2961 int color; 3750 int color;
2962 char *buf, *name; 3751 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1];
3753 int saveop = op;
3754 dDisp;
2963 3755
2964 assert (str != NULL); 3756 assert (str != NULL);
2965 switch (op) 3757 switch (op)
2966 { 3758 {
2967 case XTerm_name: 3759 case XTerm_name:
2968 set_title (str); 3760 set_title (str);
2969 /* FALLTHROUGH */ 3761 /* FALLTHROUGH */
2970 case XTerm_iconName: 3762 case XTerm_iconName:
2971 set_iconName (str); 3763 set_icon_name (str);
2972 break; 3764 break;
2973 case XTerm_title: 3765 case XTerm_title:
2974 set_title (str); 3766 set_title (str);
2975 break; 3767 break;
3768 case XTerm_property:
3769 if (str[0] == '?')
3770 {
3771 Atom prop = display->atom (str + 1);
3772 Atom actual_type;
3773 int actual_format;
3774 unsigned long nitems;
3775 unsigned long bytes_after;
3776 unsigned char *value = 0;
3777 const char *str = "";
3778
3779 if (prop
3780 && XGetWindowProperty (disp, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None
3785 && actual_format == 8)
3786 str = (const char *)(value);
3787
3788 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3789
3790 XFree (value);
3791 }
3792 else
3793 {
3794 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3795
3796 if (eq)
3797 {
3798 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1);
3800 }
3801 else
3802 XDeleteProperty (disp, parent[0],
3803 display->atom (str));
3804 }
3805 break;
3806
2976 case XTerm_Color: 3807 case XTerm_Color:
2977 for (buf = (char *)str; buf && *buf;) 3808 for (buf = (char *)str; buf && *buf;)
2978 { 3809 {
2979 if ((name = STRCHR (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
2980 break; 3811 break;
3812
2981 *name++ = '\0'; 3813 *name++ = '\0';
2982 color = atoi (buf); 3814 color = atoi (buf);
3815
2983 if (color < 0 || color >= TOTAL_COLORS) 3816 if (color < 0 || color >= TOTAL_COLORS)
2984 break; 3817 break;
3818
2985 if ((buf = STRCHR (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
2986 *buf++ = '\0'; 3820 *buf++ = '\0';
3821
3822 if (name[0] == '?' && !name[1])
3823 {
3824 unsigned short r, g, b;
3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3827 }
3828 else
2987 set_window_color (color + minCOLOR, name); 3829 set_window_color (color + minCOLOR, name);
2988 } 3830 }
3831 break;
3832 case XTerm_Color00:
3833 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3834 break;
3835 case XTerm_Color01:
3836 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2989 break; 3837 break;
2990#ifndef NO_CURSORCOLOR 3838#ifndef NO_CURSORCOLOR
2991 case XTerm_Color_cursor: 3839 case XTerm_Color_cursor:
2992 set_window_color (Color_cursor, str); 3840 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2993 break; 3841 break;
2994#endif 3842#endif
2995 case XTerm_Color_pointer: 3843 case XTerm_Color_pointer_fg:
2996 set_window_color (Color_pointer, str); 3844 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3845 break;
3846 case XTerm_Color_pointer_bg:
3847 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2997 break; 3848 break;
2998#ifndef NO_BOLD_UNDERLINE_REVERSE 3849#ifndef NO_BOLD_UNDERLINE_REVERSE
2999 case XTerm_Color_BD: 3850 case XTerm_Color_BD:
3000 set_window_color (Color_BD, str); 3851 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3001 break; 3852 break;
3002 case XTerm_Color_UL: 3853 case XTerm_Color_UL:
3003 set_window_color (Color_UL, str); 3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3004 break; 3855 break;
3005 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3006 set_window_color (Color_RV, str); 3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3007 break; 3858 break;
3008#endif 3859 case URxvt_Color_IT:
3009 3860 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3010 case XTerm_Menu:
3011 /*
3012 * rxvt_menubar_dispatch () violates the constness of the string,
3013 * so DON'T do it here
3014 */
3015 break; 3861 break;
3862#endif
3863#if TRANSPARENT && TINTING
3864 case URxvt_Color_tint:
3865 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3866 check_our_parents ();
3867 if (am_transparent)
3868 want_full_refresh = want_refresh = 1;
3869 break;
3870#endif
3871
3016 case XTerm_Pixmap: 3872 case XTerm_Pixmap:
3017 if (*str != ';') 3873 if (*str != ';')
3018 { 3874 {
3019#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3020 scale_pixmap (""); /* reset to default scaling */ 3876 scale_pixmap (""); /* reset to default scaling */
3021 set_bgPixmap (str); /* change pixmap */ 3877 set_bgPixmap (str); /* change pixmap */
3022#endif 3878#endif
3023 scr_touch (true); 3879 scr_touch (true);
3024 } 3880 }
3025 while ((str = STRCHR (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3026 { 3882 {
3027 str++; 3883 str++;
3028#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3029 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3030#endif 3886#endif
3031
3032 } 3887 }
3888
3033 if (changed) 3889 if (changed)
3034 { 3890 {
3035#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3036 resize_pixmap (); 3892 resize_pixmap ();
3037#endif 3893#endif
… …
3043 set_window_color (Color_fg, str); 3899 set_window_color (Color_fg, str);
3044 break; 3900 break;
3045 case XTerm_restoreBG: 3901 case XTerm_restoreBG:
3046 set_window_color (Color_bg, str); 3902 set_window_color (Color_bg, str);
3047 break; 3903 break;
3904
3048 case XTerm_logfile: 3905 case XTerm_logfile:
3906 // TODO, when secure mode?
3907 break;
3908
3909#ifdef MENUBAR
3910 case URxvt_Menu:
3911 if (OPTION (Opt_insecure))
3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3049 break; 3913 break;
3050 case XTerm_font:
3051 change_font (str);
3052 break;
3053#ifndef NO_FRILLS
3054 case XTerm_locale:
3055 if (str[0] == '?' && !str[1])
3056 tt_printf ("%-.250s\n", locale);
3057 else
3058 {
3059 set_locale (str);
3060# ifdef USE_XIM
3061 im_cb ();
3062# endif
3063 }
3064 break;
3065 case XTerm_findfont:
3066 {
3067 int fid = TermWin.fontset->find_font (atoi (str));
3068 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3069 }
3070 break;
3071#endif 3914#endif
3072#if 0 3915#if 0
3073 case XTerm_dumpscreen: /* no error notices */ 3916 case XTerm_dumpscreen: /* no error notices */
3074 { 3917 {
3075 int fd; 3918 int fd;
3076 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3077 { 3920 {
3078 scr_dump (fd); 3921 scr_dump (fd);
3079 close (fd); 3922 close (fd);
3080 } 3923 }
3081 } 3924 }
3082 break; 3925 break;
3083#endif 3926#endif
3927 case XTerm_font:
3928 op = URxvt_font;
3929 case URxvt_font:
3930#if ENABLE_STYLES
3931 case URxvt_boldFont:
3932 case URxvt_italicFont:
3933 case URxvt_boldItalicFont:
3934#endif
3935 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp);
3940 else
3941 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3084 3943
3944 res = strdup (str);
3945 allocated.push_back ((void *)res);
3946 set_fonts ();
3947 }
3948 break;
3949
3950#if ENABLE_FRILLS
3951 case URxvt_locale:
3952 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3954 else
3955 {
3956 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8);
3958 init_xlocale ();
3959 }
3960 break;
3961
3962 case URxvt_view_up:
3963 case URxvt_view_down:
3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 {
3970 scr_erase_savelines ();
3971 }
3972
3973 break;
3974#endif
3085 } 3975 }
3086} 3976}
3087/*----------------------------------------------------------------------*/ 3977/*----------------------------------------------------------------------*/
3088 3978
3089/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3979/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3097 * so no need for fancy checking 3987 * so no need for fancy checking
3098 */ 3988 */
3099int 3989int
3100rxvt_term::privcases (int mode, unsigned long bit) 3990rxvt_term::privcases (int mode, unsigned long bit)
3101{ 3991{
3102 int state; 3992 int state;
3103 3993
3104 if (mode == 's') 3994 if (mode == 's')
3105 { 3995 {
3106 SavedModes |= (PrivateModes & bit); 3996 SavedModes |= (priv_modes & bit);
3107 return -1; 3997 return -1;
3108 } 3998 }
3109 else 3999 else
3110 { 4000 {
3111 if (mode == 'r') 4001 if (mode == 'r')
3112 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4002 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3113 else 4003 else
3114 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4004 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3115 PrivMode (state, bit); 4005 PrivMode (state, bit);
3116 } 4006 }
4007
3117 return state; 4008 return state;
3118} 4009}
3119 4010
3120/* we're not using priv _yet_ */ 4011/* we're not using priv _yet_ */
3121void 4012void
3122rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4013rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3123{ 4014{
3124 unsigned int i, j; 4015 unsigned int i, j;
3125 int state; 4016 int state;
4017
3126 static const struct 4018 static const struct
3127 { 4019 {
3128 const int argval; 4020 const int argval;
3129 const unsigned long bit; 4021 const unsigned long bit;
3130 } 4022 }
4023
3131 argtopriv[] = { 4024 argtopriv[] = {
3132 { 1, PrivMode_aplCUR }, 4025 { 1, PrivMode_aplCUR },
3133 { 2, PrivMode_vt52 }, 4026 { 2, PrivMode_vt52 },
3134 { 3, PrivMode_132 }, 4027 { 3, PrivMode_132 },
3135 { 4, PrivMode_smoothScroll }, 4028 { 4, PrivMode_smoothScroll },
3136 { 5, PrivMode_rVideo }, 4029 { 5, PrivMode_rVideo },
3137 { 6, PrivMode_relOrigin }, 4030 { 6, PrivMode_relOrigin },
3138 { 7, PrivMode_Autowrap }, 4031 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode
3139 { 9, PrivMode_MouseX10 }, 4033 { 9, PrivMode_MouseX10 },
3140#ifdef menuBar_esc 4034#ifdef menuBar_esc
3141 { menuBar_esc, PrivMode_menuBar }, 4035 { menuBar_esc, PrivMode_menuBar },
3142#endif 4036#endif
4037 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor },
3143#ifdef scrollBar_esc 4039#ifdef scrollBar_esc
3144 { scrollBar_esc, PrivMode_scrollBar }, 4040 { scrollBar_esc, PrivMode_scrollBar },
3145#endif 4041#endif
3146 { 25, PrivMode_VisibleCursor },
3147 { 35, PrivMode_ShiftKeys }, 4042 { 35, PrivMode_ShiftKeys }, // rxvt extension
3148 { 40, PrivMode_132OK }, 4043 { 40, PrivMode_132OK },
4044 // 41 xterm more fixes NYI
4045 // 45 margin bell NYI
4046 // 46 start logging
3149 { 47, PrivMode_Screen }, 4047 { 47, PrivMode_Screen },
3150 { 66, PrivMode_aplKP }, 4048 { 66, PrivMode_aplKP },
3151#ifndef NO_BACKSPACE_KEY 4049#ifndef NO_BACKSPACE_KEY
3152 { 67, PrivMode_BackSpace }, 4050 { 67, PrivMode_BackSpace },
3153#endif 4051#endif
3154 { 1000, PrivMode_MouseX11 }, 4052 { 1000, PrivMode_MouseX11 },
4053 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4054 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4055 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3155 { 1010, PrivMode_TtyOutputInh }, 4056 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3156 { 1011, PrivMode_Keypress }, 4057 { 1011, PrivMode_Keypress }, // rxvt extension
4058 // 1035 enable modifiers for alt, numlock NYI
4059 // 1036 send ESC for meta keys NYI
4060 // 1037 send DEL for keypad delete NYI
3157 { 1047, PrivMode_Screen }, 4061 { 1047, PrivMode_Screen },
4062 // 1048 save and restore cursor
3158 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4063 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4064 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3159 }; 4065 };
3160 4066
3161 if (nargs == 0) 4067 if (nargs == 0)
3162 return; 4068 return;
3163 4069
… …
3178 state = privcases (mode, argtopriv[j].bit); 4084 state = privcases (mode, argtopriv[j].bit);
3179 break; 4085 break;
3180 } 4086 }
3181 4087
3182 /* extra handling for values with state unkept */ 4088 /* extra handling for values with state unkept */
3183 if (state == -1)
3184 switch (arg[i]) 4089 switch (arg[i])
3185 { 4090 {
4091#if ENABLE_STYLES
4092 case 1021:
4093 if (mode)
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097
4098 scr_touch (true);
4099 break;
4100#endif
3186 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4102 case 1049:
4103 if (OPTION (Opt_secondaryScreen))
3187 if (mode == 0) 4104 if (mode == 0)
3188 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
3189 else if (mode == 1) 4106 else if (mode == 1)
3190 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
3191 /* FALLTHROUGH */
3192 default:
3193 continue; /* for (;i;) */
3194 }
3195
3196 /* extra handling for values with valid 0 or 1 state */
3197 switch (arg[i])
3198 {
3199 /* case 1: - application cursor keys */
3200 case 2: /* VT52 mode */
3201 /* oddball mode. should be set regardless of set/reset
3202 * parameter. Return from VT52 mode with an ESC < from
3203 * within VT52 mode
3204 */
3205 PrivMode (1, PrivMode_vt52);
3206 break; 4108 break;
4109 }
4110
4111 if (state >= 0)
4112 /* extra handling for values with valid 0 or 1 state */
4113 switch (arg[i])
4114 {
4115 /* case 1: - application cursor keys */
4116 case 2: /* VT52 mode */
4117 /* oddball mode. should be set regardless of set/reset
4118 * parameter. Return from VT52 mode with an ESC < from
4119 * within VT52 mode
4120 */
4121 PrivMode (1, PrivMode_vt52);
4122 break;
3207 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
3208 if (PrivateModes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
3209 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
3210 break; 4126 break;
3211 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
3212 if (state) 4128 if (!state)
3213 Options &= ~Opt_jumpScroll; 4129 SET_OPTION (Opt_jumpScroll);
3214 else 4130 else
3215 Options |= Opt_jumpScroll; 4131 CLR_OPTION (Opt_jumpScroll);
3216 break; 4132 break;
3217 case 5: /* reverse video */ 4133 case 5: /* reverse video */
3218 scr_rvideo_mode (state); 4134 scr_rvideo_mode (state);
3219 break; 4135 break;
3220 case 6: /* relative/absolute origins */ 4136 case 6: /* relative/absolute origins */
3221 scr_relative_origin (state); 4137 scr_relative_origin (state);
3222 break; 4138 break;
3223 case 7: /* autowrap */ 4139 case 7: /* autowrap */
3224 scr_autowrap (state); 4140 scr_autowrap (state);
3225 break; 4141 break;
3226 /* case 8: - auto repeat, can't do on a per window basis */ 4142 /* case 8: - auto repeat, can't do on a per window basis */
3227 case 9: /* X10 mouse reporting */ 4143 case 9: /* X10 mouse reporting */
3228 if (state) /* orthogonal */ 4144 if (state) /* orthogonal */
3229 PrivateModes &= ~ (PrivMode_MouseX11); 4145 priv_modes &= ~PrivMode_MouseX11;
3230 break; 4146 break;
3231#ifdef menuBar_esc 4147#ifdef menuBar_esc
3232 case menuBar_esc: 4148 case menuBar_esc:
3233#ifdef MENUBAR 4149#ifdef MENUBAR
3234 map_menuBar (state); 4150 map_menuBar (state);
3235#endif 4151#endif
3236 break; 4152 break;
3237#endif 4153#endif
3238#ifdef scrollBar_esc 4154#ifdef scrollBar_esc
3239 case scrollBar_esc: 4155 case scrollBar_esc:
3240 if (scrollbar_mapping (state)) 4156 if (scrollbar_mapping (state))
3241 { 4157 {
3242 resize_all_windows (0, 0, 0); 4158 resize_all_windows (0, 0, 0);
3243 scr_touch (true); 4159 scr_touch (true);
3244 } 4160 }
3245 break; 4161 break;
3246#endif 4162#endif
3247 case 25: /* visible/invisible cursor */ 4163 case 25: /* visible/invisible cursor */
3248 scr_cursor_visible (state); 4164 scr_cursor_visible (state);
3249 break; 4165 break;
3250 /* case 35: - shift keys */ 4166 /* case 35: - shift keys */
3251 /* case 40: - 80 <--> 132 mode */ 4167 /* case 40: - 80 <--> 132 mode */
3252 case 47: /* secondary screen */ 4168 case 47: /* secondary screen */
3253 scr_change_screen (state); 4169 scr_change_screen (state);
3254 break; 4170 break;
3255 /* case 66: - application key pad */ 4171 /* case 66: - application key pad */
3256 /* case 67: - backspace key */ 4172 /* case 67: - backspace key */
3257 case 1000: /* X11 mouse reporting */ 4173 case 1000: /* X11 mouse reporting */
3258 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
3259 PrivateModes &= ~ (PrivMode_MouseX10); 4175 priv_modes &= ~PrivMode_MouseX10;
3260 break; 4176 break;
3261#if 0 4177#if 0
3262 case 1001: 4178 case 1001:
3263 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
3264#endif 4180#endif
3265 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
3266 if (state) 4182 if (!state)
3267 Options &= ~Opt_scrollTtyOutput; 4183 SET_OPTION (Opt_scrollTtyOutput);
3268 else 4184 else
3269 Options |= Opt_scrollTtyOutput; 4185 CLR_OPTION (Opt_scrollTtyOutput);
3270 break; 4186 break;
3271 case 1011: /* scroll to bottom on key press */ 4187 case 1011: /* scroll to bottom on key press */
3272 if (state) 4188 if (state)
3273 Options |= Opt_scrollTtyKeypress; 4189 SET_OPTION (Opt_scrollTtyKeypress);
3274 else 4190 else
3275 Options &= ~Opt_scrollTtyKeypress; 4191 CLR_OPTION (Opt_scrollTtyKeypress);
3276 break; 4192 break;
3277 case 1047: /* secondary screen w/ clearing */ 4193 case 1047: /* secondary screen w/ clearing last */
3278 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4194 if (OPTION (Opt_secondaryScreen))
3279 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
3280 scr_erase_screen (2); 4196 scr_erase_screen (2);
3281 scr_change_screen (state); 4197 scr_change_screen (state);
3282 /* FALLTHROUGH */
3283 default:
3284 break; 4198 break;
4199 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY)
4203 scr_erase_screen (2);
4204 break;
4205 default:
4206 break;
3285 } 4207 }
3286 } 4208 }
3287} 4209}
3288/*}}} */ 4210/*}}} */
3289 4211
3290/*{{{ process sgr sequences */ 4212/*{{{ process sgr sequences */
3291void 4213void
3292rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4214rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3293{ 4215{
3294 unsigned int i; 4216 unsigned int i;
3295 short rendset; 4217 short rendset;
3296 int rendstyle; 4218 int rendstyle;
3297 4219
3298 if (nargs == 0) 4220 if (nargs == 0)
3299 { 4221 {
3300 scr_rendition (0, ~RS_None); 4222 scr_rendition (0, ~RS_None);
3301 return; 4223 return;
3302 } 4224 }
4225
3303 for (i = 0; i < nargs; i++) 4226 for (i = 0; i < nargs; i++)
3304 { 4227 {
3305 rendset = -1; 4228 rendset = -1;
3306 switch (arg[i]) 4229 switch (arg[i])
3307 { 4230 {
… …
3309 rendset = 0, rendstyle = ~RS_None; 4232 rendset = 0, rendstyle = ~RS_None;
3310 break; 4233 break;
3311 case 1: 4234 case 1:
3312 rendset = 1, rendstyle = RS_Bold; 4235 rendset = 1, rendstyle = RS_Bold;
3313 break; 4236 break;
4237 //case 2: // low intensity
4238 case 3:
4239 rendset = 1, rendstyle = RS_Italic;
4240 break;
3314 case 4: 4241 case 4:
3315 rendset = 1, rendstyle = RS_Uline; 4242 rendset = 1, rendstyle = RS_Uline;
3316 break; 4243 break;
3317 case 5: 4244 case 5: // slowly blinking
4245 case 6: // rapidly blinking
3318 rendset = 1, rendstyle = RS_Blink; 4246 rendset = 1, rendstyle = RS_Blink;
3319 break; 4247 break;
4248 //case 6: // scoansi light background
3320 case 7: 4249 case 7:
3321 rendset = 1, rendstyle = RS_RVid; 4250 rendset = 1, rendstyle = RS_RVid;
3322 break; 4251 break;
3323 case 22: 4252 case 8:
4253 // invisible. NYI
4254 break;
4255 //case 9: // crossed out
4256 //case 10: // scoansi acs off, primary font
4257 //case 11: // scoansi acs on, first alt font
4258 //case 12: // scoansi acs on, |0x80, second alt font
4259 //...
4260 //case 19: // ninth alt font
4261 //case 20: // gothic
4262 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3324 rendset = 0, rendstyle = RS_Bold; 4263 rendset = 0, rendstyle = RS_Bold;
4264 break;
4265 case 22: // normal intensity
4266 rendset = 0, rendstyle = RS_Bold;
4267 break;
4268 case 23: // disable italic
4269 rendset = 0, rendstyle = RS_Italic;
3325 break; 4270 break;
3326 case 24: 4271 case 24:
3327 rendset = 0, rendstyle = RS_Uline; 4272 rendset = 0, rendstyle = RS_Uline;
3328 break; 4273 break;
3329 case 25: 4274 case 25:
3330 rendset = 0, rendstyle = RS_Blink; 4275 rendset = 0, rendstyle = RS_Blink;
3331 break; 4276 break;
4277 case 26: // variable spacing (iso 8613)
4278 rendset = 0, rendstyle = RS_Blink;
4279 break;
3332 case 27: 4280 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 4281 rendset = 0, rendstyle = RS_RVid;
3334 break; 4282 break;
4283 //case 28: // visible. NYI
4284 //case 29: // not crossed-out
3335 } 4285 }
4286
3336 if (rendset != -1) 4287 if (rendset != -1)
3337 { 4288 {
3338 scr_rendition (rendset, rendstyle); 4289 scr_rendition (rendset, rendstyle);
3339 continue; /* for (;i;) */ 4290 continue; /* for (;i;) */
3340 } 4291 }
… …
3347 case 33: 4298 case 33:
3348 case 34: 4299 case 34:
3349 case 35: 4300 case 35:
3350 case 36: 4301 case 36:
3351 case 37: 4302 case 37:
3352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4303 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3353 Color_fg);
3354 break; 4304 break;
3355#ifdef TTY_256COLOR 4305 case 38: // set fg color, ISO 8613-6
3356 case 38:
3357 if (nargs > i + 2 && arg[i + 1] == 5) 4306 if (nargs > i + 2 && arg[i + 1] == 5)
3358 { 4307 {
3359 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4308 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3360 Color_fg);
3361 i += 2; 4309 i += 2;
3362 } 4310 }
3363 break; 4311 break;
3364#endif
3365 case 39: /* default fg */ 4312 case 39: /* default fg */
3366 scr_color (Color_fg, Color_fg); 4313 scr_color (Color_fg, Color_fg);
3367 break; 4314 break;
3368 4315
3369 case 40: 4316 case 40:
… …
3372 case 43: 4319 case 43:
3373 case 44: 4320 case 44:
3374 case 45: 4321 case 45:
3375 case 46: 4322 case 46:
3376 case 47: 4323 case 47:
3377 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4324 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3378 Color_bg);
3379 break; 4325 break;
3380#ifdef TTY_256COLOR 4326 case 48: // set bg color, ISO 8613-6
3381 case 48:
3382 if (nargs > i + 2 && arg[i + 1] == 5) 4327 if (nargs > i + 2 && arg[i + 1] == 5)
3383 { 4328 {
3384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4329 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3385 Color_bg);
3386 i += 2; 4330 i += 2;
3387 } 4331 }
3388 break; 4332 break;
3389#endif
3390 case 49: /* default bg */ 4333 case 49: /* default bg */
3391 scr_color (Color_bg, Color_bg); 4334 scr_color (Color_bg, Color_bg);
3392 break; 4335 break;
4336
4337 //case 50: // not variable spacing
3393 4338
3394#ifndef NO_BRIGHTCOLOR 4339#ifndef NO_BRIGHTCOLOR
3395 case 90: 4340 case 90:
3396 case 91: /* set bright fg color */ 4341 case 91: /* set bright fg color */
3397 case 92: 4342 case 92:
3398 case 93: 4343 case 93:
3399 case 94: 4344 case 94:
3400 case 95: 4345 case 95:
3401 case 96: 4346 case 96:
3402 case 97: 4347 case 97:
3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3404 Color_fg);
3405 break; 4349 break;
3406 case 100: 4350 case 100:
3407 case 101: /* set bright bg color */ 4351 case 101: /* set bright bg color */
3408 case 102: 4352 case 102:
3409 case 103: 4353 case 103:
3410 case 104: 4354 case 104:
3411 case 105: 4355 case 105:
3412 case 106: 4356 case 106:
3413 case 107: 4357 case 107:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3415 Color_bg);
3416 break; 4359 break;
3417#endif 4360#endif
3418
3419 } 4361 }
3420 } 4362 }
3421} 4363}
3422/*}}} */ 4364/*}}} */
3423 4365
3424/*{{{ process Rob Nation's own graphics mode sequences */ 4366/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 4367void
3426rxvt_term::process_graphics () 4368rxvt_term::process_graphics ()
3427{ 4369{
3428 unsigned char ch, cmd = cmd_getc (); 4370 unicode_t ch, cmd = cmd_getc ();
3429 4371
3430 if (cmd == 'Q') 4372 if (cmd == 'Q')
3431 { /* query graphics */ 4373 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 4374 tt_printf ("\033G0\012"); /* no graphics */
3433 return; 4375 return;
3434 } 4376 }
3435 /* swallow other graphics sequences until terminating ':' */ 4377 /* swallow other graphics sequences until terminating ':' */
3436 do 4378 do
3437 ch = cmd_getc (); 4379 ch = cmd_getc ();
… …
3452 unsigned char buf[256]; 4394 unsigned char buf[256];
3453 4395
3454 va_start (arg_ptr, fmt); 4396 va_start (arg_ptr, fmt);
3455 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3456 va_end (arg_ptr); 4398 va_end (arg_ptr);
3457 tt_write (buf, STRLEN (buf)); 4399 tt_write (buf, strlen (buf));
3458} 4400}
3459 4401
3460/* ---------------------------------------------------------------------- */ 4402/* ---------------------------------------------------------------------- */
3461/* Write data to the pty as typed by the user, pasted with the mouse, 4403/* Write data to the pty as typed by the user, pasted with the mouse,
3462 * or generated by us in response to a query ESC sequence. 4404 * or generated by us in response to a query ESC sequence.
3463 */ 4405 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407
3464void 4408void
3465rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4409rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3466{ 4410{
3467 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4411 if (v_buflen == 0)
4412 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3468 4414
3469 if (len) 4415 if ((unsigned int)written == len)
4416 return;
4417
4418 data += written;
4419 len -= written;
3470 { 4420 }
4421
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4423
4424 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len;
4426
4427 pty_ev.set (EVENT_READ | EVENT_WRITE);
4428}
4429
4430void rxvt_term::pty_write ()
4431{
4432 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4433
4434 if (written > 0)
4435 {
4436 v_buflen -= written;
4437
3471 if (v_buflen == 0) 4438 if (v_buflen == 0)
3472 { 4439 {
3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3475 if ((unsigned int)written == len)
3476 return;
3477
3478 data += written;
3479 len -= written;
3480 }
3481
3482
3483 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3484
3485 memcpy (v_buffer + v_buflen, data, len);
3486 v_buflen += len;
3487 }
3488
3489 for (;;)
3490 {
3491 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3492
3493 if (written > 0)
3494 {
3495 v_buflen -= written;
3496
3497 if (v_buflen == 0)
3498 {
3499 free (v_buffer); 4440 free (v_buffer);
3500 v_buffer = 0; 4441 v_buffer = 0;
3501 v_buflen = 0; 4442 v_buflen = 0;
3502 4443
3503 pty_ev.set (EVENT_READ); 4444 pty_ev.set (EVENT_READ);
3504 return;
3505 }
3506
3507 memmove (v_buffer, v_buffer + written, v_buflen);
3508 }
3509 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3510 // original code just ignores this...
3511 destroy ();
3512 else
3513 {
3514 pty_ev.set (EVENT_READ | EVENT_WRITE);
3515 return; 4445 return;
3516 } 4446 }
4447
4448 memmove (v_buffer, v_buffer + written, v_buflen);
3517 } 4449 }
4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4451 pty_ev.set (EVENT_READ);
3518} 4452}
3519 4453
3520/*----------------------- end-of-file (C source) -----------------------*/ 4454/*----------------------- end-of-file (C source) -----------------------*/
3521 4455

Diff Legend

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