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.73 by pcg, Mon Mar 15 00:08:11 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 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
145 if (TermWin.saveLines) 397 if (saveLines)
146 { 398 {
147#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 400 if (!ctrl && !meta)
149 {
150#else 401#else
151 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
403#endif
152 { 404 {
153#endif
154 int lnsppg; 405 int lnsppg;
155 406
156#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
158#else 409#else
159 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
160#endif 411#endif
161 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
162 { 413 {
163 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
164 return; 415 return;
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 459 {
209 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
211 } 462 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 464 {
214 switch (keysym) 465 switch (keysym)
215 { 466 {
216 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
219 return; 470 return;
471#if TODO
220 /* rxvt extras */ 472 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 474 change_font (FONT_UP);
223 return; 475 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 477 change_font (FONT_DN);
226 return; 478 return;
479#endif
227 } 480 }
228 } 481 }
229 } 482 }
230#ifdef PRINTPIPE 483
231 if (keysym == XK_Print) 484#if ENABLE_FRILLS || ISO_14755
232 { 485 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 486 if (shft && ctrl)
234 return;
235 } 487 {
236#endif 488 int hv;
237 489
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (iso14755buf & ISO_14755_51
239 { 491 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 492 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 493 {
243 unsigned int l; 494 commit_iso14755 ();
244 const unsigned char *kbuf0; 495 iso14755buf = ISO_14755_51;
245 496# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 497 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 498# endif
254 ) 499 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 500 }
259 501 else if ((hv = hex_keyval (ev)) >= 0)
260 tt_write (kbuf0, l); 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
261 return; 508 return;
262 } 509 }
263 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
264#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 {
265 { 540 {
266 newlen = 1; 541 newlen = 1;
267 switch (keysym) 542 switch (keysym)
268 { 543 {
269#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 545 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
272 { 547 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
276 } 551 }
277 else 552 else
278 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
279 break; 554 break;
280#endif 555#endif
281#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
282 case XK_Delete: 567 case XK_Delete:
283 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
284 break; 569 break;
285#endif 570#endif
286 case XK_Tab: 571 case XK_Tab:
287 if (shft) 572 if (shft)
288 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
289 else 574 else
290 { 575 {
291#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 577 if (ctrl)
293 meta = 1; 578 meta = 1;
… …
299 newlen = 0; 584 newlen = 0;
300 } 585 }
301 break; 586 break;
302 587
303#ifdef XK_KP_Left 588#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
309 { 594 {
310 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 597 break;
313 } 598 }
314 else 599 else
315 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
318#endif 603#endif
319 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 610 /* do Shift first */
326 if (shft) 611 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 613 else if (ctrl)
329 { 614 {
330 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 617 }
333 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
335 break; 620 break;
336 621
337#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
339 case XK_KP_Prior: 624 case XK_KP_Prior:
340 /* allow shift to override */ 625 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
342 { 627 {
343 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
344 break; 629 break;
345 } 630 }
346 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
347# endif 632# endif
348 case XK_Prior: 633 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
350 break; 635 break;
351# ifdef XK_KP_Next 636# ifdef XK_KP_Next
352 case XK_KP_Next: 637 case XK_KP_Next:
353 /* allow shift to override */ 638 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
355 { 640 {
356 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
357 break; 642 break;
358 } 643 }
359 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
360# endif 645# endif
361 case XK_Next: 646 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
363 break; 648 break;
364#endif 649#endif
365 case XK_KP_Enter: 650 case XK_KP_Enter:
366 /* allow shift to override */ 651 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
368 { 653 {
369 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';
370 } 666 }
371 else 667 else
372 { 668 {
373 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
375 } 671 }
376 break; 672 break;
377 673
378#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
379 case XK_KP_Begin: 675 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
381 break; 677 break;
382 678
383 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op");
385 break;
386
387 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On");
389 break;
390#endif 679#endif
391 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
397 break; 686 break;
398 687
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 704 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
417 { 706 {
418 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 709 }
421 else 710 else
422 { 711 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
425 } 714 }
426 break; 715 break;
427 716
428 case XK_Find: 717 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
430 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
431 case XK_Insert: 731 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
433 break; 733 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 735 case DXK_Remove:
436 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
437#endif 737#endif
438 case XK_Execute: 738 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
440 break; 740 break;
441 case XK_Select: 741 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
443 break; 743 break;
444#ifdef XK_KP_End 744#ifdef XK_KP_End
445 case XK_KP_End: 745 case XK_KP_End:
446 /* allow shift to override */ 746 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
448 { 748 {
449 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
450 break; 750 break;
451 } 751 }
452 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
453#endif 753#endif
454 case XK_End: 754 case XK_End:
455 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
456 break; 756 break;
457#ifdef XK_KP_Home 757#ifdef XK_KP_Home
458 case XK_KP_Home: 758 case XK_KP_Home:
459 /* allow shift to override */ 759 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
461 { 761 {
462 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
463 break; 763 break;
464 } 764 }
465 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
466#endif 766#endif
467 case XK_Home: 767 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
469 break; 769 break;
470 770
471#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 773
… …
525#undef FKEY 825#undef FKEY
526 default: 826 default:
527 newlen = 0; 827 newlen = 0;
528 break; 828 break;
529 } 829 }
830
530 if (newlen) 831 if (newlen)
531 len = STRLEN (kbuf); 832 len = strlen (kbuf);
532 } 833 }
533 834
534 /* 835 /*
535 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
536 */ 837 */
… …
543 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
544 { 845 {
545 len = 1; 846 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
548 else 854 else
549 { 855 {
550#ifdef META8_OPTION 856#ifdef META8_OPTION
551 /* set 8-bit on */ 857 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
553 { 859 {
554 unsigned char *ch; 860 char *ch;
555 861
556 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
557 *ch |= 0x80; 863 *ch |= 0x80;
558 864
559 meta = 0; 865 meta = 0;
… …
564 } 870 }
565 871
566 if (len <= 0) 872 if (len <= 0)
567 return; /* not mapped */ 873 return; /* not mapped */
568 874
569 if (Options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
570 if (TermWin.view_start) 876 if (view_start)
571 { 877 {
572 TermWin.view_start = 0; 878 view_start = 0;
573 want_refresh = 1; 879 want_refresh = 1;
574 } 880 }
575 881
576 /* 882 /*
577 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
592#ifdef META8_OPTION 898#ifdef META8_OPTION
593 && meta_char == C0_ESC 899 && meta_char == C0_ESC
594#endif 900#endif
595 ) 901 )
596 { 902 {
597 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
598 tt_write (&ch, 1); 904 tt_write (&ch, 1);
599 } 905 }
600 906
601#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
602 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
610#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
611 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
612} 918}
613/*}}} */ 919/*}}} */
614 920
615#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
618unsigned int 924unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
620{ 926{
621 unsigned int n, s; 927 unsigned int n, s;
622 928
623 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 931
626 if (n > 0 && s < count) 932 if (n > 0 && s < count)
627 { 933 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 934 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 935 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 936 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 937 cmdbuf_endp -= n;
632 s += n; 938 s += n;
633 } 939 }
634 940
635 if (count > s) 941 if (count > s)
636 { 942 {
637 rxvt_print_error ("data loss: cmd_write too large"); 943 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 944 count = s;
639 } 945 }
640 946
641 for (; count--;) 947 for (; count--;)
642 *cmdbuf_endp++ = *str++; 948 *cmdbuf_endp++ = *str++;
643 949
644 cmd_parse (); 950 cmd_parse ();
645 951
646 return 0; 952 return 0;
647} 953}
648#endif /* MENUBAR_MAX */ 954#endif
649 955
650void 956void
651rxvt_term::flush () 957rxvt_term::flush ()
652{ 958{
959 flush_ev.stop ();
960
653#ifdef TRANSPARENT 961#ifdef TRANSPARENT
654 if (want_full_refresh) 962 if (want_full_refresh)
655 { 963 {
656 want_full_refresh = 0; 964 want_full_refresh = 0;
657 scr_clear (); 965 scr_clear ();
658 scr_touch (false); 966 scr_touch (false);
659 want_refresh = 1;
660 } 967 }
661#endif 968#endif
662 969
663 if (want_refresh) 970 if (want_refresh)
664 { 971 {
665 scr_refresh (refresh_type); 972 scr_refresh (refresh_type);
666 scrollbar_show (1); 973 scrollbar_show (1);
667#ifdef USE_XIM 974#ifdef USE_XIM
668 IMSendSpot (); 975 IMSendSpot ();
669#endif 976#endif
670
671 } 977 }
672 978
673 display->flush (); 979 display->flush ();
674} 980}
675 981
… …
677rxvt_term::check_cb (check_watcher &w) 983rxvt_term::check_cb (check_watcher &w)
678{ 984{
679 SET_R (this); 985 SET_R (this);
680 SET_LOCALE (locale); 986 SET_LOCALE (locale);
681 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;
682 flush (); 1002 flush ();
683} 1003}
684 1004
685#ifdef CURSOR_BLINK 1005#ifdef CURSOR_BLINK
686void 1006void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 1024 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 1025 }
706} 1026}
707#endif 1027#endif
708 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
709bool 1094bool
710rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
711{ 1096{
712 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 }
713 1104
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
717 1108
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
719 1110
720 if (n > 0) 1111 if (r > 0)
721 { 1112 {
722 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
723 return true; 1114 return true;
724 } 1115 }
725 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))
726 destroy (); 1128 destroy ();
1129 }
727 1130
728 return false; 1131 return false;
729} 1132}
730 1133
731void 1134void
732rxvt_term::pty_cb (io_watcher &w, short revents) 1135rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1136{
734 SET_R (this); 1137 SET_R (this);
735 SET_LOCALE (locale); 1138 SET_LOCALE (locale);
736 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
737 if (revents & EVENT_WRITE) 1146 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1147 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1148}
759 1149
760bool 1150void
761rxvt_term::cmd_parse () 1151rxvt_term::pointer_unblank ()
762{ 1152{
763 bool flag = false; 1153 XDefineCursor (display->display, vt, TermWin_cursor);
764 unicode_t ch = NOCHAR; 1154 recolour_cursor ();
765 1155
766 for (;;) 1156#ifdef POINTER_BLANK
767 { 1157 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1158
771 if (ch == NOCHAR) // TODO: improve 1159 if (OPTION (Opt_pointerBlank))
772 break; 1160 pointer_ev.start (NOW + pointerBlankDelay);
773 1161#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868unicode_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904unicode_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 unicode_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1162}
920 1163
921#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
922void 1165void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
936{ 1167{
937 if (! (Options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
938 return; 1169 return;
939 1170
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
941 XFlush (display->display); 1172 XFlush (display->display);
942 1173
943 hidden_pointer = 1; 1174 hidden_pointer = 1;
944} 1175}
945 1176
… …
962 x = ev.x; 1193 x = ev.x;
963 y = ev.y; 1194 y = ev.y;
964 pixel_position (&x, &y); 1195 pixel_position (&x, &y);
965 1196
966 if (MEvent.button == AnyButton) 1197 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1198 button_number = 3;
969 }
970 else 1199 else
971 { 1200 {
972 button_number = MEvent.button - Button1; 1201 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1202 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1203 if (button_number >= 3)
975 button_number += (64 - 3); 1204 button_number += (64 - 3);
976 } 1205 }
977 1206
978 if (PrivateModes & PrivMode_MouseX10) 1207 if (priv_modes & PrivMode_MouseX10)
979 { 1208 {
980 /* 1209 /*
981 * do not report ButtonRelease 1210 * do not report ButtonRelease
982 * no state info allowed 1211 * no state info allowed
983 */ 1212 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1227 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1228 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1229#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1230 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1231#endif
1003
1004 } 1232 }
1005 1233
1006#ifdef DEBUG_MOUSEREPORT 1234#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1235 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1236 if (key_state & 16)
1009 fputc ('C', stderr); 1237 fputc ('C', stderr);
1010 if (key_state & 4) 1238 if (key_state & 4)
1011 fputc ('S', stderr); 1239 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1243 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1244 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1245 button_number,
1018 x + 1, 1246 x + 1,
1019 y + 1); 1247 y + 1);
1020#else 1248#endif
1249
1021 tt_printf ("\033[M%c%c%c", 1250 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1251 (32 + button_number + key_state),
1023 (32 + x + 1), 1252 (32 + x + 1),
1024 (32 + y + 1)); 1253 (32 + y + 1));
1025#endif
1026} 1254}
1027 1255
1028#ifdef USING_W11LIB 1256#ifdef USING_W11LIB
1029void 1257void
1030rxvt_W11_process_x_event (XEvent *ev) 1258rxvt_W11_process_x_event (XEvent *ev)
… …
1037 1265
1038/*{{{ process an X event */ 1266/*{{{ process an X event */
1039void 1267void
1040rxvt_term::x_cb (XEvent &ev) 1268rxvt_term::x_cb (XEvent &ev)
1041{ 1269{
1270 dDisp;
1271
1042 SET_R (this); 1272 SET_R (this);
1043 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1044 1274
1045#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1047 { 1277 {
1048 if (hidden_cursor) 1278 if (hidden_cursor)
1049 { 1279 {
1050 hidden_cursor = 0; 1280 hidden_cursor = 0;
1051 want_refresh = 1; 1281 want_refresh = 1;
… …
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 } 1285 }
1056#endif 1286#endif
1057 1287
1058#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1060 { 1290 {
1061 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1064 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1067 if (ev.type == KeyPress && hidden_pointer == 0) 1297 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank (); 1298 pointer_blank ();
1069 } 1299 }
1070#endif 1300#endif
1071 1301
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1077 Window unused_root, unused_child; 1302 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1303 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1304 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 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));
1128#endif
1129 1305
1130 switch (ev.type) 1306 switch (ev.type)
1131 { 1307 {
1132 case KeyPress: 1308 case KeyPress:
1309#if ISO_14755
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1133 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;
1134 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
1135 1377
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 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)
1140 mouse_slip_wheel_speed = 0; 1382 mouse_slip_wheel_speed = 0;
1141 else 1383#endif
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1384 break;
1150 } 1385 }
1151#endif
1152 1386
1153 case ButtonPress: 1387 case ButtonPress:
1154 button_press (ev.xbutton); 1388 button_press (ev.xbutton);
1155 break; 1389 break;
1156 1390
… …
1158 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1159 break; 1393 break;
1160 1394
1161 case ClientMessage: 1395 case ClientMessage:
1162 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 {
1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1164 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
1165#ifdef OFFIX_DND 1417#ifdef OFFIX_DND
1166 /* OffiX Dnd (drag 'n' drop) protocol */ 1418 /* OffiX Dnd (drag 'n' drop) protocol */
1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1168 && (ev.xclient.data.l[0] == DndFile 1420 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1421 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1422 || ev.xclient.data.l[0] == DndLink))
1171 { 1423 {
1172 /* Get Dnd data */ 1424 /* Get Dnd data */
1173 Atom ActualType; 1425 Atom ActualType;
1174 int ActualFormat; 1426 int ActualFormat;
1175 unsigned char *data; 1427 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1428 unsigned long Size, RemainingBytes;
1177 1429
1178 XGetWindowProperty (display->display, display->root, 1430 XGetWindowProperty (disp, display->root,
1179 xa[XA_DNDSELECTION], 1431 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1432 0L, 1000000L,
1181 False, AnyPropertyType, 1433 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1434 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1435 &Size, &RemainingBytes,
1184 &data); 1436 &data);
1185 XChangeProperty (display->display, display->root, 1437 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1438 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1191 } 1441 }
1192#endif /* OFFIX_DND */ 1442#endif /* OFFIX_DND */
1193 break; 1443 break;
1194 1444
1195 case MappingNotify: 1445 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1446 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1447 break;
1198 1448
1199 /* 1449 /*
1200 * XXX: this is not the _current_ arrangement 1450 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1451 * Here's my conclusion:
… …
1220 break; 1470 break;
1221 } 1471 }
1222 break; 1472 break;
1223 1473
1224 case FocusIn: 1474 case FocusIn:
1225 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])
1226 { 1484 {
1227 TermWin.focus = 1; 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1228 want_refresh = 1; 1486 ;
1229#ifdef USE_XIM
1230 if (Input_Context != NULL)
1231 XSetICFocus (Input_Context);
1232#endif
1233#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1236#endif
1237 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
1238 } 1498 }
1239 break; 1499 break;
1240 1500
1241 case FocusOut:
1242 if (TermWin.focus)
1243 {
1244 TermWin.focus = 0;
1245 want_refresh = 1;
1246#ifdef USE_XIM
1247 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context);
1249#endif
1250#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink)
1252 cursor_blink_ev.stop ();
1253 hidden_cursor = 0;
1254#endif
1255
1256 }
1257 break;
1258
1259 case ConfigureNotify: 1501 case PropertyNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1261 { 1503 && ev.xproperty.state == PropertyNewValue)
1262 int height, width; 1504 selection_property (ev.xproperty.window, ev.xproperty.atom);
1263 1505
1264 do
1265 { /* Wrap lots of configures into one */
1266 width = ev.xconfigure.width;
1267 height = ev.xconfigure.height;
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1272 if (szHint.width != width || szHint.height != height)
1273 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1275 resize_all_windows (width, height, 1);
1276 }
1277#ifdef DEBUG_SIZE
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent)
1285 {
1286 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif
1291
1292 }
1293 break; 1506 break;
1294 1507
1295 case SelectionClear: 1508 case SelectionClear:
1296 display->set_selection_owner (0); 1509 selection_clear ();
1297 break; 1510 break;
1298 1511
1299 case SelectionNotify: 1512 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1513 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1515 break;
1304 1516
1305 case SelectionRequest: 1517 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1307 break; 1519 break;
1308 1520
1309 case UnmapNotify: 1521 case UnmapNotify:
1310 TermWin.mapped = 0; 1522 mapped = 0;
1311#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1313#endif 1525#endif
1314 break; 1526 break;
1315 1527
1316 case MapNotify: 1528 case MapNotify:
1317 TermWin.mapped = 1; 1529 mapped = 1;
1318#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1320#endif 1532#endif
1321 break; 1533 break;
1322 1534
… …
1326 break; 1538 break;
1327#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1328 1540
1329 case GraphicsExpose: 1541 case GraphicsExpose:
1330 case Expose: 1542 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1332 { 1544 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1545 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1337 // 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))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1555
1341 // ev.xexpose.width, TermWin.height, False); 1556 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1557 }
1345 else 1558 else
1346 { 1559 {
1347 XEvent unused_event; 1560 XEvent unused_event;
1348 1561
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1350 Expose, 1563 ;
1351 &unused_event)) ; 1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1565 ;
1353 GraphicsExpose, 1566
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1567 if (isScrollbarWindow (ev.xany.window))
1356 { 1568 {
1357 scrollBar.setIdle (); 1569 scrollBar.setIdle ();
1358 scrollbar_show (0); 1570 scrollbar_show (0);
1359 } 1571 }
1360#ifdef MENUBAR 1572#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1574 menubar_expose ();
1363#endif 1575#endif
1576
1577#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window);
1580#endif
1364 } 1581 }
1365 break; 1582 break;
1366 1583
1367 case MotionNotify: 1584 case MotionNotify:
1368#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
… …
1374 { 1591 {
1375 menubar_control (ev.xbutton); 1592 menubar_control (ev.xbutton);
1376 break; 1593 break;
1377 } 1594 }
1378#endif 1595#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1597 break;
1381 1598
1382 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1383 { 1600 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1602 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1387 ; 1604 ;
1388 1605
1389 XQueryPointer (display->display, TermWin.vt, 1606 XQueryPointer (disp, vt,
1390 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1609 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1610 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1612 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1613 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1614 {
1398#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
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1626
1401#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1630 {
1405 int dist; 1631 int dist;
1406
1407 pending_scroll_selection=1;
1408 1632
1409 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
1411 */ 1635 */
1412 if (scroll_selection_delay<=0) 1636 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1637 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1638
1415 /* save the event params so we can highlight 1639 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1640 * the selection in the pending-scroll loop
1417 */ 1641 */
1418 selection_save_x=ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1645
1423 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1425 { 1648 {
1426 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1428 } 1651 }
1429 else 1652 else
1430 { 1653 {
1431 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1655 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1656 }
1657
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1658 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1660 + 1;
1437 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1439 } 1663 }
1440 else 1664 else
1441 { 1665 {
1442 /* we are within the text window, so we 1666 /* we are within the text window, so we
1443 * shouldn't be scrolling 1667 * shouldn't be scrolling
1444 */ 1668 */
1445 pending_scroll_selection = 0; 1669 if (sel_scroll_ev.active)
1670 sel_scroll_ev.stop();
1446 } 1671 }
1447#endif 1672#endif
1448#ifdef MOUSE_THRESHOLD 1673#ifdef MOUSE_THRESHOLD
1449
1450 } 1674 }
1451#endif 1675#endif
1452
1453 } 1676 }
1454 } 1677 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1679 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1680 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1458 MotionNotify, &ev)) ; 1681 MotionNotify, &ev))
1682 ;
1683
1459 XQueryPointer (display->display, scrollBar.win, 1684 XQueryPointer (disp, scrollBar.win,
1460 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1687 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1688 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1690 scrollbar_size ());
1466 scr_refresh (refresh_type); 1691 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1692 refresh_limit = 0;
… …
1470 break; 1695 break;
1471 } 1696 }
1472} 1697}
1473 1698
1474void 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
1475rxvt_term::rootwin_cb (XEvent &ev) 1770rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1771{
1477 SET_R (this); 1772 SET_R (this);
1478 SET_LOCALE (locale); 1773 SET_LOCALE (locale);
1479 1774
1480 switch (ev.type) 1775 switch (ev.type)
1481 { 1776 {
1482 case PropertyNotify: 1777 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /* 1778 /*
1493 * 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,
1494 * 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.
1495 */ 1781 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 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])
1500 return; 1784 return;
1501 }
1502 1785
1503 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1504 case ReparentNotify: 1787 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1508 break; 1790 break;
1509#endif
1510 } 1791 }
1511} 1792}
1793#endif
1512 1794
1513void 1795void
1514rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1515{ 1797{
1516 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1517 1799
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1519 if (!bypass_keystate) 1802 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804
1521 /* 1805 /*
1522 * VT window processing of button press 1806 * VT window processing of button press
1523 */ 1807 */
1524 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1525 { 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
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1527 if (reportmode) 1821 if (reportmode)
1528 { 1822 {
1529 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
… …
1560 } 1854 }
1561 else 1855 else
1562 { 1856 {
1563 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1565 switch (ev.button) 1861 switch (ev.button)
1566 { 1862 {
1567 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
1568 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1874 {
1571 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1573 else 1877 else
1574 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1575 } 1879 }
1576 else 1880 else
1577 { 1881 {
1578 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1579 MEvent.clicks++; 1883 MEvent.clicks++;
1580 else 1884 else
1581 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1582 1886
1583 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1584 } 1888 }
1585 1889
1586 MEvent.button = Button1; 1890 MEvent.button = Button1;
1587 break; 1891 break;
1588 1892
1589 case Button3: 1893 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1592 else 1896 else
1593 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1898
1594 MEvent.button = Button3; 1899 MEvent.button = Button3;
1595 break; 1900 break;
1596 } 1901 }
1597 } 1902 }
1903
1598 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1599 return; 1905 return;
1600 } 1906 }
1601 1907
1602 /* 1908 /*
… …
1668 upordown = 1; /* down */ 1974 upordown = 1; /* down */
1669 } 1975 }
1670 if (upordown) 1976 if (upordown)
1671 { 1977 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1979 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1980#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1981 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1982 {
1677 if (upordown < 0) 1983 if (upordown < 0)
1678 scrollBar.setUp (); 1984 scrollBar.setUp ();
… …
1694 break; 2000 break;
1695 case R_SB_ALIGN_BOTTOM: 2001 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 2002 csrO = scrollBar.bot - scrollBar.top;
1697 break; 2003 break;
1698 } 2004 }
2005
1699 if (scrollBar.style == R_SB_XTERM 2006 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 2007 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 2008 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 2009 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 2010
1704 scrollBar.setMotion (); 2011 scrollBar.setMotion ();
1705 break; 2012 break;
1706 2013
1707 case Button1: 2014 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2015 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1712 case Button3: 2019 case Button3:
1713 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1714 { 2021 {
1715 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1718# else 2025# else
1719 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1720# endif 2027# endif
1721 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1724# else 2031# else
1725 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1726# endif 2033# endif
1727 else 2034 else
1728 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1729 } 2036 }
1730 else 2037 else
1731 { 2038 {
1732 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 2040 (nrow
1734 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 2042 / scrollbar_size ()));
1736 } 2043 }
2044
1737 break; 2045 break;
1738 } 2046 }
1739 } 2047 }
1740 return; 2048 return;
1741 } 2049 }
… …
1753{ 2061{
1754 int reportmode = 0; 2062 int reportmode = 0;
1755 2063
1756 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 2065 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 2067
1760 if (scrollbar_isUpDn ()) 2068 if (scrollbar_isUpDn ())
1761 { 2069 {
1762 scrollBar.setIdle (); 2070 scrollBar.setIdle ();
1763 scrollbar_show (0); 2071 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 2073 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 2074#endif
1767
1768 } 2075 }
2076
1769#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 2078 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop();
1771#endif 2080#endif
2081
1772 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
1773 { 2083 {
2084#if ISO_14755
2085 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return;
2088#endif
1774 if (reportmode) 2089 if (reportmode)
1775 { 2090 {
1776 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
1793 mouse_report (ev); 2108 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2110 return;
1796 } 2111 }
2112
1797 /* 2113 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2115 * when overriding mouse reporting
1800 */ 2116 */
1801 if (PrivateModes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2118 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
1805 2121
1806 switch (ev.button) 2122 switch (ev.button)
… …
1817 case Button5: 2133 case Button5:
1818 { 2134 {
1819 int i; 2135 int i;
1820 page_dirn v; 2136 page_dirn v;
1821 2137
1822 v = (ev.button == Button4) ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2139
1823 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
1824 i = 1; 2141 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2143 i = nrow - 1;
1827 else 2144 else
1828 i = 5; 2145 i = 5;
2146
1829# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
1831 { 2149 {
1832 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)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2156
2157 slip_wheel_ev.start ();
1834 } 2158 }
2159 else
2160 {
1835# endif 2161# endif
1836# ifdef JUMP_MOUSE_WHEEL 2162# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1); 2163 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2164 scr_refresh (SMOOTH_REFRESH);
1845 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
1846 } 2175 }
1847# endif 2176#endif
1848
1849 } 2177 }
1850 break; 2178 break;
1851#endif 2179#endif
1852
1853 } 2180 }
1854 } 2181 }
1855#ifdef MENUBAR 2182#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2183 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2184 menubar_control (ev);
1858#endif 2185#endif
1859} 2186}
1860 2187
1861
1862#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
1863/* 2420/*
1864 * Check our parents are still who we think they are. 2421 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2422 * Do transparency updates if required
1866 */ 2423 */
1867int 2424int
1868rxvt_term::check_our_parents () 2425rxvt_term::check_our_parents ()
1869{ 2426{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2427 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2428 unsigned long nitems, bytes_after;
1872 Atom atype; 2429 Atom atype;
1873 unsigned char *prop = NULL; 2430 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2431 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2432 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
1877 2435
1878 pchanged = 0; 2436 pchanged = 0;
1879 2437
1880 if (! (Options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
1882 2440
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
1885 2443
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2445
1887 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
1888 { 2447 {
1889 if (am_transparent) 2448 if (am_transparent)
1890 { 2449 {
1891 pchanged = 1; 2450 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
1895 } 2453 }
2454
1896 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
1897 } 2456 }
1898 2457
1899 /* 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. */
1900 XSync (display->display, False); 2459 XSync (disp, False);
1901 2460
1902 /* 2461 /*
1903 * Make the frame window set by the window manager have 2462 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2463 * the root background. Some window managers put multiple nested frame
1905 * 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.
1906 */ 2465 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2466 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2469 &nitems, &bytes_after, &prop) == Success);
2470
1911 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 )
1912 have_pixmap = 0; 2482 have_pixmap = 0;
1913 else 2483 else
1914 { 2484 {
1915 have_pixmap = 1; 2485 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2486 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2487 XFree (prop);
1918 } 2488 }
2489
1919 if (have_pixmap) 2490 if (have_pixmap)
1920 { 2491 {
1921 /* 2492 /*
1922 * Copy display->root pixmap transparency 2493 * Copy display->root pixmap transparency
1923 */ 2494 */
… …
1926 Window cr; 2497 Window cr;
1927 XImage *image; 2498 XImage *image;
1928 GC gc; 2499 GC gc;
1929 XGCValues gcvalue; 2500 XGCValues gcvalue;
1930 2501
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2506 nx = ny = 0;
1936 2507
1937 if (sx < 0) 2508 if (sx < 0)
… …
1946 nh += sy; 2517 nh += sy;
1947 ny = -sy; 2518 ny = -sy;
1948 sy = 0; 2519 sy = 0;
1949 } 2520 }
1950 2521
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
1953 allowedxerror = -1; 2526 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2528
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2530 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2531 allowedxerror = 0;
2532
1959 if (image == NULL) 2533 if (image == NULL)
1960 { 2534 {
1961 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
1962 { 2536 {
1963 pchanged = 1; 2537 pchanged = 1;
1964 if (TermWin.pixmap != None) 2538 if (pixmap != None)
1965 { 2539 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
1967 TermWin.pixmap = None; 2541 pixmap = None;
1968 } 2542 }
1969 } 2543 }
2544
1970 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
1971 } 2546 }
1972 else 2547 else
1973 { 2548 {
1974 if (TermWin.pixmap != None) 2549 if (pixmap != None)
1975 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
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2565 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2568 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2569 XFreeGC (disp, gc);
1985 XDestroyImage (image); 2570 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1987 TermWin.pixmap); 2572 XClearWindow (disp, parent[0]);
2573
1988 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2575 pchanged = 1;
2576
1990 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
1991 } 2578 }
1992 } 2579 }
1993 2580
1994 if (!am_pixmap_trans) 2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
1995 { 2584 {
1996 unsigned int n; 2585 unsigned int n;
1997 /* 2586 /*
1998 * InheritPixmap transparency 2587 * InheritPixmap transparency
1999 */ 2588 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2590 {
2004 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2007 XFree (list); 2594 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2595
2009 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2010 { 2597 {
2011 if (oldp != None) 2598 if (oldp != None)
2012 pchanged = 1; 2599 pchanged = 1;
2600
2013 break; 2601 break;
2014 } 2602 }
2603
2015 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2016 pchanged = 1; 2605 pchanged = 1;
2017 } 2606 }
2018 2607
2019 n = 0; 2608 n = 0;
2020 2609
2021 if (pchanged) 2610 if (pchanged)
2022 { 2611 {
2023 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2024 { 2613 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2616 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2030 break; 2618 break;
2031 } 2619 }
2032 } 2620 }
2033 } 2621 }
2034 2622
2035 if (n > (int) (sizeof (TermWin.parent) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2624 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt,
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2627 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2045 } 2629 }
2046 else 2630 else
2047 { 2631 {
2632#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2633 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2635 sleep (1);
2058# endif 2636#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2638 {
2062 ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2640 XClearWindow (disp, parent[n]);
2064 ParentRelative); 2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2065 am_transparent = 1; 2644 am_transparent = 1;
2066 } 2645 }
2067 2646
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2070 } 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
2071 return pchanged; 2665 return pchanged;
2072} 2666}
2073#endif 2667#endif
2074 2668
2075/*}}} */ 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}
2076 2868
2077/*{{{ print pipe */ 2869/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2870/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2871#ifdef PRINTPIPE
2080FILE * 2872FILE *
2081rxvt_term::popen_printer () 2873rxvt_term::popen_printer ()
2082{ 2874{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2875 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2876
2085 if (stream == NULL) 2877 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2878 rxvt_warn ("can't open printer pipe, not printing.\n");
2879
2087 return stream; 2880 return stream;
2088} 2881}
2089 2882
2090int 2883int
2091rxvt_term::pclose_printer (FILE *stream) 2884rxvt_term::pclose_printer (FILE *stream)
2092{ 2885{
2093 fflush (stream); 2886 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2887 return pclose (stream);
2100# endif
2101} 2888}
2102 2889
2103/* 2890/*
2104 * simulate attached vt100 printer 2891 * simulate attached vt100 printer
2105 */ 2892 */
2106void 2893void
2107rxvt_term::process_print_pipe () 2894rxvt_term::process_print_pipe ()
2108{ 2895{
2109 int done; 2896 int done;
2110 FILE *fd; 2897 FILE *fd;
2111 2898
2112 if ((fd = popen_printer ()) == NULL) 2899 if ((fd = popen_printer ()) == NULL)
2113 return; 2900 return;
2114 2901
2115 /* 2902 /*
2116 * 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
2117 * is received. 2904 * is received.
2118 */ 2905 */
2119 for (done = 0; !done;) 2906 for (done = 0; !done;)
2120 { 2907 {
2121 unsigned char buf[8]; 2908 unsigned char buf[8];
2122 unsigned char ch; 2909 unicode_t ch;
2123 unsigned int i, len; 2910 unsigned int i, len;
2124 2911
2125 if ((ch = cmd_getc ()) != C0_ESC) 2912 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2913 {
2127 if (putc (ch, fd) == EOF) 2914 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2915 break; /* done = 1 */
… …
2143 { 2930 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2931 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2932 break; /* done = 1 */
2146 } 2933 }
2147 } 2934 }
2935
2148 for (i = 0; i < len; i++) 2936 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2937 if (putc (buf[i], fd) == EOF)
2150 { 2938 {
2151 done = 1; 2939 done = 1;
2152 break; 2940 break;
2153 } 2941 }
2154 } 2942 }
2155 } 2943 }
2944
2156 pclose_printer (fd); 2945 pclose_printer (fd);
2157} 2946}
2158#endif /* PRINTPIPE */ 2947#endif /* PRINTPIPE */
2159/*}}} */ 2948/*}}} */
2160 2949
2161/* *INDENT-OFF* */ 2950/* *INDENT-OFF* */
2162enum { 2951enum {
2163 C1_40 = 0x40, 2952 C1_40 = 0x40,
2164 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,
2165 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,
2166 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,
2167 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,
2168}; 2957};
2169/* *INDENT-ON* */ 2958/* *INDENT-ON* */
2170 2959
2171/*{{{ process non-printing single characters */ 2960/*{{{ process non-printing single characters */
2172void 2961void
2173rxvt_term::process_nonprinting (unsigned char ch) 2962rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2963{
2175 switch (ch) 2964 switch (ch)
2176 { 2965 {
2966 case C0_ESC:
2967 process_escape_seq ();
2968 break;
2177 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2179 tt_write ( 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2972 else
2183 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2974 break;
2186 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2187 scr_bell (); 2976 scr_bell ();
2188 break; 2977 break;
2189 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2993 scr_charset_choose (1);
2205 break; 2994 break;
2206 case C0_SI: /* shift in - acs */ 2995 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2996 scr_charset_choose (0);
2208 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
2209 } 3011 }
2210} 3012}
2211/*}}} */ 3013/*}}} */
2212 3014
2213 3015
2214/*{{{ process VT52 escape sequences */ 3016/*{{{ process VT52 escape sequences */
2215void 3017void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 3018rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 3019{
2218 int row, col; 3020 int row, col;
2219 3021
2220 switch (ch) 3022 switch (ch)
2221 { 3023 {
… …
2273 3075
2274/*{{{ process escape sequences */ 3076/*{{{ process escape sequences */
2275void 3077void
2276rxvt_term::process_escape_seq () 3078rxvt_term::process_escape_seq ()
2277{ 3079{
2278 unsigned char ch = cmd_getc (); 3080 unicode_t ch = cmd_getc ();
2279 3081
2280 if (PrivateModes & PrivMode_vt52) 3082 if (priv_modes & PrivMode_vt52)
2281 { 3083 {
2282 process_escape_vt52 (ch); 3084 process_escape_vt52 (ch);
2283 return; 3085 return;
2284 } 3086 }
2285 3087
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 3102 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 3103 break;
2302 case '+': 3104 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 3105 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 3106 break;
2305#ifndef NO_FRILLS 3107#if ENABLE_FRILLS
2306 case '6': 3108 case '6':
2307 scr_backindex (); 3109 scr_backindex ();
2308 break; 3110 break;
2309#endif 3111#endif
2310 case '7': 3112 case '7':
2311 scr_cursor (SAVE); 3113 scr_cursor (SAVE);
2312 break; 3114 break;
2313 case '8': 3115 case '8':
2314 scr_cursor (RESTORE); 3116 scr_cursor (RESTORE);
2315 break; 3117 break;
2316#ifndef NO_FRILLS 3118#if ENABLE_FRILLS
2317 case '9': 3119 case '9':
2318 scr_forwardindex (); 3120 scr_forwardindex ();
2319 break; 3121 break;
2320#endif 3122#endif
2321 case '=': 3123 case '=':
… …
2331 break; 3133 break;
2332 3134
2333 /* 8.3.87: NEXT LINE */ 3135 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3136 case C1_NEL: /* ESC E */
2335 { 3137 {
2336 unicode_t nlcr[] = { L'\n', L'\r' }; 3138 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3139 scr_add_lines (nlcr, 1, 2);
2338 } 3140 }
2339 break; 3141 break;
2340 3142
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3143 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 3154 case C1_RI: /* ESC M */
2353 scr_index (DN); 3155 scr_index (DN);
2354 break; 3156 break;
2355 3157
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3158 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3159 /*case C1_SS2: scr_single_shift (2); break; */
2358 3160
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3161 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3162 /*case C1_SS3: scr_single_shift (3); break; */
2361 3163
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3164 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3165 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3166 process_dcs_seq ();
2365 break; 3167 break;
2366 3168
2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2368 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
2369 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2371 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
2372 3173
2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2374 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
2375 process_csi_seq (); 3176 process_csi_seq ();
… …
2380 process_osc_seq (); 3181 process_osc_seq ();
2381 break; 3182 break;
2382 3183
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3184 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3185 case 'c':
3186 mbstate.reset ();
2385 scr_poweron (); 3187 scr_poweron ();
2386 scrollbar_show (1); 3188 scrollbar_show (1);
2387 break; 3189 break;
2388 3190
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3191 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3203
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3204/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3205/* *INDENT-OFF* */
2404enum { 3206enum {
2405 CSI_ICH = 0x40, 3207 CSI_ICH = 0x40,
2406 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,
2407 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 ,
2408 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,
2409 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,
2410 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,
2411 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,
… …
2426 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, */
2427 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, [, \, ], ^, _, */
2428 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, */
2429 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, */
2430 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, */
2431 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, {, |, }, ~, */
2432 }; 3234 };
2433/* *INDENT-ON* */ 3235/* *INDENT-ON* */
2434 3236
2435void 3237void
2436rxvt_term::process_csi_seq () 3238rxvt_term::process_csi_seq ()
2437{ 3239{
2438 unsigned char ch, priv, i; 3240 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3241 unsigned int nargs, p;
2440 int n, ndef; 3242 int n, ndef;
2441 int arg[ESC_ARGS]; 3243 int arg[ESC_ARGS];
2442 3244
2443 for (nargs = ESC_ARGS; nargs > 0;) 3245 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3246 arg[--nargs] = 0;
2445 3247
2446 priv = 0; 3248 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3250 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3251 { /* '<' '=' '>' '?' */
2450 priv = ch; 3252 priv = ch;
2451 ch = cmd_getc (); 3253 ch = cmd_getc ();
2452 } 3254 }
3255
2453 /* read any numerical arguments */ 3256 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3257 for (n = -1; ch < CSI_ICH; )
2455 { 3258 {
2456 if (isdigit (ch)) 3259 if (isdigit (ch))
2457 { 3260 {
… …
2464 { 3267 {
2465 if (nargs < ESC_ARGS) 3268 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3269 arg[nargs++] = n;
2467 n = -1; 3270 n = -1;
2468 } 3271 }
2469 else if (ch == '\b') 3272 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 3273 process_nonprinting (ch);
2481 } 3274
2482 ch = cmd_getc (); 3275 ch = cmd_getc ();
2483 } 3276 }
2484 3277
2485 if (ch > CSI_7F) 3278 if (ch > CSI_7F)
2486 return; 3279 return;
… …
2508 { 3301 {
2509 switch (priv) 3302 switch (priv)
2510 { 3303 {
2511 case '>': 3304 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2514 break; 3307 break;
2515 case '?': 3308 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 3311 break;
… …
2623 3416
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 3422 break;
2630 3423
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3426 break;
2635 3427
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
2638 break; 3430 break;
… …
2644 tt_printf ("\033[0n"); 3436 tt_printf ("\033[0n");
2645 break; 3437 break;
2646 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
2647 scr_report_position (); 3439 scr_report_position ();
2648 break; 3440 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3444 break;
2653#endif
2654 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3447 break;
2657 } 3448 }
2658 break; 3449 break;
2659 3450
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3451 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3484 break;
2694 3485
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3486 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3487 if (arg[0] == 4)
2697 scr_insert_mode (0); 3488 scr_insert_mode (0);
3489 else if (arg[0] == 20)
3490 priv_modes &= ~PrivMode_LFNL;
2698 break; 3491 break;
2699 3492
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3493 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3494 if (arg[0] == 4)
2702 scr_insert_mode (1); 3495 scr_insert_mode (1);
3496 else if (arg[0] == 20)
3497 priv_modes |= PrivMode_LFNL;
2703 break; 3498 break;
2704 3499
2705 /* 3500 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3501 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3502 */
… …
2719 break; 3514 break;
2720 case CSI_75: 3515 case CSI_75:
2721 scr_cursor (RESTORE); 3516 scr_cursor (RESTORE);
2722 break; 3517 break;
2723 3518
2724#ifndef NO_FRILLS 3519#if ENABLE_FRILLS
2725 case CSI_74: 3520 case CSI_74:
2726 process_window_ops (arg, nargs); 3521 process_window_ops (arg, nargs);
2727 break; 3522 break;
2728#endif 3523#endif
2729 3524
2730 case CSI_78: /* DECREQTPARM */ 3525 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3526 if (arg[0] == 0 || arg[0] == 1)
2732 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);
2733 /* FALLTHROUGH */ 3528 break;
2734 3529
2735 default: 3530 default:
2736 break; 3531 break;
2737 } 3532 }
2738} 3533}
2739/*}}} */ 3534/*}}} */
2740 3535
2741#ifndef NO_FRILLS 3536#if ENABLE_FRILLS
2742/* ARGSUSED */ 3537/* ARGSUSED */
2743void 3538void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3539rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3540{
2746 int x, y; 3541 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3542 XWindowAttributes wattr;
2751 Window wdummy; 3543 Window wdummy;
3544 dDisp;
2752 3545
2753 if (nargs == 0) 3546 if (nargs == 0)
2754 return; 3547 return;
3548
2755 switch (args[0]) 3549 switch (args[0])
2756 { 3550 {
2757 /* 3551 /*
2758 * commands 3552 * commands
2759 */ 3553 */
2760 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
2762 break; 3556 break;
2763 case 2: /* iconify window */ 3557 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3559 break;
2767 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3562 break;
2770 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3565 break;
2773 case 5: /* raise window */ 3566 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
2775 break; 3568 break;
2776 case 6: /* lower window */ 3569 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
2778 break; 3571 break;
2779 case 7: /* refresh window */ 3572 case 7: /* refresh window */
2780 scr_touch (true); 3573 scr_touch (true);
2781 break; 3574 break;
2782 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
2785 break; 3578 break;
3579
3580 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3581 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
2790 break; 3585 break;
3586
3587
2791 /* 3588 /*
2792 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
2793 */ 3590 */
2794 case 11: /* report window state */ 3591 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3594 break;
2798 case 13: /* report window position */ 3595 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3601 break;
2805 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3605 break;
3606 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break;
2809 case 18: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3611 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3613 {
3614 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
2815 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 }
2816 break; 3619 break;
2817 case 21: /* report window title */ 3620 case 21: /* report window title */
3621 {
3622 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
2819 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 }
2820 break; 3627 break;
2821#endif
2822
2823 } 3628 }
2824} 3629}
2825#endif 3630#endif
2826 3631
2827/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
2828/* 3633/*
2829 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3635 * ends_how is terminator used. returned input must be free()'d
2831 */ 3636 */
2832unsigned char * 3637char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3639{
2835 int seen_esc = 0; /* seen escape? */ 3640 unicode_t ch;
3641 bool seen_esc = false;
2836 unsigned int n = 0; 3642 unsigned int n = 0;
2837 unsigned char *s; 3643 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3644
2840 for (; (ch = cmd_getc ());) 3645 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3646 {
2842 if (ch == C0_BEL 3647 if (seen_esc)
2843 || ch == CHAR_ST 3648 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3649 if (ch == 0x5c) /* 7bit ST */
2845 break; 3650 break;
3651 else
3652 return NULL;
3653 }
2846 if (ch == C0_ESC) 3654 else if (ch == C0_ESC)
2847 { 3655 {
2848 seen_esc = 1; 3656 seen_esc = true;
2849 continue; 3657 continue;
2850 } 3658 }
2851 else if (ch == '\t') 3659 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3660 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3661 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
2855 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
2856 string[n++] = ch; 3673 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3674 }
3675
2859 string[n++] = '\0'; 3676 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3677
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3679
2864 return s; 3680 return rxvt_wcstombs (string);
2865} 3681}
2866 3682
2867/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
2868/* 3684/*
2869 * 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)'
2870 */ 3686 */
2871void 3687void
2872rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
2873{ 3689{
2874 unsigned char eh, *s; 3690 char *s;
3691 unicode_t eh;
3692
2875 /* 3693 /*
2876 * Not handled yet 3694 * Not handled yet
2877 */ 3695 */
2878 s = get_to_st (&eh); 3696 s = get_to_st (eh);
2879 if (s) 3697 if (s)
2880 free (s); 3698 free (s);
3699
2881 return; 3700 return;
2882} 3701}
2883 3702
2884/*----------------------------------------------------------------------*/ 3703/*----------------------------------------------------------------------*/
2885/* 3704/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3705 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3706 */
2888void 3707void
2889rxvt_term::process_osc_seq () 3708rxvt_term::process_osc_seq ()
2890{ 3709{
2891 unsigned char ch, eh, *s; 3710 unicode_t ch, eh;
2892 int arg; 3711 int arg;
2893 3712
2894 ch = cmd_getc (); 3713 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
2897 3716
2898 if (ch == ';') 3717 if (ch == ';')
2899 { 3718 {
2900 s = get_to_st (&eh); 3719 char *s = get_to_st (eh);
3720
2901 if (s) 3721 if (s)
2902 { 3722 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
2915 free (s); 3724 free (s);
2916 } 3725 }
2917 } 3726 }
2918} 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
2919/* 3742/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title
2922 * 1 = change iconName
2923 * 2 = change title
2924 * 4 = change color
2925 * 12 = change text color
2926 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour
2928 * 18 = change bold character color
2929 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented)
2931 * 50 = change font
2932 *
2933 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap
2936 * 39 = change default fg color
2937 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
2941 */ 3744 */
2942void 3745void
2943rxvt_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)
2944{ 3747{
2945 int changed = 0; 3748 int changed = 0;
2946 int color; 3749 int color;
2947 char *buf, *name; 3750 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753 dDisp;
2948 3754
2949 assert (str != NULL); 3755 assert (str != NULL);
2950 switch (op) 3756 switch (op)
2951 { 3757 {
2952 case XTerm_name: 3758 case XTerm_name:
2953 set_title (str); 3759 set_title (str);
2954 /* FALLTHROUGH */ 3760 /* FALLTHROUGH */
2955 case XTerm_iconName: 3761 case XTerm_iconName:
2956 set_iconName (str); 3762 set_icon_name (str);
2957 break; 3763 break;
2958 case XTerm_title: 3764 case XTerm_title:
2959 set_title (str); 3765 set_title (str);
2960 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
2961 case XTerm_Color: 3806 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3807 for (buf = (char *)str; buf && *buf;)
2963 { 3808 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3810 break;
3811
2966 *name++ = '\0'; 3812 *name++ = '\0';
2967 color = atoi (buf); 3813 color = atoi (buf);
3814
2968 if (color < 0 || color >= TOTAL_COLORS) 3815 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3816 break;
3817
2970 if ((buf = STRCHR (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
2971 *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
2972 set_window_color (color + minCOLOR, name); 3828 set_window_color (color + minCOLOR, name);
2973 } 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);
2974 break; 3836 break;
2975#ifndef NO_CURSORCOLOR 3837#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3838 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3840 break;
2979#endif 3841#endif
2980 case XTerm_Color_pointer: 3842 case XTerm_Color_pointer_fg:
2981 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);
2982 break; 3847 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3848#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3849 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2986 break; 3851 break;
2987 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3854 break;
2990 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3857 break;
2993#endif 3858 case URxvt_Color_IT:
2994 3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
2995 case XTerm_Menu:
2996 /*
2997 * rxvt_menubar_dispatch () violates the constness of the string,
2998 * so DON'T do it here
2999 */
3000 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
3001 case XTerm_Pixmap: 3871 case XTerm_Pixmap:
3002 if (*str != ';') 3872 if (*str != ';')
3003 { 3873 {
3004#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3007#endif 3877#endif
3008 scr_touch (true); 3878 scr_touch (true);
3009 } 3879 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3880 while ((str = strchr (str, ';')) != NULL)
3011 { 3881 {
3012 str++; 3882 str++;
3013#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3015#endif 3885#endif
3016
3017 } 3886 }
3887
3018 if (changed) 3888 if (changed)
3019 { 3889 {
3020#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3891 resize_pixmap ();
3022#endif 3892#endif
… …
3028 set_window_color (Color_fg, str); 3898 set_window_color (Color_fg, str);
3029 break; 3899 break;
3030 case XTerm_restoreBG: 3900 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3901 set_window_color (Color_bg, str);
3032 break; 3902 break;
3903
3033 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
3034 break; 3912 break;
3035 case XTerm_font:
3036 change_font (str);
3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif 3913#endif
3057#if 0 3914#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
3059 { 3916 {
3060 int fd; 3917 int fd;
3061 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)
3062 { 3919 {
3063 scr_dump (fd); 3920 scr_dump (fd);
3064 close (fd); 3921 close (fd);
3065 } 3922 }
3066 } 3923 }
3067 break; 3924 break;
3068#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)];
3069 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
3070 } 3981 }
3071} 3982}
3072/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
3073 3984
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3985/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3993 * so no need for fancy checking
3083 */ 3994 */
3084int 3995int
3085rxvt_term::privcases (int mode, unsigned long bit) 3996rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3997{
3087 int state; 3998 int state;
3088 3999
3089 if (mode == 's') 4000 if (mode == 's')
3090 { 4001 {
3091 SavedModes |= (PrivateModes & bit); 4002 SavedModes |= (priv_modes & bit);
3092 return -1; 4003 return -1;
3093 } 4004 }
3094 else 4005 else
3095 { 4006 {
3096 if (mode == 'r') 4007 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4008 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 4009 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4010 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 4011 PrivMode (state, bit);
3101 } 4012 }
4013
3102 return state; 4014 return state;
3103} 4015}
3104 4016
3105/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3106void 4018void
3107rxvt_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)
3108{ 4020{
3109 unsigned int i, j; 4021 unsigned int i, j;
3110 int state; 4022 int state;
4023
3111 static const struct 4024 static const struct
3112 { 4025 {
3113 const int argval; 4026 const int argval;
3114 const unsigned long bit; 4027 const unsigned long bit;
3115 } 4028 }
4029
3116 argtopriv[] = { 4030 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 4031 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 4032 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 4033 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 4034 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 4040#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 4041 { menuBar_esc, PrivMode_menuBar },
3127#endif 4042#endif
4043 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 4045#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 4046 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 4047#endif
3131 // 18, 19 printing-related
3132 { 25, PrivMode_VisibleCursor },
3133 // 30 show scrollbar rxvt. extension
3134 { 35, PrivMode_ShiftKeys }, // rxvt extension 4048 { 35, PrivMode_ShiftKeys }, // rxvt extension
3135 { 40, PrivMode_132OK }, 4049 { 40, PrivMode_132OK },
3136 // 41 xterm more fixes NYI 4050 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI 4051 // 45 margin bell NYI
3138 // 46 start logging 4052 // 46 start logging
… …
3150 // 1035 enable modifiers for alt, numlock NYI 4064 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI 4065 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI 4066 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen }, 4067 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor 4068 // 1048 save and restore cursor
3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4069 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4070 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 }; 4071 };
3158 4072
3159 if (nargs == 0) 4073 if (nargs == 0)
3160 return; 4074 return;
… …
3178 } 4092 }
3179 4093
3180 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
3181 switch (arg[i]) 4095 switch (arg[i])
3182 { 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
3183 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
3184 case 1049: 4108 case 1049:
4109 if (OPTION (Opt_secondaryScreen))
3185 if (mode == 0) 4110 if (mode == 0)
3186 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
3187 else if (mode == 1) 4112 else if (mode == 1)
3188 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
3189 /* FALLTHROUGH */ 4114 break;
3190 } 4115 }
3191 4116
3192 if (state >= 0) 4117 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */ 4118 /* extra handling for values with valid 0 or 1 state */
3194 switch (arg[i]) 4119 switch (arg[i])
… …
3200 * within VT52 mode 4125 * within VT52 mode
3201 */ 4126 */
3202 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
3203 break; 4128 break;
3204 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
3205 if (PrivateModes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
3207 break; 4132 break;
3208 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
3209 if (state) 4134 if (!state)
3210 Options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
3211 else 4136 else
3212 Options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
3213 break; 4138 break;
3214 case 5: /* reverse video */ 4139 case 5: /* reverse video */
3215 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
3216 break; 4141 break;
3217 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
3218 scr_relative_origin (state); 4143 scr_relative_origin (state);
3219 break; 4144 break;
3220 case 7: /* autowrap */ 4145 case 7: /* autowrap */
3221 scr_autowrap (state); 4146 scr_autowrap (state);
3222 break; 4147 break;
3223 /* 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 */
3224 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11); 4151 priv_modes &= ~PrivMode_MouseX11;
3227 break; 4152 break;
3228#ifdef menuBar_esc 4153#ifdef menuBar_esc
3229 case menuBar_esc: 4154 case menuBar_esc:
3230#ifdef MENUBAR 4155#ifdef MENUBAR
3231 map_menuBar (state); 4156 map_menuBar (state);
… …
3242 break; 4167 break;
3243#endif 4168#endif
3244 case 25: /* visible/invisible cursor */ 4169 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state); 4170 scr_cursor_visible (state);
3246 break; 4171 break;
3247 /* case 35: - shift keys */ 4172 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */ 4173 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */ 4174 case 47: /* secondary screen */
3250 scr_change_screen (state); 4175 scr_change_screen (state);
3251 break; 4176 break;
3252 /* case 66: - application key pad */ 4177 /* case 66: - application key pad */
3253 /* case 67: - backspace key */ 4178 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */ 4179 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */ 4180 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10); 4181 priv_modes &= ~PrivMode_MouseX10;
3257 break; 4182 break;
3258#if 0 4183#if 0
3259 case 1001: 4184 case 1001:
3260 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
3261#endif 4186#endif
3262 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
3263 if (state) 4188 if (!state)
3264 Options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
3265 else 4190 else
3266 Options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
3267 break; 4192 break;
3268 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
3269 if (state) 4194 if (state)
3270 Options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
3271 else 4196 else
3272 Options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
3273 break; 4198 break;
3274 case 1047: /* secondary screen w/ clearing */ 4199 case 1047: /* secondary screen w/ clearing last */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4200 if (OPTION (Opt_secondaryScreen))
3276 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
3277 scr_erase_screen (2); 4202 scr_erase_screen (2);
3278 scr_change_screen (state); 4203 scr_change_screen (state);
3279 /* FALLTHROUGH */ 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;
3280 default: 4211 default:
3281 break; 4212 break;
3282 } 4213 }
3283 } 4214 }
3284} 4215}
… …
3286 4217
3287/*{{{ process sgr sequences */ 4218/*{{{ process sgr sequences */
3288void 4219void
3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4220rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3290{ 4221{
3291 unsigned int i; 4222 unsigned int i;
3292 short rendset; 4223 short rendset;
3293 int rendstyle; 4224 int rendstyle;
3294 4225
3295 if (nargs == 0) 4226 if (nargs == 0)
3296 { 4227 {
3297 scr_rendition (0, ~RS_None); 4228 scr_rendition (0, ~RS_None);
3298 return; 4229 return;
3299 } 4230 }
4231
3300 for (i = 0; i < nargs; i++) 4232 for (i = 0; i < nargs; i++)
3301 { 4233 {
3302 rendset = -1; 4234 rendset = -1;
3303 switch (arg[i]) 4235 switch (arg[i])
3304 { 4236 {
… …
3306 rendset = 0, rendstyle = ~RS_None; 4238 rendset = 0, rendstyle = ~RS_None;
3307 break; 4239 break;
3308 case 1: 4240 case 1:
3309 rendset = 1, rendstyle = RS_Bold; 4241 rendset = 1, rendstyle = RS_Bold;
3310 break; 4242 break;
4243 //case 2: // low intensity
4244 case 3:
4245 rendset = 1, rendstyle = RS_Italic;
4246 break;
3311 case 4: 4247 case 4:
3312 rendset = 1, rendstyle = RS_Uline; 4248 rendset = 1, rendstyle = RS_Uline;
3313 break; 4249 break;
3314 case 5: 4250 case 5: // slowly blinking
4251 case 6: // rapidly blinking
3315 rendset = 1, rendstyle = RS_Blink; 4252 rendset = 1, rendstyle = RS_Blink;
3316 break; 4253 break;
4254 //case 6: // scoansi light background
3317 case 7: 4255 case 7:
3318 rendset = 1, rendstyle = RS_RVid; 4256 rendset = 1, rendstyle = RS_RVid;
3319 break; 4257 break;
3320 case 8: 4258 case 8:
3321 // invisible. NYI 4259 // invisible. NYI
3322 break; 4260 break;
3323 case 22: 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)
3324 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;
3325 break; 4276 break;
3326 case 24: 4277 case 24:
3327 rendset = 0, rendstyle = RS_Uline; 4278 rendset = 0, rendstyle = RS_Uline;
3328 break; 4279 break;
3329 case 25: 4280 case 25:
3330 rendset = 0, rendstyle = RS_Blink; 4281 rendset = 0, rendstyle = RS_Blink;
3331 break; 4282 break;
4283 case 26: // variable spacing (iso 8613)
4284 rendset = 0, rendstyle = RS_Blink;
4285 break;
3332 case 27: 4286 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 4287 rendset = 0, rendstyle = RS_RVid;
3334 break; 4288 break;
3335 case 28:
3336 // visible. NYI 4289 //case 28: // visible. NYI
3337 break; 4290 //case 29: // not crossed-out
3338 } 4291 }
3339 4292
3340 if (rendset != -1) 4293 if (rendset != -1)
3341 { 4294 {
3342 scr_rendition (rendset, rendstyle); 4295 scr_rendition (rendset, rendstyle);
… …
3353 case 35: 4306 case 35:
3354 case 36: 4307 case 36:
3355 case 37: 4308 case 37:
3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4309 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3357 break; 4310 break;
3358#ifdef TTY_256COLOR 4311 case 38: // set fg color, ISO 8613-6
3359 case 38:
3360 if (nargs > i + 2 && arg[i + 1] == 5) 4312 if (nargs > i + 2 && arg[i + 1] == 5)
3361 { 4313 {
3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4314 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3363 i += 2; 4315 i += 2;
3364 } 4316 }
3365 break; 4317 break;
3366#endif
3367 case 39: /* default fg */ 4318 case 39: /* default fg */
3368 scr_color (Color_fg, Color_fg); 4319 scr_color (Color_fg, Color_fg);
3369 break; 4320 break;
3370 4321
3371 case 40: 4322 case 40:
… …
3376 case 45: 4327 case 45:
3377 case 46: 4328 case 46:
3378 case 47: 4329 case 47:
3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4330 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3380 break; 4331 break;
3381#ifdef TTY_256COLOR 4332 case 48: // set bg color, ISO 8613-6
3382 case 48:
3383 if (nargs > i + 2 && arg[i + 1] == 5) 4333 if (nargs > i + 2 && arg[i + 1] == 5)
3384 { 4334 {
3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4335 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3386 i += 2; 4336 i += 2;
3387 } 4337 }
3388 break; 4338 break;
3389#endif
3390 case 49: /* default bg */ 4339 case 49: /* default bg */
3391 scr_color (Color_bg, Color_bg); 4340 scr_color (Color_bg, Color_bg);
3392 break; 4341 break;
3393 4342
3394#ifndef NO_BRIGHTCOLOR 4343 //case 50: // not variable spacing
4344
4345#if ENABLE_FRILLS
3395 case 90: 4346 case 90:
3396 case 91: /* set bright fg color */ 4347 case 91: /* set bright fg color */
3397 case 92: 4348 case 92:
3398 case 93: 4349 case 93:
3399 case 94: 4350 case 94:
3400 case 95: 4351 case 95:
3401 case 96: 4352 case 96:
3402 case 97: 4353 case 97:
3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4354 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3404 Color_fg);
3405 break; 4355 break;
3406 case 100: 4356 case 100:
3407 case 101: /* set bright bg color */ 4357 case 101: /* set bright bg color */
3408 case 102: 4358 case 102:
3409 case 103: 4359 case 103:
3410 case 104: 4360 case 104:
3411 case 105: 4361 case 105:
3412 case 106: 4362 case 106:
3413 case 107: 4363 case 107:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3415 Color_bg);
3416 break; 4365 break;
3417#endif 4366#endif
3418
3419 } 4367 }
3420 } 4368 }
3421} 4369}
3422/*}}} */ 4370/*}}} */
3423 4371
3424/*{{{ process Rob Nation's own graphics mode sequences */ 4372/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 4373void
3426rxvt_term::process_graphics () 4374rxvt_term::process_graphics ()
3427{ 4375{
3428 unsigned char ch, cmd = cmd_getc (); 4376 unicode_t ch, cmd = cmd_getc ();
3429 4377
3430 if (cmd == 'Q') 4378 if (cmd == 'Q')
3431 { /* query graphics */ 4379 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 4380 tt_printf ("\033G0\012"); /* no graphics */
3433 return; 4381 return;
3434 } 4382 }
3435 /* swallow other graphics sequences until terminating ':' */ 4383 /* swallow other graphics sequences until terminating ':' */
3436 do 4384 do
3437 ch = cmd_getc (); 4385 ch = cmd_getc ();
… …
3447 */ 4395 */
3448void 4396void
3449rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
3450{ 4398{
3451 va_list arg_ptr; 4399 va_list arg_ptr;
3452 unsigned char buf[256]; 4400 char buf[256];
3453 4401
3454 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
3455 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3456 va_end (arg_ptr); 4404 va_end (arg_ptr);
3457 tt_write (buf, STRLEN (buf)); 4405 tt_write (buf, strlen (buf));
3458} 4406}
3459 4407
3460/* ---------------------------------------------------------------------- */ 4408/* ---------------------------------------------------------------------- */
3461/* 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,
3462 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
3463 */ 4411 */
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413
3464void 4414void
3465rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
3466{ 4416{
3467 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));
3468 4420
3469 if (len) 4421 if ((unsigned int)written == len)
4422 return;
4423
4424 data += written;
4425 len -= written;
3470 { 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
3471 if (v_buflen == 0) 4444 if (v_buflen == 0)
3472 { 4445 {
3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3475 if ((unsigned int)written == len)
3476 return;
3477
3478 data += written;
3479 len -= written;
3480 }
3481
3482
3483 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3484
3485 memcpy (v_buffer + v_buflen, data, len);
3486 v_buflen += len;
3487 }
3488
3489 for (;;)
3490 {
3491 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3492
3493 if (written > 0)
3494 {
3495 v_buflen -= written;
3496
3497 if (v_buflen == 0)
3498 {
3499 free (v_buffer); 4446 free (v_buffer);
3500 v_buffer = 0; 4447 v_buffer = 0;
3501 v_buflen = 0; 4448 v_buflen = 0;
3502 4449
3503 pty_ev.set (EVENT_READ); 4450 pty_ev.set (EVENT_READ);
3504 return;
3505 }
3506
3507 memmove (v_buffer, v_buffer + written, v_buflen);
3508 }
3509 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3510 // original code just ignores this...
3511 destroy ();
3512 else
3513 {
3514 pty_ev.set (EVENT_READ | EVENT_WRITE);
3515 return; 4451 return;
3516 } 4452 }
4453
4454 memmove (v_buffer, v_buffer + written, v_buflen);
3517 } 4455 }
4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4457 pty_ev.set (EVENT_READ);
3518} 4458}
3519 4459
3520/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
3521 4461

Diff Legend

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