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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.229 by root, Tue Jan 3 17:34:44 2006 UTC

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

Diff Legend

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