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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC

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

Diff Legend

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