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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.228 by root, Mon Jan 2 16:08:34 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 if (display->is_local)
1119 event_handler.cw_yield.start ();
1120#endif
1121 }
1122 else
1123 {
1124 pty_ev.stop ();
1125
1126 if (!OPTION (Opt_hold))
787 destroy (); 1127 destroy ();
788 1128 }
1129
789 return false; 1130 return false;
790} 1131}
791 1132
792void 1133void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1134rxvt_term::pty_cb (io_watcher &w, short revents)
794{ 1135{
795 SET_R (this); 1136 SET_R (this);
796 SET_LOCALE (locale); 1137 SET_LOCALE (locale);
797 1138
1139 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ())
1142 if (cmd_parse ())
1143 break;
1144
798 if (revents & EVENT_WRITE) 1145 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1146 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} 1147}
916 1148
917// read the next character, currently handles UTF-8 1149void
918// will probably handle all sorts of other stuff in the future 1150rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1151{
922 while (cmdbuf_ptr < cmdbuf_endp) 1152 XDefineCursor (display->display, vt, TermWin_cursor);
923 { 1153 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1154
927 wchar_t wc; 1155#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1156 hidden_pointer = 0;
929 1157
930 if (len == (size_t)-2) 1158 if (OPTION (Opt_pointerBlank))
931 return NOCHAR; 1159 pointer_ev.start (NOW + pointerBlankDelay);
932 1160#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} 1161}
965 1162
966#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
967void 1164void
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 () 1165rxvt_term::pointer_blank ()
981{ 1166{
982 if (! (Options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
983 return; 1168 return;
984 1169
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
986 XFlush (display->display); 1171 XFlush (display->display);
987 1172
988 hidden_pointer = 1; 1173 hidden_pointer = 1;
989} 1174}
990 1175
… …
997 pointer_blank (); 1182 pointer_blank ();
998} 1183}
999#endif 1184#endif
1000 1185
1001void 1186void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1187rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1188{
1004 int button_number, key_state = 0; 1189 int button_number, key_state = 0;
1005 int x, y; 1190 int x, y;
1006 1191
1007 x = ev.x; 1192 x = ev.x;
1008 y = ev.y; 1193 y = ev.y;
1009 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
1010 1195
1011 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1197 button_number = 3;
1014 }
1015 else 1198 else
1016 { 1199 {
1017 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1202 if (button_number >= 3)
1020 button_number += (64 - 3); 1203 button_number += (64 - 3);
1021 } 1204 }
1022 1205
1023 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
1024 { 1207 {
1025 /* 1208 /*
1026 * do not report ButtonRelease 1209 * do not report ButtonRelease
1027 * no state info allowed 1210 * no state info allowed
1028 */ 1211 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1230#endif
1048
1049 } 1231 }
1050 1232
1051#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1235 if (key_state & 16)
1054 fputc ('C', stderr); 1236 fputc ('C', stderr);
1055 if (key_state & 4) 1237 if (key_state & 4)
1056 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1242 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1244 button_number,
1063 x + 1, 1245 x + 1,
1064 y + 1); 1246 y + 1);
1065#else 1247#endif
1248
1066 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1068 (32 + x + 1), 1251 (32 + x + 1),
1069 (32 + y + 1)); 1252 (32 + y + 1));
1070#endif
1071} 1253}
1072 1254
1073#ifdef USING_W11LIB 1255#ifdef USING_W11LIB
1074void 1256void
1075rxvt_W11_process_x_event (XEvent *ev) 1257rxvt_W11_process_x_event (XEvent *ev)
… …
1082 1264
1083/*{{{ process an X event */ 1265/*{{{ process an X event */
1084void 1266void
1085rxvt_term::x_cb (XEvent &ev) 1267rxvt_term::x_cb (XEvent &ev)
1086{ 1268{
1269 dDisp;
1270
1087 SET_R (this); 1271 SET_R (this);
1088 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
1089 1273
1090#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1092 { 1276 {
1093 if (hidden_cursor) 1277 if (hidden_cursor)
1094 { 1278 {
1095 hidden_cursor = 0; 1279 hidden_cursor = 0;
1096 want_refresh = 1; 1280 want_refresh = 1;
… …
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 } 1284 }
1101#endif 1285#endif
1102 1286
1103#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1105 { 1289 {
1106 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
1109 if (hidden_pointer) 1293 if (hidden_pointer)
… …
1112 if (ev.type == KeyPress && hidden_pointer == 0) 1296 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank (); 1297 pointer_blank ();
1114 } 1298 }
1115#endif 1299#endif
1116 1300
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1122 Window unused_root, unused_child; 1301 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1302 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1303 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 1304
1175 switch (ev.type) 1305 switch (ev.type)
1176 { 1306 {
1177 case KeyPress: 1307 case KeyPress:
1308#if ISO_14755
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1178 lookup_key (ev.xkey); 1311 lookup_key (ev.xkey);
1312
1313 break;
1314
1315 case KeyRelease:
1316 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1179 break; 1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1180 1376
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease:
1183 {
1184 if (! (ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1185 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1186 else 1382#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; 1383 break;
1195 } 1384 }
1196#endif
1197 1385
1198 case ButtonPress: 1386 case ButtonPress:
1199 button_press (ev.xbutton); 1387 button_press (ev.xbutton);
1200 break; 1388 break;
1201 1389
… …
1203 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1204 break; 1392 break;
1205 1393
1206 case ClientMessage: 1394 case ClientMessage:
1207 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1209 destroy (); 1399 destroy ();
1400#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev);
1405#endif
1406 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1210#ifdef OFFIX_DND 1416#ifdef OFFIX_DND
1211 /* OffiX Dnd (drag 'n' drop) protocol */ 1417 /* OffiX Dnd (drag 'n' drop) protocol */
1212 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1213 && (ev.xclient.data.l[0] == DndFile 1419 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1420 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1421 || ev.xclient.data.l[0] == DndLink))
1216 { 1422 {
1217 /* Get Dnd data */ 1423 /* Get Dnd data */
1218 Atom ActualType; 1424 Atom ActualType;
1219 int ActualFormat; 1425 int ActualFormat;
1220 unsigned char *data; 1426 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1427 unsigned long Size, RemainingBytes;
1222 1428
1223 XGetWindowProperty (display->display, display->root, 1429 XGetWindowProperty (disp, display->root,
1224 xa[XA_DNDSELECTION], 1430 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1431 0L, 1000000L,
1226 False, AnyPropertyType, 1432 False, AnyPropertyType,
1227 &ActualType, &ActualFormat, 1433 &ActualType, &ActualFormat,
1228 &Size, &RemainingBytes, 1434 &Size, &RemainingBytes,
1229 &data); 1435 &data);
1230 XChangeProperty (display->display, display->root, 1436 set_string_property (XA_CUT_BUFFER0, data);
1231 XA_CUT_BUFFER0, XA_STRING, 1437 XFree (data);
1232 8, PropModeReplace,
1233 data, STRLEN (data));
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1236 } 1440 }
1237#endif /* OFFIX_DND */ 1441#endif /* OFFIX_DND */
1238 break; 1442 break;
1239 1443
1240 case MappingNotify: 1444 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1445 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1446 break;
1243 1447
1244 /* 1448 /*
1245 * XXX: this is not the _current_ arrangement 1449 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1450 * Here's my conclusion:
… …
1265 break; 1469 break;
1266 } 1470 }
1267 break; 1471 break;
1268 1472
1269 case FocusIn: 1473 case FocusIn:
1270 if (!TermWin.focus) 1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 focus_out ();
1479 break;
1480
1481 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0])
1271 { 1483 {
1272 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1273 want_refresh = 1; 1485 ;
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 1486
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 {
1489 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 }
1492
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent))
1495 check_our_parents ();
1496#endif
1283 } 1497 }
1284 break; 1498 break;
1285 1499
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: 1500 case PropertyNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1306 { 1502 && ev.xproperty.state == PropertyNewValue)
1307 int height, width; 1503 selection_property (ev.xproperty.window, ev.xproperty.atom);
1308 1504
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; 1505 break;
1339 1506
1340 case SelectionClear: 1507 case SelectionClear:
1341 display->set_selection_owner (0); 1508 selection_clear ();
1342 break; 1509 break;
1343 1510
1344 case SelectionNotify: 1511 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1512 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1514 break;
1349 1515
1350 case SelectionRequest: 1516 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1352 break; 1518 break;
1353 1519
1354 case UnmapNotify: 1520 case UnmapNotify:
1355 TermWin.mapped = 0; 1521 mapped = 0;
1356#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1357 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1358#endif 1524#endif
1359 break; 1525 break;
1360 1526
1361 case MapNotify: 1527 case MapNotify:
1362 TermWin.mapped = 1; 1528 mapped = 1;
1363#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1364 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1365#endif 1531#endif
1366 break; 1532 break;
1367 1533
… …
1371 break; 1537 break;
1372#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1373 1539
1374 case GraphicsExpose: 1540 case GraphicsExpose:
1375 case Expose: 1541 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1377 { 1543 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1544 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1548
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1554
1386 // ev.xexpose.width, TermWin.height, False); 1555 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1556 }
1390 else 1557 else
1391 { 1558 {
1392 XEvent unused_event; 1559 XEvent unused_event;
1393 1560
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1395 Expose, 1562 ;
1396 &unused_event)) ; 1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1564 ;
1398 GraphicsExpose, 1565
1399 &unused_event)) ;
1400 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1401 { 1567 {
1402 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1403 scrollbar_show (0); 1569 scrollbar_show (0);
1404 } 1570 }
1405#ifdef MENUBAR 1571#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1573 menubar_expose ();
1408#endif 1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1409 } 1580 }
1410 break; 1581 break;
1411 1582
1412 case MotionNotify: 1583 case MotionNotify:
1413#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1586 pointer_unblank ();
1416#endif 1587#endif
1417#if MENUBAR 1588#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1589 if (isMenuBarWindow (ev.xany.window))
1419 { 1590 {
1420 menubar_control (& (ev.xbutton)); 1591 menubar_control (ev.xbutton);
1421 break; 1592 break;
1422 } 1593 }
1423#endif 1594#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1596 break;
1426 1597
1427 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1428 { 1599 {
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1601 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1432 ; 1603 ;
1433 1604
1434 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (disp, vt,
1435 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1609 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1613 {
1443#endif 1614#endif
1615#if ISO_14755
1616 // 5.4
1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1618 {
1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1620 break;
1621 }
1622#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1446#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1449 { 1629 {
1450 int dist; 1630 int dist;
1451
1452 pending_scroll_selection=1;
1453 1631
1454 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
1456 */ 1634 */
1457 if (scroll_selection_delay<=0) 1635 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1637
1460 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1462 */ 1640 */
1463 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1644
1468 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1470 { 1647 {
1471 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1473 } 1650 }
1474 else 1651 else
1475 { 1652 {
1476 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1478 (TermWin.int_bwidth + TermWin.height);
1479 } 1655 }
1656
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1482 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1484 } 1662 }
1485 else 1663 else
1486 { 1664 {
1487 /* we are within the text window, so we 1665 /* we are within the text window, so we
1488 * shouldn't be scrolling 1666 * shouldn't be scrolling
1489 */ 1667 */
1490 pending_scroll_selection = 0; 1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop();
1491 } 1670 }
1492#endif 1671#endif
1493#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1494
1495 } 1673 }
1496#endif 1674#endif
1497
1498 } 1675 }
1499 } 1676 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1678 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1503 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1504 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (disp, scrollBar.win,
1505 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1687 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1689 scrollbar_size ());
1511 scr_refresh (refresh_type); 1690 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1691 refresh_limit = 0;
… …
1515 break; 1694 break;
1516 } 1695 }
1517} 1696}
1518 1697
1519void 1698void
1699rxvt_term::focus_in ()
1700{
1701 if (!focus)
1702 {
1703 focus = 1;
1704 want_refresh = 1;
1705
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707
1708#if USE_XIM
1709 if (Input_Context != NULL)
1710 {
1711 IMSetStatusPosition ();
1712 XSetICFocus (Input_Context);
1713 }
1714#endif
1715#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1718#endif
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 pix_colors = pix_colors_focused;
1723 scr_recolour ();
1724 }
1725#endif
1726 }
1727}
1728
1729void
1730rxvt_term::focus_out ()
1731{
1732 if (focus)
1733 {
1734 focus = 0;
1735 want_refresh = 1;
1736
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1742 iso14755buf = 0;
1743# if ENABLE_OVERLAY
1744 scr_overlay_off ();
1745# endif
1746 }
1747#endif
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context);
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.stop ();
1755 hidden_cursor = 0;
1756#endif
1757#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade])
1759 {
1760 pix_colors = pix_colors_unfocused;
1761 scr_recolour ();
1762 }
1763#endif
1764 }
1765}
1766
1767#if TRANSPARENT
1768void
1520rxvt_term::rootwin_cb (XEvent &ev) 1769rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1770{
1522 SET_R (this); 1771 SET_R (this);
1523 SET_LOCALE (locale); 1772 SET_LOCALE (locale);
1524 1773
1525 switch (ev.type) 1774 switch (ev.type)
1526 { 1775 {
1527 case PropertyNotify: 1776 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 /* 1777 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1778 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on. 1779 * use the property to determine the pixmap. We use it later on.
1540 */ 1780 */
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]) 1781 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1545 return; 1783 return;
1546 }
1547 1784
1548 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1549 case ReparentNotify: 1786 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1553 break; 1789 break;
1554#endif
1555 } 1790 }
1556} 1791}
1792#endif
1557 1793
1558void 1794void
1559rxvt_term::button_press (const XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1560{ 1796{
1561 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1562 1798
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1800 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1566 /* 1803 /*
1567 * VT window processing of button press 1804 * VT window processing of button press
1568 */ 1805 */
1569 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1570 { 1807 {
1808#if ISO_14755
1809 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 {
1812 iso14755_54 (ev.x, ev.y);
1813 return;
1814 }
1815#endif
1816
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1817 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1818
1572 if (reportmode) 1819 if (reportmode)
1573 { 1820 {
1574 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1822 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1823 MEvent.state = ev.state;
… …
1605 } 1852 }
1606 else 1853 else
1607 { 1854 {
1608 if (ev.button != MEvent.button) 1855 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1856 MEvent.clicks = 0;
1857
1610 switch (ev.button) 1858 switch (ev.button)
1611 { 1859 {
1612 case Button1: 1860 case Button1:
1861 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */
1863#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask);
1865#else
1866 selection.rect = false;
1867#endif
1868
1613 /* allow shift+left click to extend selection */ 1869 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1615 { 1871 {
1616 if (MEvent.button == Button1 && clickintime) 1872 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1873 selection_rotate (ev.x, ev.y);
1618 else 1874 else
1619 selection_extend (ev.x, ev.y, 1); 1875 selection_extend (ev.x, ev.y, 1);
… …
1634 case Button3: 1890 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1891 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1892 selection_rotate (ev.x, ev.y);
1637 else 1893 else
1638 selection_extend (ev.x, ev.y, 1); 1894 selection_extend (ev.x, ev.y, 1);
1895
1639 MEvent.button = Button3; 1896 MEvent.button = Button3;
1640 break; 1897 break;
1641 } 1898 }
1642 } 1899 }
1900
1643 MEvent.time = ev.time; 1901 MEvent.time = ev.time;
1644 return; 1902 return;
1645 } 1903 }
1646 1904
1647 /* 1905 /*
… …
1713 upordown = 1; /* down */ 1971 upordown = 1; /* down */
1714 } 1972 }
1715 if (upordown) 1973 if (upordown)
1716 { 1974 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1976 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1977#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1978 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1979 {
1722 if (upordown < 0) 1980 if (upordown < 0)
1723 scrollBar.setUp (); 1981 scrollBar.setUp ();
… …
1739 break; 1997 break;
1740 case R_SB_ALIGN_BOTTOM: 1998 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 1999 csrO = scrollBar.bot - scrollBar.top;
1742 break; 2000 break;
1743 } 2001 }
2002
1744 if (scrollBar.style == R_SB_XTERM 2003 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 2004 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 2005 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 2006 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 2007
1749 scrollBar.setMotion (); 2008 scrollBar.setMotion ();
1750 break; 2009 break;
1751 2010
1752 case Button1: 2011 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2012 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1757 case Button3: 2016 case Button3:
1758 if (scrollBar.style != R_SB_XTERM) 2017 if (scrollBar.style != R_SB_XTERM)
1759 { 2018 {
1760 if (scrollbar_above_slider (ev.y)) 2019 if (scrollbar_above_slider (ev.y))
1761# ifdef RXVT_SCROLL_FULL 2020# ifdef RXVT_SCROLL_FULL
1762 scr_page (UP, TermWin.nrow - 1); 2021 scr_page (UP, nrow - 1);
1763# else 2022# else
1764 scr_page (UP, TermWin.nrow / 4); 2023 scr_page (UP, nrow / 4);
1765# endif 2024# endif
1766 else if (scrollbar_below_slider (ev.y)) 2025 else if (scrollbar_below_slider (ev.y))
1767# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1768 scr_page (DN, TermWin.nrow - 1); 2027 scr_page (DN, nrow - 1);
1769# else 2028# else
1770 scr_page (DN, TermWin.nrow / 4); 2029 scr_page (DN, nrow / 4);
1771# endif 2030# endif
1772 else 2031 else
1773 scrollBar.setMotion (); 2032 scrollBar.setMotion ();
1774 } 2033 }
1775 else 2034 else
1776 { 2035 {
1777 scr_page ((ev.button == Button1 ? DN : UP), 2036 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 2037 (nrow
1779 * scrollbar_position (ev.y) 2038 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 2039 / scrollbar_size ()));
1781 } 2040 }
2041
1782 break; 2042 break;
1783 } 2043 }
1784 } 2044 }
1785 return; 2045 return;
1786 } 2046 }
… …
1792 menubar_control (ev); 2052 menubar_control (ev);
1793#endif 2053#endif
1794} 2054}
1795 2055
1796void 2056void
1797rxvt_term::button_release (const XButtonEvent &ev) 2057rxvt_term::button_release (XButtonEvent &ev)
1798{ 2058{
1799 int reportmode = 0; 2059 int reportmode = 0;
1800 2060
1801 csrO = 0; /* reset csr Offset */ 2061 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 2062 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2063 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 2064
1805 if (scrollbar_isUpDn ()) 2065 if (scrollbar_isUpDn ())
1806 { 2066 {
1807 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
1808 scrollbar_show (0); 2068 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 2070 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 2071#endif
1812
1813 } 2072 }
2073
1814#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 2075 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop();
1816#endif 2077#endif
2078
1817 if (ev.window == TermWin.vt) 2079 if (ev.window == vt)
1818 { 2080 {
2081#if ISO_14755
2082 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return;
2085#endif
1819 if (reportmode) 2086 if (reportmode)
1820 { 2087 {
1821 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1838 mouse_report (ev); 2105 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2107 return;
1841 } 2108 }
2109
1842 /* 2110 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2112 * when overriding mouse reporting
1845 */ 2113 */
1846 if (PrivateModes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2115 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
1850 2118
1851 switch (ev.button) 2119 switch (ev.button)
… …
1862 case Button5: 2130 case Button5:
1863 { 2131 {
1864 int i; 2132 int i;
1865 page_dirn v; 2133 page_dirn v;
1866 2134
1867 v = (ev.button == Button4) ? UP : DN; 2135 v = ev.button == Button4 ? UP : DN;
2136
1868 if (ev.state & ShiftMask) 2137 if (ev.state & ShiftMask)
1869 i = 1; 2138 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2139 else if (OPTION (Opt_mouseWheelScrollPage))
1871 i = TermWin.nrow - 1; 2140 i = nrow - 1;
1872 else 2141 else
1873 i = 5; 2142 i = 5;
2143
1874# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2145 if (ev.state & ControlMask)
1876 { 2146 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2147 mouse_slip_wheel_speed += v ? -1 : 1;
2148 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2149 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2150
2151 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2152 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2153
2154 slip_wheel_ev.start ();
1879 } 2155 }
2156 else
2157 {
1880# endif 2158# endif
1881# ifdef JUMP_MOUSE_WHEEL 2159# 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); 2160 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 2161 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 2162 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING
1891 } 2172 }
1892# endif 2173#endif
1893
1894 } 2174 }
1895 break; 2175 break;
1896#endif 2176#endif
1897
1898 } 2177 }
1899 } 2178 }
1900#ifdef MENUBAR 2179#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2180 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2181 menubar_control (ev);
1903#endif 2182#endif
1904} 2183}
1905 2184
1906
1907#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2186#if TINTING
2187/* taken from aterm-0.4.2 */
2188
2189typedef uint32_t RUINT32T;
2190
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{
2193 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
2199
2200 Visual *visual = display->visual;
2201
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203
2204 /* for convenience */
2205 mask_r = visual->red_mask;
2206 mask_g = visual->green_mask;
2207 mask_b = visual->blue_mask;
2208
2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2282 } else {
2283 if (shade < 0) shade = 0;
2284 if (shade > 100) shade = 100;
2285
2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2287
2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2291 }
2292
2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2295 {
2296 unsigned int tmp;
2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 16:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0xf800)>>11] |
2364 lookup_g[(*p & 0x07e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xff0000)>>16] |
2403 lookup_g[(*p & 0x00ff00)>> 8] |
2404 lookup_b[(*p & 0x0000ff)] |
2405 (*p & ~0xffffff);
2406 }
2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 }
2412
2413 free (lookup);
2414}
2415#endif
2416
1908/* 2417/*
1909 * Check our parents are still who we think they are. 2418 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2419 * Do transparency updates if required
1911 */ 2420 */
1912int 2421int
1913rxvt_term::check_our_parents () 2422rxvt_term::check_our_parents ()
1914{ 2423{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2424 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2425 unsigned long nitems, bytes_after;
1917 Atom atype; 2426 Atom atype;
1918 unsigned char *prop = NULL; 2427 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2428 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2429 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
1922 2432
1923 pchanged = 0; 2433 pchanged = 0;
1924 2434
1925 if (! (Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1927 2437
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1930 2440
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
2442
1932 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1933 { 2444 {
1934 if (am_transparent) 2445 if (am_transparent)
1935 { 2446 {
1936 pchanged = 1; 2447 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1940 } 2450 }
2451
1941 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1942 } 2453 }
1943 2454
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2456 XSync (disp, False);
1946 2457
1947 /* 2458 /*
1948 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
1951 */ 2462 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2463 i = (xa[XA_XROOTPMAP_ID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2466 &nitems, &bytes_after, &prop) == Success);
2467
1956 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
1957 have_pixmap = 0; 2479 have_pixmap = 0;
1958 else 2480 else
1959 { 2481 {
1960 have_pixmap = 1; 2482 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2483 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2484 XFree (prop);
1963 } 2485 }
2486
1964 if (have_pixmap) 2487 if (have_pixmap)
1965 { 2488 {
1966 /* 2489 /*
1967 * Copy display->root pixmap transparency 2490 * Copy display->root pixmap transparency
1968 */ 2491 */
1969 int sx, sy, nx, ny; 2492 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2493 unsigned int nw, nh;
1971 Window cr; 2494 Window cr;
1972 XImage *image; 2495 XImage *image;
1973 GC gc; 2496 GC gc;
1974 XGCValues gcvalue; 2497 XGCValues gcvalue;
1975 2498
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2503 nx = ny = 0;
2504
1981 if (sx < 0) 2505 if (sx < 0)
1982 { 2506 {
1983 nw += sx; 2507 nw += sx;
1984 nx = -sx; 2508 nx = -sx;
1985 sx = 0; 2509 sx = 0;
1986 } 2510 }
2511
1987 if (sy < 0) 2512 if (sy < 0)
1988 { 2513 {
1989 nh += sy; 2514 nh += sy;
1990 ny = -sy; 2515 ny = -sy;
1991 sy = 0; 2516 sy = 0;
1992 } 2517 }
2518
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
1995 allowedxerror = -1; 2523 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2525
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2528 allowedxerror = 0;
2529
2001 if (image == NULL) 2530 if (image == NULL)
2002 { 2531 {
2003 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2004 { 2533 {
2005 pchanged = 1; 2534 pchanged = 1;
2006 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2007 { 2536 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
2009 TermWin.pixmap = None; 2538 pixmap = None;
2010 } 2539 }
2011 } 2540 }
2541
2012 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2013 } 2543 }
2014 else 2544 else
2015 { 2545 {
2016 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2556
2557 ShadeXImage (display, image, shade, rm, gm, bm);
2558 }
2559#endif
2560
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2562 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2565 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2566 XFreeGC (disp, gc);
2027 XDestroyImage (image); 2567 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2029 TermWin.pixmap); 2569 XClearWindow (disp, parent[0]);
2570
2030 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2572 pchanged = 1;
2573
2032 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2033 } 2575 }
2034 } 2576 }
2577
2035 if (!am_pixmap_trans) 2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2036 { 2581 {
2037 unsigned int n; 2582 unsigned int n;
2038 /* 2583 /*
2039 * InheritPixmap transparency 2584 * InheritPixmap transparency
2040 */ 2585 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2587 {
2045 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2048 XFree (list); 2591 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2592
2050 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2051 { 2594 {
2052 if (oldp != None) 2595 if (oldp != None)
2053 pchanged = 1; 2596 pchanged = 1;
2597
2054 break; 2598 break;
2055 } 2599 }
2600
2056 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2057 pchanged = 1; 2602 pchanged = 1;
2058 } 2603 }
2604
2059 n = 0; 2605 n = 0;
2606
2060 if (pchanged) 2607 if (pchanged)
2061 { 2608 {
2062 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2063 { 2610 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2611 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) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2613 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2069 break; 2615 break;
2070 } 2616 }
2071 } 2617 }
2072 } 2618 }
2073 if (n > (int) (sizeof (TermWin.parent) 2619
2074 / sizeof (TermWin.parent[0]))) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2075 { 2621 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2623 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; 2624 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2083 } 2626 }
2084 else 2627 else
2085 { 2628 {
2629#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2630 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2631 * 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); 2632 sleep (1);
2096# endif 2633#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2635 {
2100 ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2637 XClearWindow (disp, parent[n]);
2102 ParentRelative); 2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2103 am_transparent = 1; 2641 am_transparent = 1;
2104 } 2642 }
2643
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2107 } 2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2108 return pchanged; 2662 return pchanged;
2109} 2663}
2110#endif 2664#endif
2111 2665
2112/*}}} */ 2666/*}}} */
2667
2668bool
2669rxvt_term::cmd_parse ()
2670{
2671 bool flag = false;
2672 unicode_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here
2674
2675 for (;;)
2676 {
2677 if (ch == NOCHAR)
2678 {
2679 seq_begin = cmdbuf_ptr;
2680 ch = next_char ();
2681 }
2682
2683 if (ch == NOCHAR) // TODO: improve
2684 break;
2685
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 {
2688 if (!seen_input)
2689 {
2690 seen_input = 1;
2691 // many badly-written programs (e.g. jed) contain a race condition:
2692 // they first read the screensize and then install a SIGWINCH handler.
2693 // some window managers resize the window early, and these programs
2694 // then sometimes get the size wrong.
2695 // unfortunately other programs are even more buggy and dislike
2696 // being sent SIGWINCH, so only do it when we were in fact being
2697 // resized.
2698 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH);
2700 }
2701
2702 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ];
2704 bool refreshnow = false;
2705 int nlines = 0;
2706 unicode_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ);
2708
2709 for (;;)
2710 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break;
2713
2714 *str++ = ch;
2715
2716 if (ch == C0_LF || str >= eol)
2717 {
2718 if (ch == C0_LF)
2719 nlines++;
2720
2721 refresh_count++;
2722
2723 if (!OPTION (Opt_jumpScroll)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 {
2726 refreshnow = true;
2727 refresh_count = 0;
2728 ch = NOCHAR;
2729 break;
2730 }
2731
2732 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1)
2734 {
2735 scr_add_lines (buf, nlines, str - buf);
2736 nlines = 0;
2737 str = buf;
2738 eol = str + min (ncol, UBUFSIZ);
2739 }
2740
2741 if (str >= eol)
2742 {
2743 if (eol >= buf + UBUFSIZ)
2744 {
2745 ch = NOCHAR;
2746 break;
2747 }
2748 else
2749 eol = min (eol + ncol, buf + UBUFSIZ);
2750 }
2751
2752 }
2753
2754 seq_begin = cmdbuf_ptr;
2755 ch = next_char ();
2756 }
2757
2758 scr_add_lines (buf, nlines, str - buf);
2759
2760 /*
2761 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which
2764 * is incremented here because we must be doing flat-out scrolling.
2765 */
2766 if (refreshnow)
2767 {
2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2769 refresh_limit++;
2770 else
2771 {
2772 flag = true;
2773 scr_refresh (refresh_type);
2774 flush_ev.stop ();
2775 }
2776 }
2777
2778 }
2779 else
2780 {
2781 try
2782 {
2783 process_nonprinting (ch);
2784 }
2785 catch (const class out_of_input &o)
2786 {
2787 // we ran out of input, retry later
2788 cmdbuf_ptr = seq_begin;
2789 break;
2790 }
2791
2792 ch = NOCHAR;
2793 }
2794 }
2795
2796 return flag;
2797}
2798
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character
2809unicode_t
2810rxvt_term::next_char ()
2811{
2812 while (cmdbuf_ptr < cmdbuf_endp)
2813 {
2814 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++;
2817
2818 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820
2821 if (len == (size_t)-2)
2822 {
2823 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp;
2825 break;
2826 }
2827
2828 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830
2831 // assume wchar == unicode
2832 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK;
2834 }
2835
2836 return NOCHAR;
2837}
2838
2839/* rxvt_cmd_getc () - Return next input character */
2840/*
2841 * Return the next input character after first passing any keyboard input
2842 * to the command.
2843 */
2844unicode_t
2845rxvt_term::cmd_getc ()
2846{
2847 unicode_t c = next_char ();
2848
2849 if (c == NOCHAR)
2850 throw out_of_input;
2851
2852 return c;
2853}
2854
2855unicode_t
2856rxvt_term::cmd_get8 ()
2857{
2858 unicode_t c = next_octet ();
2859
2860 if (c == NOCHAR)
2861 throw out_of_input;
2862
2863 return c;
2864}
2113 2865
2114/*{{{ print pipe */ 2866/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2867/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2868#ifdef PRINTPIPE
2117FILE * 2869FILE *
2118rxvt_term::popen_printer () 2870rxvt_term::popen_printer ()
2119{ 2871{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2872 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2873
2122 if (stream == NULL) 2874 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2875 rxvt_warn ("can't open printer pipe, not printing.\n");
2876
2124 return stream; 2877 return stream;
2125} 2878}
2126 2879
2127int 2880int
2128rxvt_term::pclose_printer (FILE *stream) 2881rxvt_term::pclose_printer (FILE *stream)
2129{ 2882{
2130 fflush (stream); 2883 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); 2884 return pclose (stream);
2137# endif
2138} 2885}
2139 2886
2140/* 2887/*
2141 * simulate attached vt100 printer 2888 * simulate attached vt100 printer
2142 */ 2889 */
2143void 2890void
2144rxvt_term::process_print_pipe () 2891rxvt_term::process_print_pipe ()
2145{ 2892{
2146 int done; 2893 int done;
2147 FILE *fd; 2894 FILE *fd;
2148 2895
2149 if ((fd = popen_printer ()) == NULL) 2896 if ((fd = popen_printer ()) == NULL)
2150 return; 2897 return;
2151 2898
2152 /* 2899 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2900 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2901 * is received.
2155 */ 2902 */
2156 for (done = 0; !done;) 2903 for (done = 0; !done;)
2157 { 2904 {
2158 unsigned char buf[8]; 2905 unsigned char buf[8];
2159 unsigned char ch; 2906 unicode_t ch;
2160 unsigned int i, len; 2907 unsigned int i, len;
2161 2908
2162 if ((ch = cmd_getc ()) != C0_ESC) 2909 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2910 {
2164 if (putc (ch, fd) == EOF) 2911 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2912 break; /* done = 1 */
… …
2180 { 2927 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2928 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2929 break; /* done = 1 */
2183 } 2930 }
2184 } 2931 }
2932
2185 for (i = 0; i < len; i++) 2933 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2934 if (putc (buf[i], fd) == EOF)
2187 { 2935 {
2188 done = 1; 2936 done = 1;
2189 break; 2937 break;
2190 } 2938 }
2191 } 2939 }
2192 } 2940 }
2941
2193 pclose_printer (fd); 2942 pclose_printer (fd);
2194} 2943}
2195#endif /* PRINTPIPE */ 2944#endif /* PRINTPIPE */
2196/*}}} */ 2945/*}}} */
2197 2946
2198/* *INDENT-OFF* */ 2947/* *INDENT-OFF* */
2199enum { 2948enum {
2200 C1_40 = 0x40, 2949 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2950 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, 2951 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, 2952 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 2953 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2954};
2206/* *INDENT-ON* */ 2955/* *INDENT-ON* */
2207 2956
2208/*{{{ process non-printing single characters */ 2957/*{{{ process non-printing single characters */
2209void 2958void
2210rxvt_term::process_nonprinting (unsigned char ch) 2959rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2960{
2212 switch (ch) 2961 switch (ch)
2213 { 2962 {
2963 case C0_ESC:
2964 process_escape_seq ();
2965 break;
2214 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2219 else 2970 else
2220 tt_write ((unsigned char *)VT100_ANS, 2971 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2972 (unsigned int)strlen (VT100_ANS));
2222 break; 2973 break;
2223 case C0_BEL: /* bell */ 2974 case C0_BEL: /* bell */
2224 scr_bell (); 2975 scr_bell ();
2225 break; 2976 break;
2226 case C0_BS: /* backspace */ 2977 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2992 scr_charset_choose (1);
2242 break; 2993 break;
2243 case C0_SI: /* shift in - acs */ 2994 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2995 scr_charset_choose (0);
2245 break; 2996 break;
2997
2998#ifdef EIGHT_BIT_CONTROLS
2999 // 8-bit controls
3000 case 0x90: /* DCS */
3001 process_dcs_seq ();
3002 break;
3003 case 0x9b: /* CSI */
3004 process_csi_seq ();
3005 break;
3006 case 0x9d: /* CSI */
3007 process_osc_seq ();
3008 break;
3009#endif
2246 } 3010 }
2247} 3011}
2248/*}}} */ 3012/*}}} */
2249 3013
2250 3014
2251/*{{{ process VT52 escape sequences */ 3015/*{{{ process VT52 escape sequences */
2252void 3016void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 3017rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 3018{
2255 int row, col; 3019 int row, col;
2256 3020
2257 switch (ch) 3021 switch (ch)
2258 { 3022 {
… …
2310 3074
2311/*{{{ process escape sequences */ 3075/*{{{ process escape sequences */
2312void 3076void
2313rxvt_term::process_escape_seq () 3077rxvt_term::process_escape_seq ()
2314{ 3078{
2315 unsigned char ch = cmd_getc (); 3079 unicode_t ch = cmd_getc ();
2316 3080
2317 if (PrivateModes & PrivMode_vt52) 3081 if (priv_modes & PrivMode_vt52)
2318 { 3082 {
2319 process_escape_vt52 (ch); 3083 process_escape_vt52 (ch);
2320 return; 3084 return;
2321 } 3085 }
2322 3086
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 3101 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 3102 break;
2339 case '+': 3103 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 3104 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 3105 break;
2342#ifdef MULTICHAR_SET 3106#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': 3107 case '6':
2349 scr_backindex (); 3108 scr_backindex ();
2350 break; 3109 break;
2351#endif 3110#endif
2352 case '7': 3111 case '7':
2353 scr_cursor (SAVE); 3112 scr_cursor (SAVE);
2354 break; 3113 break;
2355 case '8': 3114 case '8':
2356 scr_cursor (RESTORE); 3115 scr_cursor (RESTORE);
2357 break; 3116 break;
2358#ifndef NO_FRILLS 3117#if ENABLE_FRILLS
2359 case '9': 3118 case '9':
2360 scr_forwardindex (); 3119 scr_forwardindex ();
2361 break; 3120 break;
2362#endif 3121#endif
2363 case '=': 3122 case '=':
… …
2373 break; 3132 break;
2374 3133
2375 /* 8.3.87: NEXT LINE */ 3134 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3135 case C1_NEL: /* ESC E */
2377 { 3136 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3137 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3138 scr_add_lines (nlcr, 1, 2);
2380 } 3139 }
2381 break; 3140 break;
2382 3141
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3142 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 3153 case C1_RI: /* ESC M */
2395 scr_index (DN); 3154 scr_index (DN);
2396 break; 3155 break;
2397 3156
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3157 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3158 /*case C1_SS2: scr_single_shift (2); break; */
2400 3159
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3160 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3161 /*case C1_SS3: scr_single_shift (3); break; */
2403 3162
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3163 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3164 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3165 process_dcs_seq ();
2407 break; 3166 break;
… …
2422 process_osc_seq (); 3181 process_osc_seq ();
2423 break; 3182 break;
2424 3183
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3184 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3185 case 'c':
3186 mbstate.reset ();
2427 scr_poweron (); 3187 scr_poweron ();
2428 scrollbar_show (1); 3188 scrollbar_show (1);
2429 break; 3189 break;
2430 3190
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3191 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3203
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3204/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3205/* *INDENT-OFF* */
2446enum { 3206enum {
2447 CSI_ICH = 0x40, 3207 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3208 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 , 3209 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, 3210 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, 3211 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, 3212 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, 3213 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, */ 3228 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, [, \, ], ^, _, */ 3229 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, */ 3230 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, */ 3231 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, */ 3232 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, {, |, }, ~, */ 3233 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3234 };
2475/* *INDENT-ON* */ 3235/* *INDENT-ON* */
2476 3236
2477void 3237void
2478rxvt_term::process_csi_seq () 3238rxvt_term::process_csi_seq ()
2479{ 3239{
2480 unsigned char ch, priv, i; 3240 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3241 unsigned int nargs, p;
2482 int n, ndef; 3242 int n, ndef;
2483 int arg[ESC_ARGS]; 3243 int arg[ESC_ARGS];
2484 3244
2485 for (nargs = ESC_ARGS; nargs > 0;) 3245 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3246 arg[--nargs] = 0;
2487 3247
2488 priv = 0; 3248 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3250 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3251 { /* '<' '=' '>' '?' */
2492 priv = ch; 3252 priv = ch;
2493 ch = cmd_getc (); 3253 ch = cmd_getc ();
2494 } 3254 }
3255
2495 /* read any numerical arguments */ 3256 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3257 for (n = -1; ch < CSI_ICH; )
2497 { 3258 {
2498 if (isdigit (ch)) 3259 if (isdigit (ch))
2499 { 3260 {
… …
2506 { 3267 {
2507 if (nargs < ESC_ARGS) 3268 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3269 arg[nargs++] = n;
2509 n = -1; 3270 n = -1;
2510 } 3271 }
2511 else if (ch == '\b') 3272 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); 3273 process_nonprinting (ch);
2523 } 3274
2524 ch = cmd_getc (); 3275 ch = cmd_getc ();
2525 } 3276 }
2526 3277
2527 if (ch > CSI_7F) 3278 if (ch > CSI_7F)
2528 return; 3279 return;
… …
2550 { 3301 {
2551 switch (priv) 3302 switch (priv)
2552 { 3303 {
2553 case '>': 3304 case '>':
2554 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2556 break; 3307 break;
2557 case '?': 3308 case '?':
2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2559 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
2560 break; 3311 break;
… …
2665 3416
2666 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2667 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
2668 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2671 break; 3422 break;
2672 3423
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write ((const unsigned char *)VT100_ANS,
2675 (unsigned int) (sizeof (VT100_ANS) - 1)); 3426 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3427 break;
2677 3428
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3430 process_sgr_mode (nargs, arg);
2680 break; 3431 break;
… …
2686 tt_printf ("\033[0n"); 3437 tt_printf ("\033[0n");
2687 break; 3438 break;
2688 case 6: /* CPR requested */ 3439 case 6: /* CPR requested */
2689 scr_report_position (); 3440 scr_report_position ();
2690 break; 3441 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3442 case 7: /* unofficial extension */
3443 if (OPTION (Opt_insecure))
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3444 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3445 break;
2695#endif
2696 case 8: /* unofficial extension */ 3446 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3448 break;
2699 } 3449 }
2700 break; 3450 break;
2701 3451
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3452 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3485 break;
2736 3486
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3487 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3488 if (arg[0] == 4)
2739 scr_insert_mode (0); 3489 scr_insert_mode (0);
3490 else if (arg[0] == 20)
3491 priv_modes &= ~PrivMode_LFNL;
2740 break; 3492 break;
2741 3493
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3494 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3495 if (arg[0] == 4)
2744 scr_insert_mode (1); 3496 scr_insert_mode (1);
3497 else if (arg[0] == 20)
3498 priv_modes |= PrivMode_LFNL;
2745 break; 3499 break;
2746 3500
2747 /* 3501 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3502 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3503 */
… …
2761 break; 3515 break;
2762 case CSI_75: 3516 case CSI_75:
2763 scr_cursor (RESTORE); 3517 scr_cursor (RESTORE);
2764 break; 3518 break;
2765 3519
2766#ifndef NO_FRILLS 3520#if ENABLE_FRILLS
2767 case CSI_74: 3521 case CSI_74:
2768 process_window_ops (arg, nargs); 3522 process_window_ops (arg, nargs);
2769 break; 3523 break;
2770#endif 3524#endif
2771 3525
2772 case CSI_78: /* DECREQTPARM */ 3526 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3527 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3528 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3529 break;
2776 3530
2777 default: 3531 default:
2778 break; 3532 break;
2779 } 3533 }
2780} 3534}
2781/*}}} */ 3535/*}}} */
2782 3536
2783#ifndef NO_FRILLS 3537#if ENABLE_FRILLS
2784/* ARGSUSED */ 3538/* ARGSUSED */
2785void 3539void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3540rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3541{
2788 int x, y; 3542 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3543 XWindowAttributes wattr;
2793 Window wdummy; 3544 Window wdummy;
3545 dDisp;
2794 3546
2795 if (nargs == 0) 3547 if (nargs == 0)
2796 return; 3548 return;
3549
2797 switch (args[0]) 3550 switch (args[0])
2798 { 3551 {
2799 /* 3552 /*
2800 * commands 3553 * commands
2801 */ 3554 */
2802 case 1: /* deiconify window */ 3555 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3556 XMapWindow (disp, parent[0]);
2804 break; 3557 break;
2805 case 2: /* iconify window */ 3558 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3559 XIconifyWindow (disp, parent[0], display->screen);
2807 DefaultScreen (display->display));
2808 break; 3560 break;
2809 case 3: /* set position (pixels) */ 3561 case 3: /* set position (pixels) */
2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3562 XMoveWindow (disp, parent[0], args[1], args[2]);
2811 break; 3563 break;
2812 case 4: /* set size (pixels) */ 3564 case 4: /* set size (pixels) */
2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2814 break; 3566 break;
2815 case 5: /* raise window */ 3567 case 5: /* raise window */
2816 XRaiseWindow (display->display, TermWin.parent[0]); 3568 XRaiseWindow (disp, parent[0]);
2817 break; 3569 break;
2818 case 6: /* lower window */ 3570 case 6: /* lower window */
2819 XLowerWindow (display->display, TermWin.parent[0]); 3571 XLowerWindow (disp, parent[0]);
2820 break; 3572 break;
2821 case 7: /* refresh window */ 3573 case 7: /* refresh window */
2822 scr_touch (true); 3574 scr_touch (true);
2823 break; 3575 break;
2824 case 8: /* set size (chars) */ 3576 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3577 set_widthheight ((unsigned int) (args[2] * fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3578 (unsigned int) (args[1] * fheight));
2827 break; 3579 break;
3580
3581 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3582 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3583 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3584 set_widthheight ((unsigned int)width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
2832 break; 3586 break;
3587
3588
2833 /* 3589 /*
2834 * reports - some output format copied from XTerm 3590 * reports - some output format copied from XTerm
2835 */ 3591 */
2836 case 11: /* report window state */ 3592 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3593 XGetWindowAttributes (disp, parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3595 break;
2840 case 13: /* report window position */ 3596 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (disp, parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3598 XTranslateCoordinates (disp, parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3599 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3600 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3601 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3602 break;
2847 case 14: /* report window size (pixels) */ 3603 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3606 break;
3607 case 18: /* report text area size (chars) */
3608 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3609 break;
2851 case 18: /* report window size (chars) */ 3610 case 19: /* report window size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2853 break; 3612 break;
2854#if 0 /* XXX: currently disabled due to security concerns */
2855 case 20: /* report icon label */ 3613 case 20: /* report icon label */
3614 {
3615 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3616 XGetIconName (disp, parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3617 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3618 XFree (s);
3619 }
2858 break; 3620 break;
2859 case 21: /* report window title */ 3621 case 21: /* report window title */
3622 {
3623 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3624 XFetchName (disp, parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3625 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s);
3627 }
2862 break; 3628 break;
2863#endif
2864
2865 } 3629 }
2866} 3630}
2867#endif 3631#endif
2868 3632
2869/*----------------------------------------------------------------------*/ 3633/*----------------------------------------------------------------------*/
2870/* 3634/*
2871 * get input up until STRING TERMINATOR (or BEL) 3635 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3636 * ends_how is terminator used. returned input must be free()'d
2873 */ 3637 */
2874unsigned char * 3638unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3639rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3640{
2877 int seen_esc = 0; /* seen escape? */ 3641 unicode_t ch;
3642 bool seen_esc = false;
2878 unsigned int n = 0; 3643 unsigned int n = 0;
2879 unsigned char *s; 3644 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3645
2882 for (; (ch = cmd_getc ());) 3646 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3647 {
2884 if (ch == C0_BEL 3648 if (seen_esc)
2885 || ch == CHAR_ST 3649 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3650 if (ch == 0x5c) /* 7bit ST */
2887 break; 3651 break;
3652 else
3653 return NULL;
3654 }
2888 if (ch == C0_ESC) 3655 else if (ch == C0_ESC)
2889 { 3656 {
2890 seen_esc = 1; 3657 seen_esc = true;
2891 continue; 3658 continue;
2892 } 3659 }
2893 else if (ch == '\t') 3660 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3661 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3662 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3663 return NULL; /* other control character - exit */
2897 if (n < sizeof (string) - 1) 3664
3665 seen_esc = false;
3666
3667 if (n >= STRING_MAX - 1)
3668 // stop at some sane length
3669 return NULL;
3670
3671 if (ch == C0_SYN)
3672 string[n++] = cmd_get8 ();
3673 else
2898 string[n++] = ch; 3674 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3675 }
3676
2901 string[n++] = '\0'; 3677 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3678
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3679 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3680
2906 return s; 3681 return (unsigned char *)rxvt_wcstombs (string);
2907} 3682}
2908 3683
2909/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
2910/* 3685/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3687 */
2913void 3688void
2914rxvt_term::process_dcs_seq () 3689rxvt_term::process_dcs_seq ()
2915{ 3690{
2916 unsigned char eh, *s; 3691 unsigned char *s;
3692 unicode_t eh;
3693
2917 /* 3694 /*
2918 * Not handled yet 3695 * Not handled yet
2919 */ 3696 */
2920 s = get_to_st (&eh); 3697 s = get_to_st (eh);
2921 if (s) 3698 if (s)
2922 free (s); 3699 free (s);
3700
2923 return; 3701 return;
2924} 3702}
2925 3703
2926/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
2927/* 3705/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3706 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3707 */
2930void 3708void
2931rxvt_term::process_osc_seq () 3709rxvt_term::process_osc_seq ()
2932{ 3710{
2933 unsigned char ch, eh, *s; 3711 unicode_t ch, eh;
2934 int arg; 3712 int arg;
2935 3713
2936 ch = cmd_getc (); 3714 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3715 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3716 arg = arg * 10 + (ch - '0');
2939 3717
2940 if (ch == ';') 3718 if (ch == ';')
2941 { 3719 {
2942 s = get_to_st (&eh); 3720 unsigned char *s = get_to_st (eh);
3721
2943 if (s) 3722 if (s)
2944 { 3723 {
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); 3724 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3725 free (s);
2958 } 3726 }
2959 } 3727 }
2960} 3728}
3729
3730void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3732{
3733 if (str[0] == '?' && !str[1])
3734 {
3735 unsigned short r, g, b;
3736 pix_colors_focused[color].get (display, r, g, b);
3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3738 }
3739 else
3740 set_window_color (color, str);
3741}
3742
2961/* 3743/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * 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 */ 3745 */
2983void 3746void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2985{ 3748{
2986 int changed = 0; 3749 int changed = 0;
2987 int color; 3750 int color;
2988 char *buf, *name; 3751 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1];
3753 int saveop = op;
3754 dDisp;
2989 3755
2990 assert (str != NULL); 3756 assert (str != NULL);
2991 switch (op) 3757 switch (op)
2992 { 3758 {
2993 case XTerm_name: 3759 case XTerm_name:
2994 set_title (str); 3760 set_title (str);
2995 /* FALLTHROUGH */ 3761 /* FALLTHROUGH */
2996 case XTerm_iconName: 3762 case XTerm_iconName:
2997 set_iconName (str); 3763 set_icon_name (str);
2998 break; 3764 break;
2999 case XTerm_title: 3765 case XTerm_title:
3000 set_title (str); 3766 set_title (str);
3001 break; 3767 break;
3768 case XTerm_property:
3769 if (str[0] == '?')
3770 {
3771 Atom prop = display->atom (str + 1);
3772 Atom actual_type;
3773 int actual_format;
3774 unsigned long nitems;
3775 unsigned long bytes_after;
3776 unsigned char *value = 0;
3777 const char *str = "";
3778
3779 if (prop
3780 && XGetWindowProperty (disp, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None
3785 && actual_format == 8)
3786 str = (const char *)(value);
3787
3788 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3789
3790 XFree (value);
3791 }
3792 else
3793 {
3794 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3795
3796 if (eq)
3797 {
3798 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1);
3800 }
3801 else
3802 XDeleteProperty (disp, parent[0],
3803 display->atom (str));
3804 }
3805 break;
3806
3002 case XTerm_Color: 3807 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3808 for (buf = (char *)str; buf && *buf;)
3004 { 3809 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3811 break;
3812
3007 *name++ = '\0'; 3813 *name++ = '\0';
3008 color = atoi (buf); 3814 color = atoi (buf);
3815
3009 if (color < 0 || color >= TOTAL_COLORS) 3816 if (color < 0 || color >= TOTAL_COLORS)
3010 break; 3817 break;
3818
3011 if ((buf = STRCHR (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3820 *buf++ = '\0';
3821
3822 if (name[0] == '?' && !name[1])
3823 {
3824 unsigned short r, g, b;
3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3827 }
3828 else
3013 set_window_color (color + minCOLOR, name); 3829 set_window_color (color + minCOLOR, name);
3014 } 3830 }
3831 break;
3832 case XTerm_Color00:
3833 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3834 break;
3835 case XTerm_Color01:
3836 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3015 break; 3837 break;
3016#ifndef NO_CURSORCOLOR 3838#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3839 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3840 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3841 break;
3020#endif 3842#endif
3021 case XTerm_Color_pointer: 3843 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3844 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3845 break;
3846 case XTerm_Color_pointer_bg:
3847 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3848 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3849#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD: 3850 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str); 3851 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3027 break; 3852 break;
3028 case XTerm_Color_UL: 3853 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str); 3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3030 break; 3855 break;
3031 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3858 break;
3034#endif 3859 case URxvt_Color_IT:
3035 3860 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; 3861 break;
3862#endif
3863#if TRANSPARENT && TINTING
3864 case URxvt_Color_tint:
3865 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3866 check_our_parents ();
3867 if (am_transparent)
3868 want_full_refresh = want_refresh = 1;
3869 break;
3870#endif
3871
3042 case XTerm_Pixmap: 3872 case XTerm_Pixmap:
3043 if (*str != ';') 3873 if (*str != ';')
3044 { 3874 {
3045#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3876 scale_pixmap (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3877 set_bgPixmap (str); /* change pixmap */
3048#endif 3878#endif
3049 scr_touch (true); 3879 scr_touch (true);
3050 } 3880 }
3051 while ((str = STRCHR (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3052 { 3882 {
3053 str++; 3883 str++;
3054#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3055 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3056#endif 3886#endif
3057
3058 } 3887 }
3888
3059 if (changed) 3889 if (changed)
3060 { 3890 {
3061#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3062 resize_pixmap (); 3892 resize_pixmap ();
3063#endif 3893#endif
… …
3069 set_window_color (Color_fg, str); 3899 set_window_color (Color_fg, str);
3070 break; 3900 break;
3071 case XTerm_restoreBG: 3901 case XTerm_restoreBG:
3072 set_window_color (Color_bg, str); 3902 set_window_color (Color_bg, str);
3073 break; 3903 break;
3904
3074 case XTerm_logfile: 3905 case XTerm_logfile:
3906 // TODO, when secure mode?
3907 break;
3908
3909#ifdef MENUBAR
3910 case URxvt_Menu:
3911 if (OPTION (Opt_insecure))
3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3075 break; 3913 break;
3076 case XTerm_font: 3914#endif
3077 change_font (str);
3078 break;
3079 case XTerm_locale:
3080 /* TODO */
3081 break;
3082#if 0 3915#if 0
3083 case XTerm_dumpscreen: /* no error notices */ 3916 case XTerm_dumpscreen: /* no error notices */
3084 { 3917 {
3085 int fd; 3918 int fd;
3086 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3087 { 3920 {
3088 scr_dump (fd); 3921 scr_dump (fd);
3089 close (fd); 3922 close (fd);
3090 } 3923 }
3091 } 3924 }
3092 break; 3925 break;
3093#endif 3926#endif
3927 case XTerm_font:
3928 op = URxvt_font;
3929 case URxvt_font:
3930#if ENABLE_STYLES
3931 case URxvt_boldFont:
3932 case URxvt_italicFont:
3933 case URxvt_boldItalicFont:
3934#endif
3935 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp);
3940 else
3941 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3094 3943
3944 res = strdup (str);
3945 allocated.push_back ((void *)res);
3946 set_fonts ();
3947 }
3948 break;
3949
3950#if ENABLE_FRILLS
3951 case URxvt_locale:
3952 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3954 else
3955 {
3956 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8);
3958 init_xlocale ();
3959 }
3960 break;
3961
3962 case URxvt_view_up:
3963 case URxvt_view_down:
3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 {
3970 scr_erase_savelines ();
3971 }
3972
3973 break;
3974#endif
3095 } 3975 }
3096} 3976}
3097/*----------------------------------------------------------------------*/ 3977/*----------------------------------------------------------------------*/
3098 3978
3099/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3979/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3107 * so no need for fancy checking 3987 * so no need for fancy checking
3108 */ 3988 */
3109int 3989int
3110rxvt_term::privcases (int mode, unsigned long bit) 3990rxvt_term::privcases (int mode, unsigned long bit)
3111{ 3991{
3112 int state; 3992 int state;
3113 3993
3114 if (mode == 's') 3994 if (mode == 's')
3115 { 3995 {
3116 SavedModes |= (PrivateModes & bit); 3996 SavedModes |= (priv_modes & bit);
3117 return -1; 3997 return -1;
3118 } 3998 }
3119 else 3999 else
3120 { 4000 {
3121 if (mode == 'r') 4001 if (mode == 'r')
3122 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4002 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3123 else 4003 else
3124 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4004 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3125 PrivMode (state, bit); 4005 PrivMode (state, bit);
3126 } 4006 }
4007
3127 return state; 4008 return state;
3128} 4009}
3129 4010
3130/* we're not using priv _yet_ */ 4011/* we're not using priv _yet_ */
3131void 4012void
3132rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4013rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3133{ 4014{
3134 unsigned int i, j; 4015 unsigned int i, j;
3135 int state; 4016 int state;
4017
3136 static const struct 4018 static const struct
3137 { 4019 {
3138 const int argval; 4020 const int argval;
3139 const unsigned long bit; 4021 const unsigned long bit;
3140 } 4022 }
4023
3141 argtopriv[] = { 4024 argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 4025 { 1, PrivMode_aplCUR },
3143 { 2, PrivMode_vt52 }, 4026 { 2, PrivMode_vt52 },
3144 { 3, PrivMode_132 }, 4027 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4028 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4029 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4030 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4031 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4033 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4034#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 4035 { menuBar_esc, PrivMode_menuBar },
3152#endif 4036#endif
4037 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 4039#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4040 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4041#endif
3156 { 25, PrivMode_VisibleCursor },
3157 { 35, PrivMode_ShiftKeys }, 4042 { 35, PrivMode_ShiftKeys }, // rxvt extension
3158 { 40, PrivMode_132OK }, 4043 { 40, PrivMode_132OK },
4044 // 41 xterm more fixes NYI
4045 // 45 margin bell NYI
4046 // 46 start logging
3159 { 47, PrivMode_Screen }, 4047 { 47, PrivMode_Screen },
3160 { 66, PrivMode_aplKP }, 4048 { 66, PrivMode_aplKP },
3161#ifndef NO_BACKSPACE_KEY 4049#ifndef NO_BACKSPACE_KEY
3162 { 67, PrivMode_BackSpace }, 4050 { 67, PrivMode_BackSpace },
3163#endif 4051#endif
3164 { 1000, PrivMode_MouseX11 }, 4052 { 1000, PrivMode_MouseX11 },
4053 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4054 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4055 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3165 { 1010, PrivMode_TtyOutputInh }, 4056 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3166 { 1011, PrivMode_Keypress }, 4057 { 1011, PrivMode_Keypress }, // rxvt extension
4058 // 1035 enable modifiers for alt, numlock NYI
4059 // 1036 send ESC for meta keys NYI
4060 // 1037 send DEL for keypad delete NYI
3167 { 1047, PrivMode_Screen }, 4061 { 1047, PrivMode_Screen },
4062 // 1048 save and restore cursor
3168 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4063 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4064 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3169 }; 4065 };
3170 4066
3171 if (nargs == 0) 4067 if (nargs == 0)
3172 return; 4068 return;
3173 4069
… …
3188 state = privcases (mode, argtopriv[j].bit); 4084 state = privcases (mode, argtopriv[j].bit);
3189 break; 4085 break;
3190 } 4086 }
3191 4087
3192 /* extra handling for values with state unkept */ 4088 /* extra handling for values with state unkept */
3193 if (state == -1)
3194 switch (arg[i]) 4089 switch (arg[i])
3195 { 4090 {
4091#if ENABLE_STYLES
4092 case 1021:
4093 if (mode)
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097
4098 scr_touch (true);
4099 break;
4100#endif
3196 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4102 case 1049:
4103 if (OPTION (Opt_secondaryScreen))
3197 if (mode == 0) 4104 if (mode == 0)
3198 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
3199 else if (mode == 1) 4106 else if (mode == 1)
3200 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
3201 /* FALLTHROUGH */
3202 default:
3203 continue; /* for (;i;) */
3204 }
3205
3206 /* extra handling for values with valid 0 or 1 state */
3207 switch (arg[i])
3208 {
3209 /* case 1: - application cursor keys */
3210 case 2: /* VT52 mode */
3211 /* oddball mode. should be set regardless of set/reset
3212 * parameter. Return from VT52 mode with an ESC < from
3213 * within VT52 mode
3214 */
3215 PrivMode (1, PrivMode_vt52);
3216 break; 4108 break;
4109 }
4110
4111 if (state >= 0)
4112 /* extra handling for values with valid 0 or 1 state */
4113 switch (arg[i])
4114 {
4115 /* case 1: - application cursor keys */
4116 case 2: /* VT52 mode */
4117 /* oddball mode. should be set regardless of set/reset
4118 * parameter. Return from VT52 mode with an ESC < from
4119 * within VT52 mode
4120 */
4121 PrivMode (1, PrivMode_vt52);
4122 break;
3217 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
3218 if (PrivateModes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
3219 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
3220 (unsigned int)TermWin.height);
3221 break; 4126 break;
3222 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
3223 if (state) 4128 if (!state)
3224 Options &= ~Opt_jumpScroll; 4129 SET_OPTION (Opt_jumpScroll);
3225 else 4130 else
3226 Options |= Opt_jumpScroll; 4131 CLR_OPTION (Opt_jumpScroll);
3227 break; 4132 break;
3228 case 5: /* reverse video */ 4133 case 5: /* reverse video */
3229 scr_rvideo_mode (state); 4134 scr_rvideo_mode (state);
3230 break; 4135 break;
3231 case 6: /* relative/absolute origins */ 4136 case 6: /* relative/absolute origins */
3232 scr_relative_origin (state); 4137 scr_relative_origin (state);
3233 break; 4138 break;
3234 case 7: /* autowrap */ 4139 case 7: /* autowrap */
3235 scr_autowrap (state); 4140 scr_autowrap (state);
3236 break; 4141 break;
3237 /* case 8: - auto repeat, can't do on a per window basis */ 4142 /* case 8: - auto repeat, can't do on a per window basis */
3238 case 9: /* X10 mouse reporting */ 4143 case 9: /* X10 mouse reporting */
3239 if (state) /* orthogonal */ 4144 if (state) /* orthogonal */
3240 PrivateModes &= ~ (PrivMode_MouseX11); 4145 priv_modes &= ~PrivMode_MouseX11;
3241 break; 4146 break;
3242#ifdef menuBar_esc 4147#ifdef menuBar_esc
3243 case menuBar_esc: 4148 case menuBar_esc:
3244#ifdef MENUBAR 4149#ifdef MENUBAR
3245 map_menuBar (state); 4150 map_menuBar (state);
3246#endif 4151#endif
3247 break; 4152 break;
3248#endif 4153#endif
3249#ifdef scrollBar_esc 4154#ifdef scrollBar_esc
3250 case scrollBar_esc: 4155 case scrollBar_esc:
3251 if (scrollbar_mapping (state)) 4156 if (scrollbar_mapping (state))
3252 { 4157 {
3253 resize_all_windows (0, 0, 0); 4158 resize_all_windows (0, 0, 0);
3254 scr_touch (true); 4159 scr_touch (true);
3255 } 4160 }
3256 break; 4161 break;
3257#endif 4162#endif
3258 case 25: /* visible/invisible cursor */ 4163 case 25: /* visible/invisible cursor */
3259 scr_cursor_visible (state); 4164 scr_cursor_visible (state);
3260 break; 4165 break;
3261 /* case 35: - shift keys */ 4166 /* case 35: - shift keys */
3262 /* case 40: - 80 <--> 132 mode */ 4167 /* case 40: - 80 <--> 132 mode */
3263 case 47: /* secondary screen */ 4168 case 47: /* secondary screen */
3264 scr_change_screen (state); 4169 scr_change_screen (state);
3265 break; 4170 break;
3266 /* case 66: - application key pad */ 4171 /* case 66: - application key pad */
3267 /* case 67: - backspace key */ 4172 /* case 67: - backspace key */
3268 case 1000: /* X11 mouse reporting */ 4173 case 1000: /* X11 mouse reporting */
3269 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
3270 PrivateModes &= ~ (PrivMode_MouseX10); 4175 priv_modes &= ~PrivMode_MouseX10;
3271 break; 4176 break;
3272#if 0 4177#if 0
3273 case 1001: 4178 case 1001:
3274 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
3275#endif 4180#endif
3276 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
3277 if (state) 4182 if (!state)
3278 Options &= ~Opt_scrollTtyOutput; 4183 SET_OPTION (Opt_scrollTtyOutput);
3279 else 4184 else
3280 Options |= Opt_scrollTtyOutput; 4185 CLR_OPTION (Opt_scrollTtyOutput);
3281 break; 4186 break;
3282 case 1011: /* scroll to bottom on key press */ 4187 case 1011: /* scroll to bottom on key press */
3283 if (state) 4188 if (state)
3284 Options |= Opt_scrollTtyKeypress; 4189 SET_OPTION (Opt_scrollTtyKeypress);
3285 else 4190 else
3286 Options &= ~Opt_scrollTtyKeypress; 4191 CLR_OPTION (Opt_scrollTtyKeypress);
3287 break; 4192 break;
3288 case 1047: /* secondary screen w/ clearing */ 4193 case 1047: /* secondary screen w/ clearing last */
3289 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4194 if (OPTION (Opt_secondaryScreen))
3290 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
3291 scr_erase_screen (2); 4196 scr_erase_screen (2);
3292 scr_change_screen (state); 4197 scr_change_screen (state);
3293 /* FALLTHROUGH */
3294 default:
3295 break; 4198 break;
4199 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY)
4203 scr_erase_screen (2);
4204 break;
4205 default:
4206 break;
3296 } 4207 }
3297 } 4208 }
3298} 4209}
3299/*}}} */ 4210/*}}} */
3300 4211
3301/*{{{ process sgr sequences */ 4212/*{{{ process sgr sequences */
3302void 4213void
3303rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4214rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3304{ 4215{
3305 unsigned int i; 4216 unsigned int i;
3306 short rendset; 4217 short rendset;
3307 int rendstyle; 4218 int rendstyle;
3308 4219
3309 if (nargs == 0) 4220 if (nargs == 0)
3310 { 4221 {
3311 scr_rendition (0, ~RS_None); 4222 scr_rendition (0, ~RS_None);
3312 return; 4223 return;
3313 } 4224 }
4225
3314 for (i = 0; i < nargs; i++) 4226 for (i = 0; i < nargs; i++)
3315 { 4227 {
3316 rendset = -1; 4228 rendset = -1;
3317 switch (arg[i]) 4229 switch (arg[i])
3318 { 4230 {
… …
3320 rendset = 0, rendstyle = ~RS_None; 4232 rendset = 0, rendstyle = ~RS_None;
3321 break; 4233 break;
3322 case 1: 4234 case 1:
3323 rendset = 1, rendstyle = RS_Bold; 4235 rendset = 1, rendstyle = RS_Bold;
3324 break; 4236 break;
4237 //case 2: // low intensity
4238 case 3:
4239 rendset = 1, rendstyle = RS_Italic;
4240 break;
3325 case 4: 4241 case 4:
3326 rendset = 1, rendstyle = RS_Uline; 4242 rendset = 1, rendstyle = RS_Uline;
3327 break; 4243 break;
3328 case 5: 4244 case 5: // slowly blinking
4245 case 6: // rapidly blinking
3329 rendset = 1, rendstyle = RS_Blink; 4246 rendset = 1, rendstyle = RS_Blink;
3330 break; 4247 break;
4248 //case 6: // scoansi light background
3331 case 7: 4249 case 7:
3332 rendset = 1, rendstyle = RS_RVid; 4250 rendset = 1, rendstyle = RS_RVid;
3333 break; 4251 break;
3334 case 22: 4252 case 8:
4253 // invisible. NYI
4254 break;
4255 //case 9: // crossed out
4256 //case 10: // scoansi acs off, primary font
4257 //case 11: // scoansi acs on, first alt font
4258 //case 12: // scoansi acs on, |0x80, second alt font
4259 //...
4260 //case 19: // ninth alt font
4261 //case 20: // gothic
4262 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3335 rendset = 0, rendstyle = RS_Bold; 4263 rendset = 0, rendstyle = RS_Bold;
4264 break;
4265 case 22: // normal intensity
4266 rendset = 0, rendstyle = RS_Bold;
4267 break;
4268 case 23: // disable italic
4269 rendset = 0, rendstyle = RS_Italic;
3336 break; 4270 break;
3337 case 24: 4271 case 24:
3338 rendset = 0, rendstyle = RS_Uline; 4272 rendset = 0, rendstyle = RS_Uline;
3339 break; 4273 break;
3340 case 25: 4274 case 25:
3341 rendset = 0, rendstyle = RS_Blink; 4275 rendset = 0, rendstyle = RS_Blink;
3342 break; 4276 break;
4277 case 26: // variable spacing (iso 8613)
4278 rendset = 0, rendstyle = RS_Blink;
4279 break;
3343 case 27: 4280 case 27:
3344 rendset = 0, rendstyle = RS_RVid; 4281 rendset = 0, rendstyle = RS_RVid;
3345 break; 4282 break;
4283 //case 28: // visible. NYI
4284 //case 29: // not crossed-out
3346 } 4285 }
4286
3347 if (rendset != -1) 4287 if (rendset != -1)
3348 { 4288 {
3349 scr_rendition (rendset, rendstyle); 4289 scr_rendition (rendset, rendstyle);
3350 continue; /* for (;i;) */ 4290 continue; /* for (;i;) */
3351 } 4291 }
… …
3358 case 33: 4298 case 33:
3359 case 34: 4299 case 34:
3360 case 35: 4300 case 35:
3361 case 36: 4301 case 36:
3362 case 37: 4302 case 37:
3363 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4303 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3364 Color_fg);
3365 break; 4304 break;
3366#ifdef TTY_256COLOR 4305 case 38: // set fg color, ISO 8613-6
3367 case 38:
3368 if (nargs > i + 2 && arg[i + 1] == 5) 4306 if (nargs > i + 2 && arg[i + 1] == 5)
3369 { 4307 {
3370 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4308 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3371 Color_fg);
3372 i += 2; 4309 i += 2;
3373 } 4310 }
3374 break; 4311 break;
3375#endif
3376 case 39: /* default fg */ 4312 case 39: /* default fg */
3377 scr_color (Color_fg, Color_fg); 4313 scr_color (Color_fg, Color_fg);
3378 break; 4314 break;
3379 4315
3380 case 40: 4316 case 40:
… …
3383 case 43: 4319 case 43:
3384 case 44: 4320 case 44:
3385 case 45: 4321 case 45:
3386 case 46: 4322 case 46:
3387 case 47: 4323 case 47:
3388 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4324 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3389 Color_bg);
3390 break; 4325 break;
3391#ifdef TTY_256COLOR 4326 case 48: // set bg color, ISO 8613-6
3392 case 48:
3393 if (nargs > i + 2 && arg[i + 1] == 5) 4327 if (nargs > i + 2 && arg[i + 1] == 5)
3394 { 4328 {
3395 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4329 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3396 Color_bg);
3397 i += 2; 4330 i += 2;
3398 } 4331 }
3399 break; 4332 break;
3400#endif
3401 case 49: /* default bg */ 4333 case 49: /* default bg */
3402 scr_color (Color_bg, Color_bg); 4334 scr_color (Color_bg, Color_bg);
3403 break; 4335 break;
4336
4337 //case 50: // not variable spacing
3404 4338
3405#ifndef NO_BRIGHTCOLOR 4339#ifndef NO_BRIGHTCOLOR
3406 case 90: 4340 case 90:
3407 case 91: /* set bright fg color */ 4341 case 91: /* set bright fg color */
3408 case 92: 4342 case 92:
3409 case 93: 4343 case 93:
3410 case 94: 4344 case 94:
3411 case 95: 4345 case 95:
3412 case 96: 4346 case 96:
3413 case 97: 4347 case 97:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3415 Color_fg);
3416 break; 4349 break;
3417 case 100: 4350 case 100:
3418 case 101: /* set bright bg color */ 4351 case 101: /* set bright bg color */
3419 case 102: 4352 case 102:
3420 case 103: 4353 case 103:
3421 case 104: 4354 case 104:
3422 case 105: 4355 case 105:
3423 case 106: 4356 case 106:
3424 case 107: 4357 case 107:
3425 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3426 Color_bg);
3427 break; 4359 break;
3428#endif 4360#endif
3429
3430 } 4361 }
3431 } 4362 }
3432} 4363}
3433/*}}} */ 4364/*}}} */
3434 4365
3435/*{{{ process Rob Nation's own graphics mode sequences */ 4366/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3436void 4367void
3437rxvt_term::process_graphics () 4368rxvt_term::process_graphics ()
3438{ 4369{
3439 unsigned char ch, cmd = cmd_getc (); 4370 unicode_t ch, cmd = cmd_getc ();
3440 4371
3441 if (cmd == 'Q') 4372 if (cmd == 'Q')
3442 { /* query graphics */ 4373 { /* query graphics */
3443 tt_printf ("\033G0\n"); /* no graphics */ 4374 tt_printf ("\033G0\012"); /* no graphics */
3444 return; 4375 return;
3445 } 4376 }
3446 /* swallow other graphics sequences until terminating ':' */ 4377 /* swallow other graphics sequences until terminating ':' */
3447 do 4378 do
3448 ch = cmd_getc (); 4379 ch = cmd_getc ();
… …
3463 unsigned char buf[256]; 4394 unsigned char buf[256];
3464 4395
3465 va_start (arg_ptr, fmt); 4396 va_start (arg_ptr, fmt);
3466 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3467 va_end (arg_ptr); 4398 va_end (arg_ptr);
3468 tt_write (buf, STRLEN (buf)); 4399 tt_write (buf, strlen (buf));
3469} 4400}
3470 4401
3471/* ---------------------------------------------------------------------- */ 4402/* ---------------------------------------------------------------------- */
3472/* Write data to the pty as typed by the user, pasted with the mouse, 4403/* Write data to the pty as typed by the user, pasted with the mouse,
3473 * or generated by us in response to a query ESC sequence. 4404 * or generated by us in response to a query ESC sequence.
3474 */ 4405 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407
3475void 4408void
3476rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4409rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3477{ 4410{
3478 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4411 if (v_buflen == 0)
4412 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3479 4414
3480 if (len) 4415 if ((unsigned int)written == len)
4416 return;
4417
4418 data += written;
4419 len -= written;
3481 { 4420 }
4421
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4423
4424 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len;
4426
4427 pty_ev.set (EVENT_READ | EVENT_WRITE);
4428}
4429
4430void rxvt_term::pty_write ()
4431{
4432 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4433
4434 if (written > 0)
4435 {
4436 v_buflen -= written;
4437
3482 if (v_buflen == 0) 4438 if (v_buflen == 0)
3483 { 4439 {
3484 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3485
3486 if ((unsigned int)written == len)
3487 return;
3488
3489 data += written;
3490 len -= written;
3491 }
3492
3493
3494 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3495
3496 memcpy (v_buffer + v_buflen, data, len);
3497 v_buflen += len;
3498 }
3499
3500 for (;;)
3501 {
3502 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3503
3504 if (written > 0)
3505 {
3506 v_buflen -= written;
3507
3508 if (v_buflen == 0)
3509 {
3510 free (v_buffer); 4440 free (v_buffer);
3511 v_buffer = 0; 4441 v_buffer = 0;
3512 v_buflen = 0; 4442 v_buflen = 0;
3513 4443
3514 pty_ev.set (EVENT_READ); 4444 pty_ev.set (EVENT_READ);
3515 return;
3516 }
3517
3518 memmove (v_buffer, v_buffer + written, v_buflen);
3519 }
3520 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3521 // original code just ignores this...
3522 destroy ();
3523 else
3524 {
3525 pty_ev.set (EVENT_READ | EVENT_WRITE);
3526 return; 4445 return;
3527 } 4446 }
4447
4448 memmove (v_buffer, v_buffer + written, v_buflen);
3528 } 4449 }
4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4451 pty_ev.set (EVENT_READ);
3529} 4452}
3530 4453
3531/*----------------------- end-of-file (C source) -----------------------*/ 4454/*----------------------- end-of-file (C source) -----------------------*/
3532 4455

Diff Legend

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