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.50 by pcg, Sun Feb 22 08:09:37 2004 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 UTC

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

Diff Legend

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