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

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

Diff Legend

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