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

Diff Legend

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