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.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC

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

Diff Legend

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