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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

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

Diff Legend

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