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.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.232 by root, Wed Jan 4 01:10:08 2006 UTC

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

Diff Legend

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