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

Diff Legend

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