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.54 by pcg, Sun Feb 22 12:58:02 2004 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

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