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.236 by root, Thu Jan 5 01:04:10 2006 UTC

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

Diff Legend

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