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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.235 by root, Wed Jan 4 20:43:37 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 */
1939 int sx, sy, nx, ny; 2495 int sx, sy, nx, ny;
1940 unsigned int nw, nh; 2496 unsigned int nw, nh;
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;
2507
1951 if (sx < 0) 2508 if (sx < 0)
1952 { 2509 {
1953 nw += sx; 2510 nw += sx;
1954 nx = -sx; 2511 nx = -sx;
1955 sx = 0; 2512 sx = 0;
1956 } 2513 }
2514
1957 if (sy < 0) 2515 if (sy < 0)
1958 { 2516 {
1959 nh += sy; 2517 nh += sy;
1960 ny = -sy; 2518 ny = -sy;
1961 sy = 0; 2519 sy = 0;
1962 } 2520 }
2521
1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
1965 allowedxerror = -1; 2526 allowedxerror = -1;
1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1967 ZPixmap); 2528
1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1969 /* XXX: may need a delay here? */ 2530 /* XXX: may need a delay here? */
1970 allowedxerror = 0; 2531 allowedxerror = 0;
2532
1971 if (image == NULL) 2533 if (image == NULL)
1972 { 2534 {
1973 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
1974 { 2536 {
1975 pchanged = 1; 2537 pchanged = 1;
1976 if (TermWin.pixmap != None) 2538 if (pixmap != None)
1977 { 2539 {
1978 XFreePixmap (display->display, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
1979 TermWin.pixmap = None; 2541 pixmap = None;
1980 } 2542 }
1981 } 2543 }
2544
1982 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
1983 } 2546 }
1984 else 2547 else
1985 { 2548 {
1986 if (TermWin.pixmap != None) 2549 if (pixmap != None)
1987 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
1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
1989 (unsigned int)szHint.width,
1990 (unsigned int)szHint.height, 2565 szHint.width, szHint.height, image->depth);
1991 (unsigned int)image->depth);
1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
1994 nx, ny, (unsigned int)image->width,
1995 (unsigned int)image->height); 2568 nx, ny, image->width, image->height);
1996 XFreeGC (display->display, gc); 2569 XFreeGC (disp, gc);
1997 XDestroyImage (image); 2570 XDestroyImage (image);
1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1999 TermWin.pixmap); 2572 XClearWindow (disp, parent[0]);
2573
2000 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2001 pchanged = 1; 2575 pchanged = 1;
2576
2002 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2003 } 2578 }
2004 } 2579 }
2580
2005 if (!am_pixmap_trans) 2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2006 { 2584 {
2007 unsigned int n; 2585 unsigned int n;
2008 /* 2586 /*
2009 * InheritPixmap transparency 2587 * InheritPixmap transparency
2010 */ 2588 */
2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2013 i++)
2014 { 2590 {
2015 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2016 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2017 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2018 XFree (list); 2594 XFree (list);
2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2595
2020 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2021 { 2597 {
2022 if (oldp != None) 2598 if (oldp != None)
2023 pchanged = 1; 2599 pchanged = 1;
2600
2024 break; 2601 break;
2025 } 2602 }
2603
2026 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2027 pchanged = 1; 2605 pchanged = 1;
2028 } 2606 }
2607
2029 n = 0; 2608 n = 0;
2609
2030 if (pchanged) 2610 if (pchanged)
2031 { 2611 {
2032 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2033 { 2613 {
2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2035 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2036 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2037 { 2616 {
2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2039 break; 2618 break;
2040 } 2619 }
2041 } 2620 }
2042 } 2621 }
2043 if (n > (int) (sizeof (TermWin.parent) 2622
2044 / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2045 { 2624 {
2046 D_X ((stderr, "InheritPixmap Turning off")); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2047 XSetWindowBackground (display->display, TermWin.parent[0], 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2048 PixColors[Color_fg]);
2049 XSetWindowBackground (display->display, TermWin.vt,
2050 PixColors[Color_bg]);
2051 am_transparent = 0; 2627 am_transparent = 0;
2052 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2053 } 2629 }
2054 else 2630 else
2055 { 2631 {
2632#if WAIT_FOR_WM
2056 /* wait (an arbitrary period) for the WM to do its thing 2633 /* wait (an arbitrary period) for the WM to do its thing
2057 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2058# ifdef HAVE_NANOSLEEP
2059 struct timespec rqt;
2060
2061 rqt.tv_sec = 1;
2062 rqt.tv_nsec = 0;
2063 nanosleep (&rqt, NULL);
2064# else
2065 sleep (1); 2635 sleep (1);
2066# endif 2636#endif
2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2068 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2638 {
2070 ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2640 XClearWindow (disp, parent[n]);
2072 ParentRelative); 2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2073 am_transparent = 1; 2644 am_transparent = 1;
2074 } 2645 }
2646
2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2076 TermWin.parent[i] = None; 2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2077 } 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
2078 return pchanged; 2665 return pchanged;
2079} 2666}
2080#endif 2667#endif
2081 2668
2082/*}}} */ 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 scr_add_lines (buf, nlines, str - buf);
2739 nlines = 0;
2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2742 }
2743
2744 if (str >= eol)
2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2748 ch = NOCHAR;
2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2755 }
2756
2757 seq_begin = cmdbuf_ptr;
2758 ch = next_char ();
2759 }
2760
2761 scr_add_lines (buf, nlines, str - buf);
2762
2763 /*
2764 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which
2767 * is incremented here because we must be doing flat-out scrolling.
2768 */
2769 if (refreshnow)
2770 {
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++;
2773 else
2774 {
2775 flag = true;
2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2778 }
2779 }
2780
2781 }
2782 else
2783 {
2784 try
2785 {
2786 process_nonprinting (ch);
2787 }
2788 catch (const class out_of_input &o)
2789 {
2790 // we ran out of input, retry later
2791 cmdbuf_ptr = seq_begin;
2792 break;
2793 }
2794
2795 ch = NOCHAR;
2796 }
2797 }
2798
2799 return flag;
2800}
2801
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character
2812unicode_t
2813rxvt_term::next_char ()
2814{
2815 while (cmdbuf_ptr < cmdbuf_endp)
2816 {
2817 // assume 7-bit to be ascii ALWAYS
2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++;
2820
2821 wchar_t wc;
2822 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2823
2824 if (len == (size_t)-2)
2825 {
2826 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp;
2828 break;
2829 }
2830
2831 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833
2834 // assume wchar == unicode
2835 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK;
2837 }
2838
2839 return NOCHAR;
2840}
2841
2842/* rxvt_cmd_getc () - Return next input character */
2843/*
2844 * Return the next input character after first passing any keyboard input
2845 * to the command.
2846 */
2847unicode_t
2848rxvt_term::cmd_getc ()
2849{
2850 unicode_t c = next_char ();
2851
2852 if (c == NOCHAR)
2853 throw out_of_input;
2854
2855 return c;
2856}
2857
2858unicode_t
2859rxvt_term::cmd_get8 ()
2860{
2861 unicode_t c = next_octet ();
2862
2863 if (c == NOCHAR)
2864 throw out_of_input;
2865
2866 return c;
2867}
2083 2868
2084/*{{{ print pipe */ 2869/*{{{ print pipe */
2085/*----------------------------------------------------------------------*/ 2870/*----------------------------------------------------------------------*/
2086#ifdef PRINTPIPE 2871#ifdef PRINTPIPE
2087FILE * 2872FILE *
2088rxvt_term::popen_printer () 2873rxvt_term::popen_printer ()
2089{ 2874{
2090 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2875 FILE *stream = popen (rs[Rs_print_pipe], "w");
2091 2876
2092 if (stream == NULL) 2877 if (stream == NULL)
2093 rxvt_print_error ("can't open printer pipe"); 2878 rxvt_warn ("can't open printer pipe, not printing.\n");
2879
2094 return stream; 2880 return stream;
2095} 2881}
2096 2882
2097int 2883int
2098rxvt_term::pclose_printer (FILE *stream) 2884rxvt_term::pclose_printer (FILE *stream)
2099{ 2885{
2100 fflush (stream); 2886 fflush (stream);
2101 /* pclose () reported not to work on SunOS 4.1.3 */
2102# if defined (__sun__) /* TODO: RESOLVE THIS */
2103 /* pclose works provided SIGCHLD handler uses waitpid */
2104 return pclose (stream); /* return fclose (stream); */
2105# else
2106 return pclose (stream); 2887 return pclose (stream);
2107# endif
2108} 2888}
2109 2889
2110/* 2890/*
2111 * simulate attached vt100 printer 2891 * simulate attached vt100 printer
2112 */ 2892 */
2113void 2893void
2114rxvt_term::process_print_pipe () 2894rxvt_term::process_print_pipe ()
2115{ 2895{
2116 int done; 2896 int done;
2117 FILE *fd; 2897 FILE *fd;
2118 2898
2119 if ((fd = popen_printer ()) == NULL) 2899 if ((fd = popen_printer ()) == NULL)
2120 return; 2900 return;
2121 2901
2122 /* 2902 /*
2123 * Send all input to the printer until either ESC[4i or ESC[?4i 2903 * Send all input to the printer until either ESC[4i or ESC[?4i
2124 * is received. 2904 * is received.
2125 */ 2905 */
2126 for (done = 0; !done;) 2906 for (done = 0; !done;)
2127 { 2907 {
2128 unsigned char buf[8]; 2908 unsigned char buf[8];
2129 unsigned char ch; 2909 unicode_t ch;
2130 unsigned int i, len; 2910 unsigned int i, len;
2131 2911
2132 if ((ch = cmd_getc ()) != C0_ESC) 2912 if ((ch = cmd_getc ()) != C0_ESC)
2133 { 2913 {
2134 if (putc (ch, fd) == EOF) 2914 if (putc (ch, fd) == EOF)
2135 break; /* done = 1 */ 2915 break; /* done = 1 */
… …
2150 { 2930 {
2151 if ((buf[len++] = cmd_getc ()) == 'i') 2931 if ((buf[len++] = cmd_getc ()) == 'i')
2152 break; /* done = 1 */ 2932 break; /* done = 1 */
2153 } 2933 }
2154 } 2934 }
2935
2155 for (i = 0; i < len; i++) 2936 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF) 2937 if (putc (buf[i], fd) == EOF)
2157 { 2938 {
2158 done = 1; 2939 done = 1;
2159 break; 2940 break;
2160 } 2941 }
2161 } 2942 }
2162 } 2943 }
2944
2163 pclose_printer (fd); 2945 pclose_printer (fd);
2164} 2946}
2165#endif /* PRINTPIPE */ 2947#endif /* PRINTPIPE */
2166/*}}} */ 2948/*}}} */
2167 2949
2168/* *INDENT-OFF* */ 2950/* *INDENT-OFF* */
2169enum { 2951enum {
2170 C1_40 = 0x40, 2952 C1_40 = 0x40,
2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2953 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2172 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2954 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2173 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2955 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2174 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2956 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2175}; 2957};
2176/* *INDENT-ON* */ 2958/* *INDENT-ON* */
2177 2959
2178/*{{{ process non-printing single characters */ 2960/*{{{ process non-printing single characters */
2179void 2961void
2180rxvt_term::process_nonprinting (unsigned char ch) 2962rxvt_term::process_nonprinting (unicode_t ch)
2181{ 2963{
2182 switch (ch) 2964 switch (ch)
2183 { 2965 {
2966 case C0_ESC:
2967 process_escape_seq ();
2968 break;
2184 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2185 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2186 tt_write ( 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2187 (const unsigned char *)rs[Rs_answerbackstring],
2188 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2189 else 2972 else
2190 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2191 (unsigned int)STRLEN (VT100_ANS));
2192 break; 2974 break;
2193 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2194 scr_bell (); 2976 scr_bell ();
2195 break; 2977 break;
2196 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
2211 scr_charset_choose (1); 2993 scr_charset_choose (1);
2212 break; 2994 break;
2213 case C0_SI: /* shift in - acs */ 2995 case C0_SI: /* shift in - acs */
2214 scr_charset_choose (0); 2996 scr_charset_choose (0);
2215 break; 2997 break;
2998
2999#ifdef EIGHT_BIT_CONTROLS
3000 // 8-bit controls
3001 case 0x90: /* DCS */
3002 process_dcs_seq ();
3003 break;
3004 case 0x9b: /* CSI */
3005 process_csi_seq ();
3006 break;
3007 case 0x9d: /* CSI */
3008 process_osc_seq ();
3009 break;
3010#endif
2216 } 3011 }
2217} 3012}
2218/*}}} */ 3013/*}}} */
2219 3014
2220 3015
2221/*{{{ process VT52 escape sequences */ 3016/*{{{ process VT52 escape sequences */
2222void 3017void
2223rxvt_term::process_escape_vt52 (unsigned char ch) 3018rxvt_term::process_escape_vt52 (unicode_t ch)
2224{ 3019{
2225 int row, col; 3020 int row, col;
2226 3021
2227 switch (ch) 3022 switch (ch)
2228 { 3023 {
… …
2280 3075
2281/*{{{ process escape sequences */ 3076/*{{{ process escape sequences */
2282void 3077void
2283rxvt_term::process_escape_seq () 3078rxvt_term::process_escape_seq ()
2284{ 3079{
2285 unsigned char ch = cmd_getc (); 3080 unicode_t ch = cmd_getc ();
2286 3081
2287 if (PrivateModes & PrivMode_vt52) 3082 if (priv_modes & PrivMode_vt52)
2288 { 3083 {
2289 process_escape_vt52 (ch); 3084 process_escape_vt52 (ch);
2290 return; 3085 return;
2291 } 3086 }
2292 3087
… …
2307 scr_charset_set (2, (unsigned int)cmd_getc ()); 3102 scr_charset_set (2, (unsigned int)cmd_getc ());
2308 break; 3103 break;
2309 case '+': 3104 case '+':
2310 scr_charset_set (3, (unsigned int)cmd_getc ()); 3105 scr_charset_set (3, (unsigned int)cmd_getc ());
2311 break; 3106 break;
2312#ifndef NO_FRILLS 3107#if ENABLE_FRILLS
2313 case '6': 3108 case '6':
2314 scr_backindex (); 3109 scr_backindex ();
2315 break; 3110 break;
2316#endif 3111#endif
2317 case '7': 3112 case '7':
2318 scr_cursor (SAVE); 3113 scr_cursor (SAVE);
2319 break; 3114 break;
2320 case '8': 3115 case '8':
2321 scr_cursor (RESTORE); 3116 scr_cursor (RESTORE);
2322 break; 3117 break;
2323#ifndef NO_FRILLS 3118#if ENABLE_FRILLS
2324 case '9': 3119 case '9':
2325 scr_forwardindex (); 3120 scr_forwardindex ();
2326 break; 3121 break;
2327#endif 3122#endif
2328 case '=': 3123 case '=':
… …
2338 break; 3133 break;
2339 3134
2340 /* 8.3.87: NEXT LINE */ 3135 /* 8.3.87: NEXT LINE */
2341 case C1_NEL: /* ESC E */ 3136 case C1_NEL: /* ESC E */
2342 { 3137 {
2343 uint32_t nlcr[] = { '\n', '\r' }; 3138 unicode_t nlcr[] = { C0_LF, C0_CR };
2344 scr_add_lines (nlcr, 1, 2); 3139 scr_add_lines (nlcr, 1, 2);
2345 } 3140 }
2346 break; 3141 break;
2347 3142
2348 /* kidnapped escape sequence: Should be 8.3.48 */ 3143 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2359 case C1_RI: /* ESC M */ 3154 case C1_RI: /* ESC M */
2360 scr_index (DN); 3155 scr_index (DN);
2361 break; 3156 break;
2362 3157
2363 /* 8.3.142: SINGLE-SHIFT TWO */ 3158 /* 8.3.142: SINGLE-SHIFT TWO */
2364 /*case C1_SS2: scr_single_shift (2); break; */ 3159 /*case C1_SS2: scr_single_shift (2); break; */
2365 3160
2366 /* 8.3.143: SINGLE-SHIFT THREE */ 3161 /* 8.3.143: SINGLE-SHIFT THREE */
2367 /*case C1_SS3: scr_single_shift (3); break; */ 3162 /*case C1_SS3: scr_single_shift (3); break; */
2368 3163
2369 /* 8.3.27: DEVICE CONTROL STRING */ 3164 /* 8.3.27: DEVICE CONTROL STRING */
2370 case C1_DCS: /* ESC P */ 3165 case C1_DCS: /* ESC P */
2371 process_dcs_seq (); 3166 process_dcs_seq ();
2372 break; 3167 break;
2373 3168
2374 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2375 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
2376 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2377 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2378 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
2379 3173
2380 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2381 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
2382 process_csi_seq (); 3176 process_csi_seq ();
… …
2387 process_osc_seq (); 3181 process_osc_seq ();
2388 break; 3182 break;
2389 3183
2390 /* 8.3.106: RESET TO INITIAL STATE */ 3184 /* 8.3.106: RESET TO INITIAL STATE */
2391 case 'c': 3185 case 'c':
3186 mbstate.reset ();
2392 scr_poweron (); 3187 scr_poweron ();
2393 scrollbar_show (1); 3188 scrollbar_show (1);
2394 break; 3189 break;
2395 3190
2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3191 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2408 3203
2409/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3204/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2410/* *INDENT-OFF* */ 3205/* *INDENT-OFF* */
2411enum { 3206enum {
2412 CSI_ICH = 0x40, 3207 CSI_ICH = 0x40,
2413 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3208 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2414 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3209 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2415 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3210 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2416 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3211 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2417 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3212 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2418 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3213 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2433 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3228 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2434 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3229 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2435 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3230 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2436 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3231 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2437 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3232 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2438 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3233 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2439 }; 3234 };
2440/* *INDENT-ON* */ 3235/* *INDENT-ON* */
2441 3236
2442void 3237void
2443rxvt_term::process_csi_seq () 3238rxvt_term::process_csi_seq ()
2444{ 3239{
2445 unsigned char ch, priv, i; 3240 unicode_t ch, priv, i;
2446 unsigned int nargs, p; 3241 unsigned int nargs, p;
2447 int n, ndef; 3242 int n, ndef;
2448 int arg[ESC_ARGS]; 3243 int arg[ESC_ARGS];
2449 3244
2450 for (nargs = ESC_ARGS; nargs > 0;) 3245 for (nargs = ESC_ARGS; nargs > 0;)
2451 arg[--nargs] = 0; 3246 arg[--nargs] = 0;
2452 3247
2453 priv = 0; 3248 priv = 0;
… …
2455 if (ch >= '<' && ch <= '?') 3250 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */ 3251 { /* '<' '=' '>' '?' */
2457 priv = ch; 3252 priv = ch;
2458 ch = cmd_getc (); 3253 ch = cmd_getc ();
2459 } 3254 }
3255
2460 /* read any numerical arguments */ 3256 /* read any numerical arguments */
2461 for (n = -1; ch < CSI_ICH; ) 3257 for (n = -1; ch < CSI_ICH; )
2462 { 3258 {
2463 if (isdigit (ch)) 3259 if (isdigit (ch))
2464 { 3260 {
… …
2471 { 3267 {
2472 if (nargs < ESC_ARGS) 3268 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 3269 arg[nargs++] = n;
2474 n = -1; 3270 n = -1;
2475 } 3271 }
2476 else if (ch == '\b') 3272 else if (IS_CONTROL (ch))
2477 {
2478 scr_backspace ();
2479 }
2480 else if (ch == C0_ESC)
2481 {
2482 process_escape_seq ();
2483 return;
2484 }
2485 else if (ch < ' ')
2486 {
2487 process_nonprinting (ch); 3273 process_nonprinting (ch);
2488 } 3274
2489 ch = cmd_getc (); 3275 ch = cmd_getc ();
2490 } 3276 }
2491 3277
2492 if (ch > CSI_7F) 3278 if (ch > CSI_7F)
2493 return; 3279 return;
… …
2515 { 3301 {
2516 switch (priv) 3302 switch (priv)
2517 { 3303 {
2518 case '>': 3304 case '>':
2519 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
2520 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2521 break; 3307 break;
2522 case '?': 3308 case '?':
2523 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2524 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
2525 break; 3311 break;
… …
2630 3416
2631 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2632 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
2633 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
2634 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2635 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2636 break; 3422 break;
2637 3423
2638 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2639 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2640 (unsigned int) (sizeof (VT100_ANS) - 1));
2641 break; 3426 break;
2642 3427
2643 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2644 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
2645 break; 3430 break;
… …
2651 tt_printf ("\033[0n"); 3436 tt_printf ("\033[0n");
2652 break; 3437 break;
2653 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
2654 scr_report_position (); 3439 scr_report_position ();
2655 break; 3440 break;
2656#if defined (ENABLE_DISPLAY_ANSWER)
2657 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure))
2658 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2659 break; 3444 break;
2660#endif
2661 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break; 3447 break;
2664 } 3448 }
2665 break; 3449 break;
2666 3450
2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3451 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2700 break; 3484 break;
2701 3485
2702 case CSI_RM: /* 8.3.107: RESET MODE */ 3486 case CSI_RM: /* 8.3.107: RESET MODE */
2703 if (arg[0] == 4) 3487 if (arg[0] == 4)
2704 scr_insert_mode (0); 3488 scr_insert_mode (0);
3489 else if (arg[0] == 20)
3490 priv_modes &= ~PrivMode_LFNL;
2705 break; 3491 break;
2706 3492
2707 case CSI_SM: /* 8.3.126: SET MODE */ 3493 case CSI_SM: /* 8.3.126: SET MODE */
2708 if (arg[0] == 4) 3494 if (arg[0] == 4)
2709 scr_insert_mode (1); 3495 scr_insert_mode (1);
3496 else if (arg[0] == 20)
3497 priv_modes |= PrivMode_LFNL;
2710 break; 3498 break;
2711 3499
2712 /* 3500 /*
2713 * PRIVATE USE beyond this point. All CSI_7? sequences here 3501 * PRIVATE USE beyond this point. All CSI_7? sequences here
2714 */ 3502 */
… …
2726 break; 3514 break;
2727 case CSI_75: 3515 case CSI_75:
2728 scr_cursor (RESTORE); 3516 scr_cursor (RESTORE);
2729 break; 3517 break;
2730 3518
2731#ifndef NO_FRILLS 3519#if ENABLE_FRILLS
2732 case CSI_74: 3520 case CSI_74:
2733 process_window_ops (arg, nargs); 3521 process_window_ops (arg, nargs);
2734 break; 3522 break;
2735#endif 3523#endif
2736 3524
2737 case CSI_78: /* DECREQTPARM */ 3525 case CSI_78: /* DECREQTPARM */
2738 if (arg[0] == 0 || arg[0] == 1) 3526 if (arg[0] == 0 || arg[0] == 1)
2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3527 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2740 /* FALLTHROUGH */ 3528 break;
2741 3529
2742 default: 3530 default:
2743 break; 3531 break;
2744 } 3532 }
2745} 3533}
2746/*}}} */ 3534/*}}} */
2747 3535
2748#ifndef NO_FRILLS 3536#if ENABLE_FRILLS
2749/* ARGSUSED */ 3537/* ARGSUSED */
2750void 3538void
2751rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3539rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2752{ 3540{
2753 int x, y; 3541 int x, y;
2754#if 0
2755 char *s;
2756#endif
2757 XWindowAttributes wattr; 3542 XWindowAttributes wattr;
2758 Window wdummy; 3543 Window wdummy;
3544 dDisp;
2759 3545
2760 if (nargs == 0) 3546 if (nargs == 0)
2761 return; 3547 return;
3548
2762 switch (args[0]) 3549 switch (args[0])
2763 { 3550 {
2764 /* 3551 /*
2765 * commands 3552 * commands
2766 */ 3553 */
2767 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
2768 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
2769 break; 3556 break;
2770 case 2: /* iconify window */ 3557 case 2: /* iconify window */
2771 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (disp, parent[0], display->screen);
2772 DefaultScreen (display->display));
2773 break; 3559 break;
2774 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
2775 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
2776 break; 3562 break;
2777 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
2778 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2779 break; 3565 break;
2780 case 5: /* raise window */ 3566 case 5: /* raise window */
2781 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
2782 break; 3568 break;
2783 case 6: /* lower window */ 3569 case 6: /* lower window */
2784 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
2785 break; 3571 break;
2786 case 7: /* refresh window */ 3572 case 7: /* refresh window */
2787 scr_touch (true); 3573 scr_touch (true);
2788 break; 3574 break;
2789 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
2791 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
2792 break; 3578 break;
3579
3580 //case 9: NYI, TODO, restore maximized window or maximize window
2793 default: 3581 default:
2794 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
2795 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
2796 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
2797 break; 3585 break;
3586
3587
2798 /* 3588 /*
2799 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
2800 */ 3590 */
2801 case 11: /* report window state */ 3591 case 11: /* report window state */
2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2804 break; 3594 break;
2805 case 13: /* report window position */ 3595 case 13: /* report window position */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
2808 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
2809 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
2810 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
2811 break; 3601 break;
2812 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2815 break; 3605 break;
3606 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break;
2816 case 18: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3611 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3613 {
3614 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s);
3618 }
2823 break; 3619 break;
2824 case 21: /* report window title */ 3620 case 21: /* report window title */
3621 {
3622 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s);
3626 }
2827 break; 3627 break;
2828#endif
2829
2830 } 3628 }
2831} 3629}
2832#endif 3630#endif
2833 3631
2834/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
2835/* 3633/*
2836 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
2837 * ends_how is terminator used. returned input must be free ()d 3635 * ends_how is terminator used. returned input must be free()'d
2838 */ 3636 */
2839unsigned char * 3637char *
2840rxvt_term::get_to_st (unsigned char *ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
2841{ 3639{
2842 int seen_esc = 0; /* seen escape? */ 3640 unicode_t ch;
3641 bool seen_esc = false;
2843 unsigned int n = 0; 3642 unsigned int n = 0;
2844 unsigned char *s; 3643 wchar_t string[STRING_MAX];
2845 unsigned char ch, string[STRING_MAX];
2846 3644
2847 for (; (ch = cmd_getc ());) 3645 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3646 {
2849 if (ch == C0_BEL 3647 if (seen_esc)
2850 || ch == CHAR_ST 3648 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3649 if (ch == 0x5c) /* 7bit ST */
2852 break; 3650 break;
3651 else
3652 return NULL;
3653 }
2853 if (ch == C0_ESC) 3654 else if (ch == C0_ESC)
2854 { 3655 {
2855 seen_esc = 1; 3656 seen_esc = true;
2856 continue; 3657 continue;
2857 } 3658 }
2858 else if (ch == '\t') 3659 else if (ch == C0_BEL || ch == CHAR_ST)
2859 ch = ' '; /* translate '\t' to space */ 3660 break;
2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3661 else if (ch < 0x20)
2861 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
2862 if (n < sizeof (string) - 1) 3663
3664 seen_esc = false;
3665
3666 if (n >= STRING_MAX - 1)
3667 // stop at some sane length
3668 return NULL;
3669
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
2863 string[n++] = ch; 3673 string[n++] = ch;
2864 seen_esc = 0;
2865 } 3674 }
3675
2866 string[n++] = '\0'; 3676 string[n++] = '\0';
2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3677
2868 return NULL;
2869 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
2870 STRNCPY (s, string, n); 3679
2871 return s; 3680 return rxvt_wcstombs (string);
2872} 3681}
2873 3682
2874/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
2875/* 3684/*
2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2877 */ 3686 */
2878void 3687void
2879rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
2880{ 3689{
2881 unsigned char eh, *s; 3690 char *s;
3691 unicode_t eh;
3692
2882 /* 3693 /*
2883 * Not handled yet 3694 * Not handled yet
2884 */ 3695 */
2885 s = get_to_st (&eh); 3696 s = get_to_st (eh);
2886 if (s) 3697 if (s)
2887 free (s); 3698 free (s);
3699
2888 return; 3700 return;
2889} 3701}
2890 3702
2891/*----------------------------------------------------------------------*/ 3703/*----------------------------------------------------------------------*/
2892/* 3704/*
2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3705 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2894 */ 3706 */
2895void 3707void
2896rxvt_term::process_osc_seq () 3708rxvt_term::process_osc_seq ()
2897{ 3709{
2898 unsigned char ch, eh, *s; 3710 unicode_t ch, eh;
2899 int arg; 3711 int arg;
2900 3712
2901 ch = cmd_getc (); 3713 ch = cmd_getc ();
2902 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2903 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
2904 3716
2905 if (ch == ';') 3717 if (ch == ';')
2906 { 3718 {
2907 s = get_to_st (&eh); 3719 char *s = get_to_st (eh);
3720
2908 if (s) 3721 if (s)
2909 { 3722 {
2910 /*
2911 * rxvt_menubar_dispatch () violates the constness of the string,
2912 * so do it here
2913 */
2914 if (arg == XTerm_Menu)
2915#if 0 /* XXX: currently disabled due to security concerns */
2916 menubar_dispatch ((char *)s);
2917#else
2918 (void)0;
2919#endif
2920 else
2921 xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
2922 free (s); 3724 free (s);
2923 } 3725 }
2924 } 3726 }
2925} 3727}
3728
3729void
3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{
3732 if (str[0] == '?' && !str[1])
3733 {
3734 unsigned short r, g, b;
3735 pix_colors_focused[color].get (display, r, g, b);
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3737 }
3738 else
3739 set_window_color (color, str);
3740}
3741
2926/* 3742/*
2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2928 * 0 = change iconName/title
2929 * 1 = change iconName
2930 * 2 = change title
2931 * 4 = change color
2932 * 12 = change text color
2933 * 13 = change mouse foreground color
2934 * 17 = change highlight character colour
2935 * 18 = change bold character color
2936 * 19 = change underlined character color
2937 * 46 = change logfile (not implemented)
2938 * 50 = change font
2939 *
2940 * rxvt extensions:
2941 * 9 = change locale (NYI)
2942 * 10 = menu (may change in future)
2943 * 20 = bg pixmap
2944 * 39 = change default fg color
2945 * 49 = change default bg color
2946 * 55 = dump scrollback buffer and all of screen
2947 */ 3744 */
2948void 3745void
2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2950{ 3747{
2951 int changed = 0; 3748 int changed = 0;
2952 int color; 3749 int color;
2953 char *buf, *name; 3750 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753 dDisp;
2954 3754
2955 assert (str != NULL); 3755 assert (str != NULL);
2956 switch (op) 3756 switch (op)
2957 { 3757 {
2958 case XTerm_name: 3758 case XTerm_name:
2959 set_title (str); 3759 set_title (str);
2960 /* FALLTHROUGH */ 3760 /* FALLTHROUGH */
2961 case XTerm_iconName: 3761 case XTerm_iconName:
2962 set_iconName (str); 3762 set_icon_name (str);
2963 break; 3763 break;
2964 case XTerm_title: 3764 case XTerm_title:
2965 set_title (str); 3765 set_title (str);
2966 break; 3766 break;
3767 case XTerm_property:
3768 if (str[0] == '?')
3769 {
3770 Atom prop = display->atom (str + 1);
3771 Atom actual_type;
3772 int actual_format;
3773 unsigned long nitems;
3774 unsigned long bytes_after;
3775 unsigned char *value = 0;
3776 const char *str = "";
3777
3778 if (prop
3779 && XGetWindowProperty (disp, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None
3784 && actual_format == 8)
3785 str = (const char *)(value);
3786
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3788
3789 XFree (value);
3790 }
3791 else
3792 {
3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3794
3795 if (eq)
3796 {
3797 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1);
3799 }
3800 else
3801 XDeleteProperty (disp, parent[0],
3802 display->atom (str));
3803 }
3804 break;
3805
2967 case XTerm_Color: 3806 case XTerm_Color:
2968 for (buf = (char *)str; buf && *buf;) 3807 for (buf = (char *)str; buf && *buf;)
2969 { 3808 {
2970 if ((name = STRCHR (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
2971 break; 3810 break;
3811
2972 *name++ = '\0'; 3812 *name++ = '\0';
2973 color = atoi (buf); 3813 color = atoi (buf);
3814
2974 if (color < 0 || color >= TOTAL_COLORS) 3815 if (color < 0 || color >= TOTAL_COLORS)
2975 break; 3816 break;
3817
2976 if ((buf = STRCHR (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
2977 *buf++ = '\0'; 3819 *buf++ = '\0';
3820
3821 if (name[0] == '?' && !name[1])
3822 {
3823 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 }
3827 else
2978 set_window_color (color + minCOLOR, name); 3828 set_window_color (color + minCOLOR, name);
2979 } 3829 }
3830 break;
3831 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break;
3834 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2980 break; 3836 break;
2981#ifndef NO_CURSORCOLOR 3837#ifndef NO_CURSORCOLOR
2982 case XTerm_Color_cursor: 3838 case XTerm_Color_cursor:
2983 set_window_color (Color_cursor, str); 3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2984 break; 3840 break;
2985#endif 3841#endif
2986 case XTerm_Color_pointer: 3842 case XTerm_Color_pointer_fg:
2987 set_window_color (Color_pointer, str); 3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3844 break;
3845 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2988 break; 3847 break;
2989#ifndef NO_BOLD_UNDERLINE_REVERSE 3848#ifndef NO_BOLD_UNDERLINE_REVERSE
2990 case XTerm_Color_BD: 3849 case XTerm_Color_BD:
2991 set_window_color (Color_BD, str); 3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2992 break; 3851 break;
2993 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
2994 set_window_color (Color_UL, str); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2995 break; 3854 break;
2996 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
2997 set_window_color (Color_RV, str); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2998 break; 3857 break;
2999#endif 3858 case URxvt_Color_IT:
3000 3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3001 case XTerm_Menu:
3002 /*
3003 * rxvt_menubar_dispatch () violates the constness of the string,
3004 * so DON'T do it here
3005 */
3006 break; 3860 break;
3861#endif
3862#if TRANSPARENT && TINTING
3863 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3865 check_our_parents ();
3866 if (am_transparent)
3867 want_full_refresh = want_refresh = 1;
3868 break;
3869#endif
3870
3007 case XTerm_Pixmap: 3871 case XTerm_Pixmap:
3008 if (*str != ';') 3872 if (*str != ';')
3009 { 3873 {
3010#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3011 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3012 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3013#endif 3877#endif
3014 scr_touch (true); 3878 scr_touch (true);
3015 } 3879 }
3016 while ((str = STRCHR (str, ';')) != NULL) 3880 while ((str = strchr (str, ';')) != NULL)
3017 { 3881 {
3018 str++; 3882 str++;
3019#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3020 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3021#endif 3885#endif
3022
3023 } 3886 }
3887
3024 if (changed) 3888 if (changed)
3025 { 3889 {
3026#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3027 resize_pixmap (); 3891 resize_pixmap ();
3028#endif 3892#endif
… …
3034 set_window_color (Color_fg, str); 3898 set_window_color (Color_fg, str);
3035 break; 3899 break;
3036 case XTerm_restoreBG: 3900 case XTerm_restoreBG:
3037 set_window_color (Color_bg, str); 3901 set_window_color (Color_bg, str);
3038 break; 3902 break;
3903
3039 case XTerm_logfile: 3904 case XTerm_logfile:
3905 // TODO, when secure mode?
3906 break;
3907
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3040 break; 3912 break;
3041 case XTerm_font:
3042 change_font (str);
3043 break;
3044#ifndef NO_FRILLS
3045 case XTerm_locale:
3046 if (str[0] == '?' && !str[1])
3047 tt_printf ("%-.250s\n", locale);
3048 else
3049 {
3050 set_locale (str);
3051# ifdef USE_XIM
3052 im_cb ();
3053# endif
3054 // TODO: call selection_make with the right values set
3055 // to re-fresh the selection.
3056 if (display->selection_owner == this)
3057 display->set_selection_owner (0);
3058 }
3059 break;
3060#endif 3913#endif
3061#if 0 3914#if 0
3062 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
3063 { 3916 {
3064 int fd; 3917 int fd;
3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3066 { 3919 {
3067 scr_dump (fd); 3920 scr_dump (fd);
3068 close (fd); 3921 close (fd);
3069 } 3922 }
3070 } 3923 }
3071 break; 3924 break;
3072#endif 3925#endif
3926 case XTerm_font:
3927 op = URxvt_font;
3928 case URxvt_font:
3929#if ENABLE_STYLES
3930 case URxvt_boldFont:
3931 case URxvt_italicFont:
3932 case URxvt_boldItalicFont:
3933#endif
3934 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp);
3939 else
3940 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3073 3942
3943 res = strdup (str);
3944 allocated.push_back ((void *)res);
3945 set_fonts ();
3946 }
3947 break;
3948
3949#if ENABLE_FRILLS
3950 case URxvt_locale:
3951 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3953 else
3954 {
3955 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8);
3957 init_xlocale ();
3958 }
3959 break;
3960
3961 case URxvt_view_up:
3962 case URxvt_view_down:
3963 {
3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 scr_erase_savelines ();
3970 }
3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3978 ; // no responses yet
3979 break;
3980#endif
3074 } 3981 }
3075} 3982}
3076/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
3077 3984
3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3985/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3086 * so no need for fancy checking 3993 * so no need for fancy checking
3087 */ 3994 */
3088int 3995int
3089rxvt_term::privcases (int mode, unsigned long bit) 3996rxvt_term::privcases (int mode, unsigned long bit)
3090{ 3997{
3091 int state; 3998 int state;
3092 3999
3093 if (mode == 's') 4000 if (mode == 's')
3094 { 4001 {
3095 SavedModes |= (PrivateModes & bit); 4002 SavedModes |= (priv_modes & bit);
3096 return -1; 4003 return -1;
3097 } 4004 }
3098 else 4005 else
3099 { 4006 {
3100 if (mode == 'r') 4007 if (mode == 'r')
3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4008 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3102 else 4009 else
3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4010 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3104 PrivMode (state, bit); 4011 PrivMode (state, bit);
3105 } 4012 }
4013
3106 return state; 4014 return state;
3107} 4015}
3108 4016
3109/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3110void 4018void
3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3112{ 4020{
3113 unsigned int i, j; 4021 unsigned int i, j;
3114 int state; 4022 int state;
4023
3115 static const struct 4024 static const struct
3116 { 4025 {
3117 const int argval; 4026 const int argval;
3118 const unsigned long bit; 4027 const unsigned long bit;
3119 } 4028 }
4029
3120 argtopriv[] = { 4030 argtopriv[] = {
3121 { 1, PrivMode_aplCUR }, 4031 { 1, PrivMode_aplCUR },
3122 { 2, PrivMode_vt52 }, 4032 { 2, PrivMode_vt52 },
3123 { 3, PrivMode_132 }, 4033 { 3, PrivMode_132 },
3124 { 4, PrivMode_smoothScroll }, 4034 { 4, PrivMode_smoothScroll },
3125 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3126 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3127 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode
3128 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3129#ifdef menuBar_esc 4040#ifdef menuBar_esc
3130 { menuBar_esc, PrivMode_menuBar }, 4041 { menuBar_esc, PrivMode_menuBar },
3131#endif 4042#endif
4043 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor },
3132#ifdef scrollBar_esc 4045#ifdef scrollBar_esc
3133 { scrollBar_esc, PrivMode_scrollBar }, 4046 { scrollBar_esc, PrivMode_scrollBar },
3134#endif 4047#endif
3135 { 25, PrivMode_VisibleCursor },
3136 { 35, PrivMode_ShiftKeys }, 4048 { 35, PrivMode_ShiftKeys }, // rxvt extension
3137 { 40, PrivMode_132OK }, 4049 { 40, PrivMode_132OK },
4050 // 41 xterm more fixes NYI
4051 // 45 margin bell NYI
4052 // 46 start logging
3138 { 47, PrivMode_Screen }, 4053 { 47, PrivMode_Screen },
3139 { 66, PrivMode_aplKP }, 4054 { 66, PrivMode_aplKP },
3140#ifndef NO_BACKSPACE_KEY 4055#ifndef NO_BACKSPACE_KEY
3141 { 67, PrivMode_BackSpace }, 4056 { 67, PrivMode_BackSpace },
3142#endif 4057#endif
3143 { 1000, PrivMode_MouseX11 }, 4058 { 1000, PrivMode_MouseX11 },
4059 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4060 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4061 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3144 { 1010, PrivMode_TtyOutputInh }, 4062 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3145 { 1011, PrivMode_Keypress }, 4063 { 1011, PrivMode_Keypress }, // rxvt extension
4064 // 1035 enable modifiers for alt, numlock NYI
4065 // 1036 send ESC for meta keys NYI
4066 // 1037 send DEL for keypad delete NYI
3146 { 1047, PrivMode_Screen }, 4067 { 1047, PrivMode_Screen },
4068 // 1048 save and restore cursor
3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4069 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4070 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3148 }; 4071 };
3149 4072
3150 if (nargs == 0) 4073 if (nargs == 0)
3151 return; 4074 return;
3152 4075
… …
3167 state = privcases (mode, argtopriv[j].bit); 4090 state = privcases (mode, argtopriv[j].bit);
3168 break; 4091 break;
3169 } 4092 }
3170 4093
3171 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
3172 if (state == -1)
3173 switch (arg[i]) 4095 switch (arg[i])
3174 { 4096 {
4097#if ENABLE_STYLES
4098 case 1021:
4099 if (mode)
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103
4104 scr_touch (true);
4105 break;
4106#endif
3175 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4108 case 1049:
4109 if (OPTION (Opt_secondaryScreen))
3176 if (mode == 0) 4110 if (mode == 0)
3177 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
3178 else if (mode == 1) 4112 else if (mode == 1)
3179 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
3180 /* FALLTHROUGH */
3181 default:
3182 continue; /* for (;i;) */
3183 }
3184
3185 /* extra handling for values with valid 0 or 1 state */
3186 switch (arg[i])
3187 {
3188 /* case 1: - application cursor keys */
3189 case 2: /* VT52 mode */
3190 /* oddball mode. should be set regardless of set/reset
3191 * parameter. Return from VT52 mode with an ESC < from
3192 * within VT52 mode
3193 */
3194 PrivMode (1, PrivMode_vt52);
3195 break; 4114 break;
4115 }
4116
4117 if (state >= 0)
4118 /* extra handling for values with valid 0 or 1 state */
4119 switch (arg[i])
4120 {
4121 /* case 1: - application cursor keys */
4122 case 2: /* VT52 mode */
4123 /* oddball mode. should be set regardless of set/reset
4124 * parameter. Return from VT52 mode with an ESC < from
4125 * within VT52 mode
4126 */
4127 PrivMode (1, PrivMode_vt52);
4128 break;
3196 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
3197 if (PrivateModes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
3199 (unsigned int)TermWin.height);
3200 break; 4132 break;
3201 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
3202 if (state) 4134 if (!state)
3203 Options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
3204 else 4136 else
3205 Options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
3206 break; 4138 break;
3207 case 5: /* reverse video */ 4139 case 5: /* reverse video */
3208 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
3209 break; 4141 break;
3210 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
3211 scr_relative_origin (state); 4143 scr_relative_origin (state);
3212 break; 4144 break;
3213 case 7: /* autowrap */ 4145 case 7: /* autowrap */
3214 scr_autowrap (state); 4146 scr_autowrap (state);
3215 break; 4147 break;
3216 /* case 8: - auto repeat, can't do on a per window basis */ 4148 /* case 8: - auto repeat, can't do on a per window basis */
3217 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
3218 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
3219 PrivateModes &= ~ (PrivMode_MouseX11); 4151 priv_modes &= ~PrivMode_MouseX11;
3220 break; 4152 break;
3221#ifdef menuBar_esc 4153#ifdef menuBar_esc
3222 case menuBar_esc: 4154 case menuBar_esc:
3223#ifdef MENUBAR 4155#ifdef MENUBAR
3224 map_menuBar (state); 4156 map_menuBar (state);
3225#endif 4157#endif
3226 break; 4158 break;
3227#endif 4159#endif
3228#ifdef scrollBar_esc 4160#ifdef scrollBar_esc
3229 case scrollBar_esc: 4161 case scrollBar_esc:
3230 if (scrollbar_mapping (state)) 4162 if (scrollbar_mapping (state))
3231 { 4163 {
3232 resize_all_windows (0, 0, 0); 4164 resize_all_windows (0, 0, 0);
3233 scr_touch (true); 4165 scr_touch (true);
3234 } 4166 }
3235 break; 4167 break;
3236#endif 4168#endif
3237 case 25: /* visible/invisible cursor */ 4169 case 25: /* visible/invisible cursor */
3238 scr_cursor_visible (state); 4170 scr_cursor_visible (state);
3239 break; 4171 break;
3240 /* case 35: - shift keys */ 4172 /* case 35: - shift keys */
3241 /* case 40: - 80 <--> 132 mode */ 4173 /* case 40: - 80 <--> 132 mode */
3242 case 47: /* secondary screen */ 4174 case 47: /* secondary screen */
3243 scr_change_screen (state); 4175 scr_change_screen (state);
3244 break; 4176 break;
3245 /* case 66: - application key pad */ 4177 /* case 66: - application key pad */
3246 /* case 67: - backspace key */ 4178 /* case 67: - backspace key */
3247 case 1000: /* X11 mouse reporting */ 4179 case 1000: /* X11 mouse reporting */
3248 if (state) /* orthogonal */ 4180 if (state) /* orthogonal */
3249 PrivateModes &= ~ (PrivMode_MouseX10); 4181 priv_modes &= ~PrivMode_MouseX10;
3250 break; 4182 break;
3251#if 0 4183#if 0
3252 case 1001: 4184 case 1001:
3253 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
3254#endif 4186#endif
3255 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
3256 if (state) 4188 if (!state)
3257 Options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
3258 else 4190 else
3259 Options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
3260 break; 4192 break;
3261 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
3262 if (state) 4194 if (state)
3263 Options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
3264 else 4196 else
3265 Options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
3266 break; 4198 break;
3267 case 1047: /* secondary screen w/ clearing */ 4199 case 1047: /* secondary screen w/ clearing last */
3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4200 if (OPTION (Opt_secondaryScreen))
3269 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
3270 scr_erase_screen (2); 4202 scr_erase_screen (2);
3271 scr_change_screen (state); 4203 scr_change_screen (state);
3272 /* FALLTHROUGH */
3273 default:
3274 break; 4204 break;
4205 case 1049: /* secondary screen w/ clearing first */
4206 scr_change_screen (state);
4207 if (OPTION (Opt_secondaryScreen))
4208 if (current_screen != PRIMARY)
4209 scr_erase_screen (2);
4210 break;
4211 default:
4212 break;
3275 } 4213 }
3276 } 4214 }
3277} 4215}
3278/*}}} */ 4216/*}}} */
3279 4217
3280/*{{{ process sgr sequences */ 4218/*{{{ process sgr sequences */
3281void 4219void
3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4220rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3283{ 4221{
3284 unsigned int i; 4222 unsigned int i;
3285 short rendset; 4223 short rendset;
3286 int rendstyle; 4224 int rendstyle;
3287 4225
3288 if (nargs == 0) 4226 if (nargs == 0)
3289 { 4227 {
3290 scr_rendition (0, ~RS_None); 4228 scr_rendition (0, ~RS_None);
3291 return; 4229 return;
3292 } 4230 }
4231
3293 for (i = 0; i < nargs; i++) 4232 for (i = 0; i < nargs; i++)
3294 { 4233 {
3295 rendset = -1; 4234 rendset = -1;
3296 switch (arg[i]) 4235 switch (arg[i])
3297 { 4236 {
… …
3299 rendset = 0, rendstyle = ~RS_None; 4238 rendset = 0, rendstyle = ~RS_None;
3300 break; 4239 break;
3301 case 1: 4240 case 1:
3302 rendset = 1, rendstyle = RS_Bold; 4241 rendset = 1, rendstyle = RS_Bold;
3303 break; 4242 break;
4243 //case 2: // low intensity
4244 case 3:
4245 rendset = 1, rendstyle = RS_Italic;
4246 break;
3304 case 4: 4247 case 4:
3305 rendset = 1, rendstyle = RS_Uline; 4248 rendset = 1, rendstyle = RS_Uline;
3306 break; 4249 break;
3307 case 5: 4250 case 5: // slowly blinking
4251 case 6: // rapidly blinking
3308 rendset = 1, rendstyle = RS_Blink; 4252 rendset = 1, rendstyle = RS_Blink;
3309 break; 4253 break;
4254 //case 6: // scoansi light background
3310 case 7: 4255 case 7:
3311 rendset = 1, rendstyle = RS_RVid; 4256 rendset = 1, rendstyle = RS_RVid;
3312 break; 4257 break;
3313 case 22: 4258 case 8:
4259 // invisible. NYI
4260 break;
4261 //case 9: // crossed out
4262 //case 10: // scoansi acs off, primary font
4263 //case 11: // scoansi acs on, first alt font
4264 //case 12: // scoansi acs on, |0x80, second alt font
4265 //...
4266 //case 19: // ninth alt font
4267 //case 20: // gothic
4268 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3314 rendset = 0, rendstyle = RS_Bold; 4269 rendset = 0, rendstyle = RS_Bold;
4270 break;
4271 case 22: // normal intensity
4272 rendset = 0, rendstyle = RS_Bold;
4273 break;
4274 case 23: // disable italic
4275 rendset = 0, rendstyle = RS_Italic;
3315 break; 4276 break;
3316 case 24: 4277 case 24:
3317 rendset = 0, rendstyle = RS_Uline; 4278 rendset = 0, rendstyle = RS_Uline;
3318 break; 4279 break;
3319 case 25: 4280 case 25:
3320 rendset = 0, rendstyle = RS_Blink; 4281 rendset = 0, rendstyle = RS_Blink;
3321 break; 4282 break;
4283 case 26: // variable spacing (iso 8613)
4284 rendset = 0, rendstyle = RS_Blink;
4285 break;
3322 case 27: 4286 case 27:
3323 rendset = 0, rendstyle = RS_RVid; 4287 rendset = 0, rendstyle = RS_RVid;
3324 break; 4288 break;
4289 //case 28: // visible. NYI
4290 //case 29: // not crossed-out
3325 } 4291 }
4292
3326 if (rendset != -1) 4293 if (rendset != -1)
3327 { 4294 {
3328 scr_rendition (rendset, rendstyle); 4295 scr_rendition (rendset, rendstyle);
3329 continue; /* for (;i;) */ 4296 continue; /* for (;i;) */
3330 } 4297 }
… …
3337 case 33: 4304 case 33:
3338 case 34: 4305 case 34:
3339 case 35: 4306 case 35:
3340 case 36: 4307 case 36:
3341 case 37: 4308 case 37:
3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4309 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3343 Color_fg);
3344 break; 4310 break;
3345#ifdef TTY_256COLOR 4311 case 38: // set fg color, ISO 8613-6
3346 case 38:
3347 if (nargs > i + 2 && arg[i + 1] == 5) 4312 if (nargs > i + 2 && arg[i + 1] == 5)
3348 { 4313 {
3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4314 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3350 Color_fg);
3351 i += 2; 4315 i += 2;
3352 } 4316 }
3353 break; 4317 break;
3354#endif
3355 case 39: /* default fg */ 4318 case 39: /* default fg */
3356 scr_color (Color_fg, Color_fg); 4319 scr_color (Color_fg, Color_fg);
3357 break; 4320 break;
3358 4321
3359 case 40: 4322 case 40:
… …
3362 case 43: 4325 case 43:
3363 case 44: 4326 case 44:
3364 case 45: 4327 case 45:
3365 case 46: 4328 case 46:
3366 case 47: 4329 case 47:
3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4330 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3368 Color_bg);
3369 break; 4331 break;
3370#ifdef TTY_256COLOR 4332 case 48: // set bg color, ISO 8613-6
3371 case 48:
3372 if (nargs > i + 2 && arg[i + 1] == 5) 4333 if (nargs > i + 2 && arg[i + 1] == 5)
3373 { 4334 {
3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4335 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3375 Color_bg);
3376 i += 2; 4336 i += 2;
3377 } 4337 }
3378 break; 4338 break;
3379#endif
3380 case 49: /* default bg */ 4339 case 49: /* default bg */
3381 scr_color (Color_bg, Color_bg); 4340 scr_color (Color_bg, Color_bg);
3382 break; 4341 break;
3383 4342
3384#ifndef NO_BRIGHTCOLOR 4343 //case 50: // not variable spacing
4344
4345#if ENABLE_FRILLS
3385 case 90: 4346 case 90:
3386 case 91: /* set bright fg color */ 4347 case 91: /* set bright fg color */
3387 case 92: 4348 case 92:
3388 case 93: 4349 case 93:
3389 case 94: 4350 case 94:
3390 case 95: 4351 case 95:
3391 case 96: 4352 case 96:
3392 case 97: 4353 case 97:
3393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4354 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3394 Color_fg);
3395 break; 4355 break;
3396 case 100: 4356 case 100:
3397 case 101: /* set bright bg color */ 4357 case 101: /* set bright bg color */
3398 case 102: 4358 case 102:
3399 case 103: 4359 case 103:
3400 case 104: 4360 case 104:
3401 case 105: 4361 case 105:
3402 case 106: 4362 case 106:
3403 case 107: 4363 case 107:
3404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3405 Color_bg);
3406 break; 4365 break;
3407#endif 4366#endif
3408
3409 } 4367 }
3410 } 4368 }
3411} 4369}
3412/*}}} */ 4370/*}}} */
3413 4371
3414/*{{{ process Rob Nation's own graphics mode sequences */ 4372/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3415void 4373void
3416rxvt_term::process_graphics () 4374rxvt_term::process_graphics ()
3417{ 4375{
3418 unsigned char ch, cmd = cmd_getc (); 4376 unicode_t ch, cmd = cmd_getc ();
3419 4377
3420 if (cmd == 'Q') 4378 if (cmd == 'Q')
3421 { /* query graphics */ 4379 { /* query graphics */
3422 tt_printf ("\033G0\n"); /* no graphics */ 4380 tt_printf ("\033G0\012"); /* no graphics */
3423 return; 4381 return;
3424 } 4382 }
3425 /* swallow other graphics sequences until terminating ':' */ 4383 /* swallow other graphics sequences until terminating ':' */
3426 do 4384 do
3427 ch = cmd_getc (); 4385 ch = cmd_getc ();
… …
3437 */ 4395 */
3438void 4396void
3439rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
3440{ 4398{
3441 va_list arg_ptr; 4399 va_list arg_ptr;
3442 unsigned char buf[256]; 4400 char buf[256];
3443 4401
3444 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
3445 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3446 va_end (arg_ptr); 4404 va_end (arg_ptr);
3447 tt_write (buf, STRLEN (buf)); 4405 tt_write (buf, strlen (buf));
3448} 4406}
3449 4407
3450/* ---------------------------------------------------------------------- */ 4408/* ---------------------------------------------------------------------- */
3451/* Write data to the pty as typed by the user, pasted with the mouse, 4409/* Write data to the pty as typed by the user, pasted with the mouse,
3452 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
3453 */ 4411 */
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413
3454void 4414void
3455rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
3456{ 4416{
3457 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4417 if (v_buflen == 0)
4418 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3458 4420
3459 if (len) 4421 if ((unsigned int)written == len)
4422 return;
4423
4424 data += written;
4425 len -= written;
3460 { 4426 }
4427
4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4429
4430 memcpy (v_buffer + v_buflen, data, len);
4431 v_buflen += len;
4432
4433 pty_ev.set (EVENT_READ | EVENT_WRITE);
4434}
4435
4436void rxvt_term::pty_write ()
4437{
4438 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4439
4440 if (written > 0)
4441 {
4442 v_buflen -= written;
4443
3461 if (v_buflen == 0) 4444 if (v_buflen == 0)
3462 { 4445 {
3463 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3464
3465 if ((unsigned int)written == len)
3466 return;
3467
3468 data += written;
3469 len -= written;
3470 }
3471
3472
3473 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3474
3475 memcpy (v_buffer + v_buflen, data, len);
3476 v_buflen += len;
3477 }
3478
3479 for (;;)
3480 {
3481 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3482
3483 if (written > 0)
3484 {
3485 v_buflen -= written;
3486
3487 if (v_buflen == 0)
3488 {
3489 free (v_buffer); 4446 free (v_buffer);
3490 v_buffer = 0; 4447 v_buffer = 0;
3491 v_buflen = 0; 4448 v_buflen = 0;
3492 4449
3493 pty_ev.set (EVENT_READ); 4450 pty_ev.set (EVENT_READ);
3494 return;
3495 }
3496
3497 memmove (v_buffer, v_buffer + written, v_buflen);
3498 }
3499 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3500 // original code just ignores this...
3501 destroy ();
3502 else
3503 {
3504 pty_ev.set (EVENT_READ | EVENT_WRITE);
3505 return; 4451 return;
3506 } 4452 }
4453
4454 memmove (v_buffer, v_buffer + written, v_buflen);
3507 } 4455 }
4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4457 pty_ev.set (EVENT_READ);
3508} 4458}
3509 4459
3510/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
3511 4461

Diff Legend

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