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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 UTC

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

Diff Legend

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