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

Diff Legend

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