ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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