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.317 by root, Sat Jan 13 15:06:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57/*{{{ Convert the keypress event into a string */ 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68#if ENABLE_FRILLS || ISO_14755
69
70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
58void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
254rxvt_term::commit_iso14755 ()
255{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260
261 if (iso14755buf & ISO_14755_51)
262 {
263 char mb[16];
264 int len;
265
266 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20)
268 len = wcstombs (mb, ch, 16);
269 else
270 {
271 mb[0] = ch[0];
272 len = 1;
273 }
274
275 if (len > 0)
276 tt_write (mb, len);
277 else
278 scr_bell ();
279 }
280
281 iso14755buf = 0;
282}
283
284int
59rxvt_term::lookup_key (XKeyEvent &ev) 285rxvt_term::hex_keyval (XKeyEvent &ev)
286{
287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++)
290 {
291 KeySym k = XLookupKeysym (&ev, index);
292
293 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
294 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
295 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
296 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
297 }
298
299 return -1;
300}
301#endif
302
303void
304rxvt_term::key_press (XKeyEvent &ev)
60{ 305{
61 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
62 unsigned int newlen; 307 unsigned int newlen;
63 KeySym keysym; 308 KeySym keysym;
64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */
66#endif
67 int valid_keysym; 309 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
69 316
70 /* 317 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
73 * 320 *
74 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
75 */ 322 */
76 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
79 326
80 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
81 { 328 {
82 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 335#ifdef USE_XIM
89 if (Input_Context) 336 if (Input_Context)
90 { 337 {
91 Status status_return; 338 Status status_return;
92 339
340#if 0
93#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
97 else 345 else
346#endif
98#endif 347#endif
99 { 348 {
100 wchar_t wkbuf[KBUFSZ + 1]; 349 wchar_t wkbuf[KBUFSZ + 1];
101 350
102 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
106 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
109 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 361 SET_LOCALE (locale);
111 362
112 if (status_return == XLookupChars 363 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
134 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
135 } 386 }
136 else 387 else
137#endif 388#endif
138 { 389 {
139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
140 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
141 } 392 }
142 393
143 if (valid_keysym) 394 if (valid_keysym)
144 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
145 if (TermWin.saveLines) 401 if (saveLines)
146 { 402 {
147#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 404 if (!ctrl && !meta)
149 {
150#else 405#else
151 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
152 { 408 {
153#endif
154 int lnsppg; 409 int lnsppg;
155 410
156#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
158#else 413#else
159 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
160#endif 415#endif
161 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
162 { 417 {
163 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
164 return; 419 return;
… …
192 scr_move_to (0, 1); 447 scr_move_to (0, 1);
193 return; 448 return;
194 } 449 }
195 else if (keysym == XK_End) 450 else if (keysym == XK_End)
196 { 451 {
197 scr_move_to (1, 0); 452 scr_move_to (1, 1);
198 return; 453 return;
199 } 454 }
200 } 455 }
201#endif 456#endif
202 } 457 }
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 463 {
209 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
211 } 466 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 468 {
214 switch (keysym) 469 switch (keysym)
215 { 470 {
216 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
219 return; 474 return;
475#if TODO
220 /* rxvt extras */ 476 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 478 change_font (FONT_UP);
223 return; 479 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 481 change_font (FONT_DN);
226 return; 482 return;
483#endif
227 } 484 }
228 } 485 }
229 } 486 }
230#ifdef PRINTPIPE 487
231 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
232 { 489 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
234 return;
235 } 491 {
236#endif 492 int hv;
237 493
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
239 { 495 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 497 {
243 unsigned int l; 498 commit_iso14755 ();
244 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
245 500# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 501 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 502# endif
254 ) 503 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 504 }
259 505 else if ((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 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1464 focus_in ();
1465 break;
1466
1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1469 focus_out ();
1470 break;
1471
1472 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0])
1226 { 1474 {
1227 TermWin.focus = 1; 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1228 want_refresh = 1; 1476 ;
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 1477
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 {
1480 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 }
1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1488 if (OPTION (Opt_transparent))
1489 check_our_parents ();
1490#endif
1491#endif
1238 } 1492 }
1239 break; 1493 break;
1240 1494
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: 1495 case PropertyNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1261 { 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1262 int height, width; 1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1263 1500
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; 1501 break;
1294 1502
1295 case SelectionClear: 1503 case SelectionClear:
1296 display->set_selection_owner (0); 1504 selection_clear ();
1297 break; 1505 break;
1298 1506
1299 case SelectionNotify: 1507 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1510 break;
1304 1511
1305 case SelectionRequest: 1512 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1307 break; 1514 break;
1308 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1309 case UnmapNotify: 1524 case UnmapNotify:
1310 TermWin.mapped = 0; 1525 mapped = 0;
1311#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1313#endif 1528#endif
1314 break; 1529 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; 1530 break;
1322 1531
1323#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1324 case ReparentNotify: 1533 case ReparentNotify:
1325 rootwin_cb (ev); 1534 rootwin_cb (ev);
1326 break; 1535 break;
1327#endif /* TRANSPARENT */ 1536#endif /* TRANSPARENT */
1328 1537
1329 case GraphicsExpose: 1538 case GraphicsExpose:
1330 case Expose: 1539 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1332 { 1541 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1542 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1546
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1552
1341 // ev.xexpose.width, TermWin.height, False);
1342#endif
1343 want_refresh = 1; 1553 want_refresh = 1;
1344 } 1554 }
1345 else 1555 else
1346 { 1556 {
1347 XEvent unused_event; 1557 XEvent unused_event;
1348 1558
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1350 Expose, 1560 ;
1351 &unused_event)) ; 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1562 ;
1353 GraphicsExpose, 1563
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1356 { 1565 {
1357 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1358 scrollbar_show (0); 1567 scrollbar_show (0);
1359 } 1568 }
1360#ifdef MENUBAR 1569
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1570#ifdef TRANSPARENT
1362 menubar_expose (); 1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (dpy, ev.xany.window);
1363#endif 1573#endif
1364 } 1574 }
1365 break; 1575 break;
1366 1576
1367 case MotionNotify: 1577 case MotionNotify:
1368#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1369 if (hidden_pointer) 1579 if (hidden_pointer)
1370 pointer_unblank (); 1580 pointer_unblank ();
1371#endif 1581#endif
1372#if MENUBAR 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1373 if (isMenuBarWindow (ev.xany.window)) 1583 break;
1584
1585 if (ev.xany.window == vt)
1374 { 1586 {
1375 menubar_control (ev.xbutton); 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1376 break; 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1377 } 1589 ; // 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))) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1591 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1387 ; 1593 ;
1388 1594
1389 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (dpy, vt,
1390 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1598 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1599 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1601 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1602 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1603 {
1398#endif 1604#endif
1605#if ISO_14755
1606 // 5.4
1607 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1608 {
1609 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1610 break;
1611 }
1612#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1615
1401#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1619 {
1405 int dist; 1620 int dist;
1406
1407 pending_scroll_selection=1;
1408 1621
1409 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
1411 */ 1624 */
1412 if (scroll_selection_delay<=0) 1625 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1627
1415 /* save the event params so we can highlight 1628 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1629 * the selection in the pending-scroll loop
1417 */ 1630 */
1418 selection_save_x=ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1634
1423 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1425 { 1637 {
1426 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1428 } 1640 }
1429 else 1641 else
1430 { 1642 {
1431 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1644 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1645 }
1646
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1647 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1;
1437 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1439 } 1652 }
1440 else 1653 else
1441 { 1654 {
1442 /* we are within the text window, so we 1655 /* we are within the text window, so we
1443 * shouldn't be scrolling 1656 * shouldn't be scrolling
1444 */ 1657 */
1445 pending_scroll_selection = 0; 1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop();
1446 } 1660 }
1447#endif 1661#endif
1448#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1449
1450 } 1663 }
1451#endif 1664#endif
1452
1453 } 1665 }
1454 } 1666 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1668 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1458 MotionNotify, &ev)) ; 1670 MotionNotify, &ev))
1671 ;
1672
1459 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1460 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1676 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1677 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1679 scrollbar_size ());
1466 scr_refresh (refresh_type); 1680 want_refresh = 1;
1467 refresh_limit = 0; 1681 refresh_limit = 0;
1468 scrollbar_show (1); 1682 scrollbar_show (1);
1469 } 1683 }
1470 break; 1684 break;
1471 } 1685 }
1472}
1473 1686
1687#if defined(CURSOR_BLINK)
1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1697 }
1698#endif
1699
1700#if defined(POINTER_BLANK)
1701 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 {
1703 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease)
1706 if (hidden_pointer)
1707 pointer_unblank ();
1708
1709 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank ();
1711 }
1712#endif
1713}
1714
1715void
1716rxvt_term::focus_in ()
1717{
1718 if (!focus)
1719 {
1720 focus = 1;
1721 want_refresh = 1;
1722
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM
1726 if (Input_Context != NULL)
1727 {
1728 IMSetPosition ();
1729 XSetICFocus (Input_Context);
1730 }
1731#endif
1732#if CURSOR_BLINK
1733 if (OPTION (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1735#endif
1736#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade])
1738 {
1739 pix_colors = pix_colors_focused;
1740 scr_recolour ();
1741 }
1742#endif
1743 }
1744}
1745
1746void
1747rxvt_term::focus_out ()
1748{
1749 if (focus)
1750 {
1751 focus = 0;
1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1756#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf)
1758 {
1759 iso14755buf = 0;
1760# if ENABLE_OVERLAY
1761 scr_overlay_off ();
1762# endif
1763 }
1764#endif
1765#if USE_XIM
1766 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context);
1768#endif
1769#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.stop ();
1772 hidden_cursor = 0;
1773#endif
1774#if OFF_FOCUS_FADING
1775 if (rs[Rs_fade])
1776 {
1777 pix_colors = pix_colors_unfocused;
1778 scr_recolour ();
1779 }
1780#endif
1781 }
1782}
1783
1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1795}
1796
1797#if TRANSPARENT || ENABLE_PERL
1474void 1798void
1475rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1800{
1477 SET_R (this); 1801 make_current ();
1478 SET_LOCALE (locale);
1479 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if TRANSPARENT
1480 switch (ev.type) 1808 switch (ev.type)
1481 { 1809 {
1482 case PropertyNotify: 1810 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 /* 1811 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1812 * 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. 1813 * use the property to determine the pixmap. We use it later on.
1495 */ 1814 */
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]) 1815 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1817 return;
1501 }
1502 1818
1503 /* FALLTHROUGH */ 1819 /* FALLTHROUGH */
1504 case ReparentNotify: 1820 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1822 want_refresh = want_full_refresh = 1;
1508 break; 1823 break;
1824 }
1509#endif 1825# endif
1510 }
1511} 1826}
1827#endif
1512 1828
1513void 1829void
1514rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1515{ 1831{
1516 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1517 1833
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1519 if (!bypass_keystate) 1836 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1838
1521 /* 1839 /*
1522 * VT window processing of button press 1840 * VT window processing of button press
1523 */ 1841 */
1524 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1525 { 1843 {
1844 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1845 return;
1846
1847#if ISO_14755
1848 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 {
1851 iso14755_54 (ev.x, ev.y);
1852 return;
1853 }
1854#endif
1855
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1856 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1857
1527 if (reportmode) 1858 if (reportmode)
1528 { 1859 {
1529 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1861 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1862 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1534 { 1865 {
1535 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1536 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1537 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1538 { 1870 {
1539 /* only report double clicks */ 1871 /* only report double clicks */
1540 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1541 mouse_report (ev); 1873 mouse_report (ev);
… …
1560 } 1892 }
1561 else 1893 else
1562 { 1894 {
1563 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1897
1565 switch (ev.button) 1898 switch (ev.button)
1566 { 1899 {
1567 case Button1: 1900 case Button1:
1901 /* allow meta + click to select rectangular areas */
1902 /* should be done in screen.C */
1903#if ENABLE_FRILLS
1904 selection.rect = !!(ev.state & ModMetaMask);
1905#else
1906 selection.rect = false;
1907#endif
1908
1568 /* allow shift+left click to extend selection */ 1909 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1910 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1570 { 1911 {
1571 if (MEvent.button == Button1 && clickintime) 1912 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1573 else 1914 else
1574 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1930 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1931 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1592 else 1933 else
1593 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
1935
1594 MEvent.button = Button3; 1936 MEvent.button = Button3;
1595 break; 1937 break;
1596 } 1938 }
1597 } 1939 }
1940
1598 MEvent.time = ev.time; 1941 MEvent.time = ev.time;
1599 return; 1942 return;
1600 } 1943 }
1601 1944
1602 /* 1945 /*
… …
1668 upordown = 1; /* down */ 2011 upordown = 1; /* down */
1669 } 2012 }
1670 if (upordown) 2013 if (upordown)
1671 { 2014 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2015#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2016 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 2017#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 2018 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 2019 {
1677 if (upordown < 0) 2020 if (upordown < 0)
1678 scrollBar.setUp (); 2021 scrollBar.setUp ();
… …
1694 break; 2037 break;
1695 case R_SB_ALIGN_BOTTOM: 2038 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 2039 csrO = scrollBar.bot - scrollBar.top;
1697 break; 2040 break;
1698 } 2041 }
2042
1699 if (scrollBar.style == R_SB_XTERM 2043 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 2044 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 2045 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 2046 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 2047
1704 scrollBar.setMotion (); 2048 scrollBar.setMotion ();
1705 break; 2049 break;
1706 2050
1707 case Button1: 2051 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2052 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1712 case Button3: 2056 case Button3:
1713 if (scrollBar.style != R_SB_XTERM) 2057 if (scrollBar.style != R_SB_XTERM)
1714 { 2058 {
1715 if (scrollbar_above_slider (ev.y)) 2059 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL 2060# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1); 2061 scr_page (UP, nrow - 1);
1718# else 2062# else
1719 scr_page (UP, TermWin.nrow / 4); 2063 scr_page (UP, nrow / 4);
1720# endif 2064# endif
1721 else if (scrollbar_below_slider (ev.y)) 2065 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1); 2067 scr_page (DN, nrow - 1);
1724# else 2068# else
1725 scr_page (DN, TermWin.nrow / 4); 2069 scr_page (DN, nrow / 4);
1726# endif 2070# endif
1727 else 2071 else
1728 scrollBar.setMotion (); 2072 scrollBar.setMotion ();
1729 } 2073 }
1730 else 2074 else
1731 { 2075 {
1732 scr_page ((ev.button == Button1 ? DN : UP), 2076 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 2077 (nrow
1734 * scrollbar_position (ev.y) 2078 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 2079 / scrollbar_size ()));
1736 } 2080 }
2081
1737 break; 2082 break;
1738 } 2083 }
1739 } 2084 }
2085
1740 return; 2086 return;
1741 } 2087 }
1742#if MENUBAR
1743 /*
1744 * Menubar window processing of button press
1745 */
1746 if (isMenuBarWindow (ev.window))
1747 menubar_control (ev);
1748#endif
1749} 2088}
1750 2089
1751void 2090void
1752rxvt_term::button_release (XButtonEvent &ev) 2091rxvt_term::button_release (XButtonEvent &ev)
1753{ 2092{
1754 int reportmode = 0; 2093 int reportmode = 0;
1755 2094
1756 csrO = 0; /* reset csr Offset */ 2095 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 2096 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2097 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 2098
1760 if (scrollbar_isUpDn ()) 2099 if (scrollbar_isUpDn ())
1761 { 2100 {
1762 scrollBar.setIdle (); 2101 scrollBar.setIdle ();
1763 scrollbar_show (0); 2102 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH;
1766#endif
1767
1768 } 2103 }
2104
1769#ifdef SELECTION_SCROLLING 2105#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 2106 if (sel_scroll_ev.active)
2107 sel_scroll_ev.stop();
1771#endif 2108#endif
2109
1772 if (ev.window == TermWin.vt) 2110 if (ev.window == vt)
1773 { 2111 {
2112 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2113 return;
2114
2115#if ISO_14755
2116 // 5.4
2117 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2118 return;
2119#endif
2120
1774 if (reportmode) 2121 if (reportmode)
1775 { 2122 {
1776 /* mouse report from vt window */ 2123 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2124 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2125 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2139 MEvent.button = AnyButton;
1793 mouse_report (ev); 2140 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2141#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2142 return;
1796 } 2143 }
2144
1797 /* 2145 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2146 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2147 * when overriding mouse reporting
1800 */ 2148 */
1801 if (PrivateModes & PrivMode_mouse_report 2149 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2150 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2151 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2152 selection_extend (ev.x, ev.y, 0);
1805 2153
1806 switch (ev.button) 2154 switch (ev.button)
1807 { 2155 {
1808 case Button1: 2156 case Button1:
1809 case Button3: 2157 case Button3:
1810 selection_make (ev.time); 2158 selection_make (ev.time);
1811 break; 2159 break;
2160
1812 case Button2: 2161 case Button2:
1813 selection_request (ev.time, ev.x, ev.y); 2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1814 break; 2164 break;
2165
1815#ifdef MOUSE_WHEEL 2166#ifdef MOUSE_WHEEL
1816 case Button4: 2167 case Button4:
1817 case Button5: 2168 case Button5:
1818 { 2169 {
1819 int i; 2170 int i;
1820 page_dirn v; 2171 page_dirn v;
1821 2172
1822 v = (ev.button == Button4) ? UP : DN; 2173 v = ev.button == Button4 ? UP : DN;
2174
1823 if (ev.state & ShiftMask) 2175 if (ev.state & ShiftMask)
1824 i = 1; 2176 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2177 else if (OPTION (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2178 i = nrow - 1;
1827 else 2179 else
1828 i = 5; 2180 i = 5;
2181
1829# ifdef MOUSE_SLIP_WHEELING 2182# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2183 if (ev.state & ControlMask)
1831 { 2184 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2185 mouse_slip_wheel_speed += v ? -1 : 1;
2186 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2187 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2188
2189 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2190 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2191
2192 slip_wheel_ev.start ();
2193 }
2194 else
2195 {
2196# endif
2197 scr_page (v, i);
2198 scrollbar_show (1);
2199# ifdef MOUSE_SLIP_WHEELING
1834 } 2200 }
1835# endif 2201# 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 } 2202 }
1850 break; 2203 break;
1851#endif 2204#endif
1852
1853 } 2205 }
1854 } 2206 }
1855#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev);
1858#endif
1859} 2207}
1860
1861 2208
1862#ifdef TRANSPARENT 2209#ifdef TRANSPARENT
2210#if TINTING
2211/* taken from aterm-0.4.2 */
2212
2213typedef uint32_t RUINT32T;
2214
2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2216{
2217 int sh_r, sh_g, sh_b;
2218 RUINT32T mask_r, mask_g, mask_b;
2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2222 int i;
2223
2224 Visual *visual = term->visual;
2225
2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2227
2228 /* for convenience */
2229 mask_r = visual->red_mask;
2230 mask_g = visual->green_mask;
2231 mask_b = visual->blue_mask;
2232
2233 /* boring lookup table pre-initialization */
2234 switch (srcImage->bits_per_pixel) {
2235 case 15:
2236 if ((mask_r != 0x7c00) ||
2237 (mask_g != 0x03e0) ||
2238 (mask_b != 0x001f))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2241 lookup_r = lookup;
2242 lookup_g = lookup+32;
2243 lookup_b = lookup+32+32;
2244 sh_r = 10;
2245 sh_g = 5;
2246 sh_b = 0;
2247 break;
2248 case 16:
2249 if ((mask_r != 0xf800) ||
2250 (mask_g != 0x07e0) ||
2251 (mask_b != 0x001f))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2254 lookup_r = lookup;
2255 lookup_g = lookup+32;
2256 lookup_b = lookup+32+64;
2257 sh_r = 11;
2258 sh_g = 5;
2259 sh_b = 0;
2260 break;
2261 case 24:
2262 if ((mask_r != 0xff0000) ||
2263 (mask_g != 0x00ff00) ||
2264 (mask_b != 0x0000ff))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2267 lookup_r = lookup;
2268 lookup_g = lookup+256;
2269 lookup_b = lookup+256+256;
2270 sh_r = 16;
2271 sh_g = 8;
2272 sh_b = 0;
2273 break;
2274 case 32:
2275 if ((mask_r != 0xff0000) ||
2276 (mask_g != 0x00ff00) ||
2277 (mask_b != 0x0000ff))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2280 lookup_r = lookup;
2281 lookup_g = lookup+256;
2282 lookup_b = lookup+256+256;
2283 sh_r = 16;
2284 sh_g = 8;
2285 sh_b = 0;
2286 break;
2287 default:
2288 return; /* we do not support this color depth */
2289 }
2290
2291 /* prepare limits for color transformation (each channel is handled separately) */
2292 if (shade < 0) {
2293 shade = -shade;
2294 if (shade < 0) shade = 0;
2295 if (shade > 100) shade = 100;
2296
2297 lower_lim_r = 65535-rm;
2298 lower_lim_g = 65535-gm;
2299 lower_lim_b = 65535-bm;
2300
2301 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2302 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2303 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2304
2305 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2306 } else {
2307 if (shade < 0) shade = 0;
2308 if (shade > 100) shade = 100;
2309
2310 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2311
2312 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2313 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2314 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2315 }
2316
2317 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2318 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2319 {
2320 unsigned int tmp;
2321
2322 tmp = lower_lim_r;
2323 lower_lim_r = lower_lim_b;
2324 lower_lim_b = tmp;
2325
2326 tmp = upper_lim_r;
2327 upper_lim_r = upper_lim_b;
2328 upper_lim_b = tmp;
2329 }
2330
2331 /* fill our lookup tables */
2332 for (i = 0; i <= mask_r>>sh_r; i++)
2333 {
2334 RUINT32T tmp;
2335 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2336 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2337 lookup_r[i] = (tmp/65535)<<sh_r;
2338 }
2339 for (i = 0; i <= mask_g>>sh_g; i++)
2340 {
2341 RUINT32T tmp;
2342 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2343 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2344 lookup_g[i] = (tmp/65535)<<sh_g;
2345 }
2346 for (i = 0; i <= mask_b>>sh_b; i++)
2347 {
2348 RUINT32T tmp;
2349 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2350 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2351 lookup_b[i] = (tmp/65535)<<sh_b;
2352 }
2353
2354 /* apply table to input image (replacing colors by newly calculated ones) */
2355 switch (srcImage->bits_per_pixel)
2356 {
2357 case 15:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0x7c00)>>10] |
2369 lookup_g[(*p & 0x03e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 16:
2377 {
2378 unsigned short *p1, *pf, *p, *pl;
2379 p1 = (unsigned short *) srcImage->data;
2380 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xf800)>>11] |
2388 lookup_g[(*p & 0x07e0)>> 5] |
2389 lookup_b[(*p & 0x001f)];
2390 }
2391 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 24:
2396 {
2397 unsigned char *p1, *pf, *p, *pl;
2398 p1 = (unsigned char *) srcImage->data;
2399 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width * 3;
2404 for (; p < pl; p += 3)
2405 {
2406 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2407 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2408 p[2] = lookup_r[(p[2] & 0x0000ff)];
2409 }
2410 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 32:
2415 {
2416 RUINT32T *p1, *pf, *p, *pl;
2417 p1 = (RUINT32T *) srcImage->data;
2418 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419
2420 while (p1 < pf)
2421 {
2422 p = p1;
2423 pl = p1 + srcImage->width;
2424 for (; p < pl; p++)
2425 {
2426 *p = lookup_r[(*p & 0xff0000)>>16] |
2427 lookup_g[(*p & 0x00ff00)>> 8] |
2428 lookup_b[(*p & 0x0000ff)] |
2429 (*p & ~0xffffff);
2430 }
2431 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2432 }
2433 break;
2434 }
2435 }
2436
2437 free (lookup);
2438}
2439#endif
2440
1863/* 2441/*
1864 * Check our parents are still who we think they are. 2442 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2443 * Do transparency updates if required
1866 */ 2444 */
1867int 2445int
1868rxvt_term::check_our_parents () 2446rxvt_term::check_our_parents ()
1869{ 2447{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2448 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2449 unsigned long nitems, bytes_after;
1872 Atom atype; 2450 Atom atype;
1873 unsigned char *prop = NULL; 2451 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2452 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2453 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2454 XWindowAttributes wattr, wrootattr;
1877 2455
1878 pchanged = 0; 2456 pchanged = 0;
1879 2457
1880 if (! (Options & Opt_transparent)) 2458 if (!OPTION (Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2459 return pchanged; /* Don't try any more */
1882 2460
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2462 rootdepth = wrootattr.depth;
1885 2463
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2465
1887 if (rootdepth != wattr.depth) 2466 if (rootdepth != wattr.depth)
1888 { 2467 {
1889 if (am_transparent) 2468 if (am_transparent)
1890 { 2469 {
1891 pchanged = 1; 2470 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2472 am_transparent = am_pixmap_trans = 0;
1895 } 2473 }
2474
1896 return pchanged; /* Don't try any more */ 2475 return pchanged; /* Don't try any more */
1897 } 2476 }
1898 2477
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2478 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2479 XSync (dpy, False);
1901 2480
1902 /* 2481 /*
1903 * Make the frame window set by the window manager have 2482 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2483 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2484 * windows for each client, so we have to take care about that.
1906 */ 2485 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2486 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2489 &nitems, &bytes_after, &prop) == Success);
2490
1911 if (!i || prop == NULL) 2491 if (!i || prop == NULL)
2492 i = (xa[XA_ESETROOT_PMAP_ID]
2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2495 &nitems, &bytes_after, &prop) == Success);
2496
2497 if (!i || prop == NULL
2498#if TINTING
2499 || !ISSET_PIXCOLOR (Color_tint)
2500#endif
2501 )
1912 have_pixmap = 0; 2502 have_pixmap = 0;
1913 else 2503 else
1914 { 2504 {
1915 have_pixmap = 1; 2505 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2506 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2507 XFree (prop);
1918 } 2508 }
2509
1919 if (have_pixmap) 2510 if (have_pixmap)
1920 { 2511 {
1921 /* 2512 /*
1922 * Copy display->root pixmap transparency 2513 * Copy display->root pixmap transparency
1923 */ 2514 */
… …
1926 Window cr; 2517 Window cr;
1927 XImage *image; 2518 XImage *image;
1928 GC gc; 2519 GC gc;
1929 XGCValues gcvalue; 2520 XGCValues gcvalue;
1930 2521
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2522 XTranslateCoordinates (dpy, parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2523 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2524 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2525 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2526 nx = ny = 0;
1936 2527
1937 if (sx < 0) 2528 if (sx < 0)
… …
1946 nh += sy; 2537 nh += sy;
1947 ny = -sy; 2538 ny = -sy;
1948 sy = 0; 2539 sy = 0;
1949 } 2540 }
1950 2541
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545 XSync (dpy, False);
1953 allowedxerror = -1; 2546 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2548
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2550 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2551 allowedxerror = 0;
2552
1959 if (image == NULL) 2553 if (image == NULL)
1960 { 2554 {
1961 if (am_transparent && am_pixmap_trans) 2555 if (am_transparent && am_pixmap_trans)
1962 { 2556 {
1963 pchanged = 1; 2557 pchanged = 1;
1964 if (TermWin.pixmap != None) 2558 if (pixmap != None)
1965 { 2559 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2560 XFreePixmap (dpy, pixmap);
1967 TermWin.pixmap = None; 2561 pixmap = None;
1968 } 2562 }
1969 } 2563 }
2564
1970 am_pixmap_trans = 0; 2565 am_pixmap_trans = 0;
1971 } 2566 }
1972 else 2567 else
1973 { 2568 {
1974 if (TermWin.pixmap != None) 2569 if (pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2570 XFreePixmap (dpy, pixmap);
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2571
1977 (unsigned int)szHint.width, 2572#if TINTING
1978 (unsigned int)szHint.height, 2573 if (ISSET_PIXCOLOR (Color_tint))
1979 (unsigned int)image->depth); 2574 {
2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2576
2577 rgba c;
2578 pix_colors_focused [Color_tint].get (c);
2579
2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2581 }
2582#endif
2583
2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2587 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2588 XFreeGC (dpy, gc);
1985 XDestroyImage (image); 2589 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
1987 TermWin.pixmap); 2591 XClearWindow (dpy, parent[0]);
2592
1988 if (!am_transparent || !am_pixmap_trans) 2593 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2594 pchanged = 1;
2595
1990 am_transparent = am_pixmap_trans = 1; 2596 am_transparent = am_pixmap_trans = 1;
1991 } 2597 }
1992 } 2598 }
1993 2599
1994 if (!am_pixmap_trans) 2600 if (am_pixmap_trans)
2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602 else
1995 { 2603 {
1996 unsigned int n; 2604 unsigned int n;
1997 /* 2605 /*
1998 * InheritPixmap transparency 2606 * InheritPixmap transparency
1999 */ 2607 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2609 {
2004 oldp = TermWin.parent[i]; 2610 oldp = parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2006 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2612 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2613
2009 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
2010 { 2615 {
2011 if (oldp != None) 2616 if (oldp != None)
2012 pchanged = 1; 2617 pchanged = 1;
2618
2013 break; 2619 break;
2014 } 2620 }
2621
2015 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
2016 pchanged = 1; 2623 pchanged = 1;
2017 } 2624 }
2018 2625
2019 n = 0; 2626 n = 0;
2020 2627
2021 if (pchanged) 2628 if (pchanged)
2022 {
2023 for (; n < (unsigned int)i; n++) 2629 for (; n < (unsigned int)i; n++)
2630 {
2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639
2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2641 {
2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2644 am_transparent = 0;
2645 /* XXX: also turn off Opt_transparent? */
2646 }
2647 else
2648 {
2649 for (n = 0; n < (unsigned int)i; n++)
2024 { 2650 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2652 XClearWindow (dpy, parent[n]);
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2653 }
2654
2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2656 am_transparent = 1;
2657 }
2658
2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2660 parent[i] = None;
2661 }
2662
2663 if (scrollBar.win)
2664 {
2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2666 scrollBar.setIdle ();
2667 scrollbar_show (0);
2668 }
2669
2670 if (am_transparent)
2671 {
2672 want_refresh = want_full_refresh = 1;
2673 if (am_pixmap_trans)
2674 flush ();
2675 }
2676
2677 return pchanged;
2678}
2679#endif
2680
2681/*}}} */
2682
2683bool
2684rxvt_term::cmd_parse ()
2685{
2686 bool flag = false;
2687 wchar_t ch = NOCHAR;
2688 char *seq_begin; // remember start of esc-sequence here
2689
2690 for (;;)
2691 {
2692 if (ch == NOCHAR)
2693 {
2694 seq_begin = cmdbuf_ptr;
2695 ch = next_char ();
2696
2697 if (ch == NOCHAR)
2698 break;
2699 }
2700
2701 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2702 {
2703 if (!seen_input)
2704 {
2705 seen_input = 1;
2706 // many badly-written programs (e.g. jed) contain a race condition:
2707 // they first read the screensize and then install a SIGWINCH handler.
2708 // some window managers resize the window early, and these programs
2709 // then sometimes get the size wrong.
2710 // unfortunately other programs are even more buggy and dislike
2711 // being sent SIGWINCH, so only do it when we were in fact being
2712 // resized.
2713 if (seen_resize && cmd_pid)
2714 kill (-cmd_pid, SIGWINCH);
2715 }
2716
2717 /* Read a text string from the input buffer */
2718 wchar_t buf[UBUFSIZ];
2719 bool refreshnow = false;
2720 int nlines = 0;
2721 wchar_t *str = buf;
2722 wchar_t *eol = str + min (ncol, UBUFSIZ);
2723
2724 for (;;)
2725 {
2726 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2727 break;
2728
2729 *str++ = ch;
2730
2731 if (ch == C0_LF || str >= eol)
2028 { 2732 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2733 if (ch == C0_LF)
2734 nlines++;
2735
2736 refresh_count++;
2737
2738 if (!OPTION (Opt_jumpScroll)
2739 || (refresh_count >= refresh_limit * (nrow - 1)))
2740 {
2741 refreshnow = true;
2742 refresh_count = 0;
2743 ch = NOCHAR;
2030 break; 2744 break;
2745 }
2746
2747 // scr_add_lines only works for nlines <= nrow - 1.
2748 if (nlines >= nrow - 1)
2749 {
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2752 scr_add_lines (buf, str - buf, nlines);
2753
2754 nlines = 0;
2755 str = buf;
2756 eol = str + min (ncol, UBUFSIZ);
2757 }
2758
2759 if (str >= eol)
2760 {
2761 if (eol >= buf + UBUFSIZ)
2762 {
2763 ch = NOCHAR;
2764 break;
2765 }
2766 else
2767 eol = min (eol + ncol, buf + UBUFSIZ);
2768 }
2769
2770 }
2771
2772 seq_begin = cmdbuf_ptr;
2773 ch = next_char ();
2774 }
2775
2776 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778 scr_add_lines (buf, str - buf, nlines);
2779
2780 /*
2781 * If there have been a lot of new lines, then update the screen
2782 * What the heck I'll cheat and only refresh less than every page-full.
2783 * the number of pages between refreshes is refresh_limit, which
2784 * is incremented here because we must be doing flat-out scrolling.
2785 */
2786 if (refreshnow)
2787 {
2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2789 refresh_limit++;
2790 else
2791 {
2792 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2794 scr_refresh ();
2795 want_refresh = 1;
2031 } 2796 }
2032 } 2797 }
2033 }
2034 2798
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 } 2799 }
2046 else 2800 else
2047 { 2801 {
2048 /* wait (an arbitrary period) for the WM to do its thing 2802 try
2049 * needed for fvwm2.2.2 (and before?) */ 2803 {
2050# ifdef HAVE_NANOSLEEP 2804 process_nonprinting (ch);
2051 struct timespec rqt; 2805 }
2806 catch (const class out_of_input &o)
2807 {
2808 // we ran out of input, retry later
2809 cmdbuf_ptr = seq_begin;
2810 break;
2811 }
2052 2812
2053 rqt.tv_sec = 1; 2813 ch = NOCHAR;
2054 rqt.tv_nsec = 0; 2814 }
2055 nanosleep (&rqt, NULL); 2815 }
2056# else 2816
2057 sleep (1); 2817 return flag;
2058# endif 2818}
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2819
2060 for (n = 0; n < (unsigned int)i; n++) 2820// read the next character
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2821wchar_t
2062 ParentRelative); 2822rxvt_term::next_char () NOTHROW
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2823{
2064 ParentRelative); 2824 while (cmdbuf_ptr < cmdbuf_endp)
2065 am_transparent = 1; 2825 {
2826 // assume 7-bit to be ascii ALWAYS
2827 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2828 return *cmdbuf_ptr++;
2829
2830 wchar_t wc;
2831 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2832
2833 if (len == (size_t)-2)
2066 } 2834 {
2835 // the mbstate stores incomplete sequences. didn't know this :/
2836 cmdbuf_ptr = cmdbuf_endp;
2837 break;
2838 }
2067 2839
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2840 if (len == (size_t)-1)
2069 TermWin.parent[i] = None; 2841 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2842
2843 // assume wchar == unicode
2844 cmdbuf_ptr += len;
2845 return wc & UNICODE_MASK;
2070 } 2846 }
2847
2848 return NOCHAR;
2849}
2850
2851// read the next octet
2852uint32_t
2853rxvt_term::next_octet () NOTHROW
2854{
2855 return cmdbuf_ptr < cmdbuf_endp
2856 ? (unsigned char)*cmdbuf_ptr++
2857 : NOCHAR;
2858}
2859
2860static class out_of_input out_of_input;
2861
2862/* rxvt_cmd_getc () - Return next input character */
2863/*
2864 * Return the next input character after first passing any keyboard input
2865 * to the command.
2866 */
2867wchar_t
2868rxvt_term::cmd_getc () THROW ((class out_of_input))
2869{
2870 wchar_t c = next_char ();
2871
2872 if (c == NOCHAR)
2873 throw out_of_input;
2874
2071 return pchanged; 2875 return c;
2072} 2876}
2073#endif
2074 2877
2075/*}}} */ 2878uint32_t
2879rxvt_term::cmd_get8 () THROW ((class out_of_input))
2880{
2881 uint32_t c = next_octet ();
2882
2883 if (c == NOCHAR)
2884 throw out_of_input;
2885
2886 return c;
2887}
2076 2888
2077/*{{{ print pipe */ 2889/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2890/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2891#ifdef PRINTPIPE
2080FILE * 2892FILE *
2081rxvt_term::popen_printer () 2893rxvt_term::popen_printer ()
2082{ 2894{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2895 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2896
2085 if (stream == NULL) 2897 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2898 rxvt_warn ("can't open printer pipe, not printing.\n");
2899
2087 return stream; 2900 return stream;
2088} 2901}
2089 2902
2090int 2903int
2091rxvt_term::pclose_printer (FILE *stream) 2904rxvt_term::pclose_printer (FILE *stream)
2092{ 2905{
2093 fflush (stream); 2906 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); 2907 return pclose (stream);
2100# endif
2101} 2908}
2102 2909
2103/* 2910/*
2104 * simulate attached vt100 printer 2911 * simulate attached vt100 printer
2105 */ 2912 */
2106void 2913void
2107rxvt_term::process_print_pipe () 2914rxvt_term::process_print_pipe ()
2108{ 2915{
2109 int done; 2916 int done;
2110 FILE *fd; 2917 FILE *fd;
2111 2918
2112 if ((fd = popen_printer ()) == NULL) 2919 if ((fd = popen_printer ()) == NULL)
2113 return; 2920 return;
2114 2921
2115 /* 2922 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2923 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2924 * is received.
2118 */ 2925 */
2119 for (done = 0; !done;) 2926 for (done = 0; !done;)
2120 { 2927 {
2121 unsigned char buf[8]; 2928 unsigned char buf[8];
2122 unsigned char ch; 2929 unicode_t ch;
2123 unsigned int i, len; 2930 unsigned int i, len;
2124 2931
2125 if ((ch = cmd_getc ()) != C0_ESC) 2932 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2933 {
2127 if (putc (ch, fd) == EOF) 2934 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2935 break; /* done = 1 */
… …
2143 { 2950 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2951 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2952 break; /* done = 1 */
2146 } 2953 }
2147 } 2954 }
2955
2148 for (i = 0; i < len; i++) 2956 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2957 if (putc (buf[i], fd) == EOF)
2150 { 2958 {
2151 done = 1; 2959 done = 1;
2152 break; 2960 break;
2153 } 2961 }
2154 } 2962 }
2155 } 2963 }
2964
2156 pclose_printer (fd); 2965 pclose_printer (fd);
2157} 2966}
2158#endif /* PRINTPIPE */ 2967#endif /* PRINTPIPE */
2159/*}}} */ 2968/*}}} */
2160 2969
2161/* *INDENT-OFF* */ 2970/* *INDENT-OFF* */
2162enum { 2971enum {
2163 C1_40 = 0x40, 2972 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2973 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, 2974 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, 2975 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 2976 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2977};
2169/* *INDENT-ON* */ 2978/* *INDENT-ON* */
2170 2979
2171/*{{{ process non-printing single characters */ 2980/*{{{ process non-printing single characters */
2172void 2981void
2173rxvt_term::process_nonprinting (unsigned char ch) 2982rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2983{
2175 switch (ch) 2984 switch (ch)
2176 { 2985 {
2986 case C0_ESC:
2987 process_escape_seq ();
2988 break;
2177 case C0_ENQ: /* terminal Status */ 2989 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2990 if (rs[Rs_answerbackstring])
2179 tt_write ( 2991 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 2992 else
2183 tt_write ((unsigned char *)VT100_ANS, 2993 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2994 break;
2186 case C0_BEL: /* bell */ 2995 case C0_BEL: /* bell */
2187 scr_bell (); 2996 scr_bell ();
2188 break; 2997 break;
2189 case C0_BS: /* backspace */ 2998 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 3013 scr_charset_choose (1);
2205 break; 3014 break;
2206 case C0_SI: /* shift in - acs */ 3015 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3016 scr_charset_choose (0);
2208 break; 3017 break;
3018
3019#ifdef EIGHT_BIT_CONTROLS
3020 // 8-bit controls
3021 case 0x90: /* DCS */
3022 process_dcs_seq ();
3023 break;
3024 case 0x9b: /* CSI */
3025 process_csi_seq ();
3026 break;
3027 case 0x9d: /* CSI */
3028 process_osc_seq ();
3029 break;
3030#endif
2209 } 3031 }
2210} 3032}
2211/*}}} */ 3033/*}}} */
2212 3034
2213 3035
2214/*{{{ process VT52 escape sequences */ 3036/*{{{ process VT52 escape sequences */
2215void 3037void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 3038rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 3039{
2218 int row, col; 3040 int row, col;
2219 3041
2220 switch (ch) 3042 switch (ch)
2221 { 3043 {
… …
2273 3095
2274/*{{{ process escape sequences */ 3096/*{{{ process escape sequences */
2275void 3097void
2276rxvt_term::process_escape_seq () 3098rxvt_term::process_escape_seq ()
2277{ 3099{
2278 unsigned char ch = cmd_getc (); 3100 unicode_t ch = cmd_getc ();
2279 3101
2280 if (PrivateModes & PrivMode_vt52) 3102 if (priv_modes & PrivMode_vt52)
2281 { 3103 {
2282 process_escape_vt52 (ch); 3104 process_escape_vt52 (ch);
2283 return; 3105 return;
2284 } 3106 }
2285 3107
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 3122 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 3123 break;
2302 case '+': 3124 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 3125 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 3126 break;
2305#ifndef NO_FRILLS 3127#if !ENABLE_MINIMAL
2306 case '6': 3128 case '6':
2307 scr_backindex (); 3129 scr_backindex ();
2308 break; 3130 break;
2309#endif 3131#endif
2310 case '7': 3132 case '7':
2311 scr_cursor (SAVE); 3133 scr_cursor (SAVE);
2312 break; 3134 break;
2313 case '8': 3135 case '8':
2314 scr_cursor (RESTORE); 3136 scr_cursor (RESTORE);
2315 break; 3137 break;
2316#ifndef NO_FRILLS 3138#if !ENABLE_MINIMAL
2317 case '9': 3139 case '9':
2318 scr_forwardindex (); 3140 scr_forwardindex ();
2319 break; 3141 break;
2320#endif 3142#endif
2321 case '=': 3143 case '=':
… …
2331 break; 3153 break;
2332 3154
2333 /* 8.3.87: NEXT LINE */ 3155 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3156 case C1_NEL: /* ESC E */
2335 { 3157 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3158 wchar_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3159 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2338 } 3160 }
2339 break; 3161 break;
2340 3162
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3163 /* kidnapped escape sequence: Should be 8.3.48 */
2342 case C1_ESA: /* ESC G */ 3164 case C1_ESA: /* ESC G */
… …
2352 case C1_RI: /* ESC M */ 3174 case C1_RI: /* ESC M */
2353 scr_index (DN); 3175 scr_index (DN);
2354 break; 3176 break;
2355 3177
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3178 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3179 /*case C1_SS2: scr_single_shift (2); break; */
2358 3180
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3181 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3182 /*case C1_SS3: scr_single_shift (3); break; */
2361 3183
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3184 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3185 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3186 process_dcs_seq ();
2365 break; 3187 break;
2366 3188
2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3189 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2368 case C1_SCI: /* ESC Z */ 3190 case C1_SCI: /* ESC Z */
2369 tt_write ((const unsigned char *)ESCZ_ANSWER, 3191 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2371 break; /* steal obsolete ESC [ c */ 3192 break; /* steal obsolete ESC [ c */
2372 3193
2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3194 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2374 case C1_CSI: /* ESC [ */ 3195 case C1_CSI: /* ESC [ */
2375 process_csi_seq (); 3196 process_csi_seq ();
… …
2380 process_osc_seq (); 3201 process_osc_seq ();
2381 break; 3202 break;
2382 3203
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3204 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3205 case 'c':
3206 mbstate.reset ();
2385 scr_poweron (); 3207 scr_poweron ();
2386 scrollbar_show (1); 3208 scrollbar_show (1);
2387 break; 3209 break;
2388 3210
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3211 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3223
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3224/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3225/* *INDENT-OFF* */
2404enum { 3226enum {
2405 CSI_ICH = 0x40, 3227 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3228 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 , 3229 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, 3230 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, 3231 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, 3232 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, 3233 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, */ 3248 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, [, \, ], ^, _, */ 3249 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, */ 3250 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, */ 3251 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, */ 3252 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, {, |, }, ~, */ 3253 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3254 };
2433/* *INDENT-ON* */ 3255/* *INDENT-ON* */
2434 3256
2435void 3257void
2436rxvt_term::process_csi_seq () 3258rxvt_term::process_csi_seq ()
2437{ 3259{
2438 unsigned char ch, priv, i; 3260 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3261 unsigned int nargs, p;
2440 int n, ndef; 3262 int n, ndef;
2441 int arg[ESC_ARGS]; 3263 int arg[ESC_ARGS];
2442 3264
2443 for (nargs = ESC_ARGS; nargs > 0;) 3265 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3266 arg[--nargs] = 0;
2445 3267
2446 priv = 0; 3268 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3270 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3271 { /* '<' '=' '>' '?' */
2450 priv = ch; 3272 priv = ch;
2451 ch = cmd_getc (); 3273 ch = cmd_getc ();
2452 } 3274 }
3275
2453 /* read any numerical arguments */ 3276 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3277 for (n = -1; ch < CSI_ICH; )
2455 { 3278 {
2456 if (isdigit (ch)) 3279 if (isdigit (ch))
2457 { 3280 {
… …
2464 { 3287 {
2465 if (nargs < ESC_ARGS) 3288 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3289 arg[nargs++] = n;
2467 n = -1; 3290 n = -1;
2468 } 3291 }
2469 else if (ch == '\b') 3292 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); 3293 process_nonprinting (ch);
2481 } 3294
2482 ch = cmd_getc (); 3295 ch = cmd_getc ();
2483 } 3296 }
2484 3297
2485 if (ch > CSI_7F) 3298 if (ch > CSI_7F)
2486 return; 3299 return;
… …
2492 ndef = get_byte_array_bit (csi_defaults, i); 3305 ndef = get_byte_array_bit (csi_defaults, i);
2493 for (p = 0; p < nargs; p++) 3306 for (p = 0; p < nargs; p++)
2494 if (arg[p] == -1) 3307 if (arg[p] == -1)
2495 arg[p] = ndef; 3308 arg[p] = ndef;
2496 3309
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 /* 3310 /*
2505 * private mode handling 3311 * private mode handling
2506 */ 3312 */
2507 if (priv) 3313 if (priv)
2508 { 3314 {
2509 switch (priv) 3315 switch (priv)
2510 { 3316 {
2511 case '>': 3317 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 3318 if (ch == CSI_DA) /* secondary device attributes */
3319 {
3320 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 //
3323 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3324 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3325 // that we do not support xterm mouse reporting (should be 95 when we do).
3326 //
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;94;0c", 'U');
3328 }
2514 break; 3329 break;
2515 case '?': 3330 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 3332 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 3333 break;
… …
2623 3438
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3439 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 3440 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 3441 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3442 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3443 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 3444 break;
2630 3445
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3446 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3447 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3448 break;
2635 3449
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3450 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3451 process_sgr_mode (nargs, arg);
2638 break; 3452 break;
… …
2644 tt_printf ("\033[0n"); 3458 tt_printf ("\033[0n");
2645 break; 3459 break;
2646 case 6: /* CPR requested */ 3460 case 6: /* CPR requested */
2647 scr_report_position (); 3461 scr_report_position ();
2648 break; 3462 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3463 case 7: /* unofficial extension */
3464 if (OPTION (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3465 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3466 break;
2653#endif
2654 case 8: /* unofficial extension */ 3467 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3469 break;
2657 } 3470 }
2658 break; 3471 break;
2659 3472
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3473 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3506 break;
2694 3507
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3508 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3509 if (arg[0] == 4)
2697 scr_insert_mode (0); 3510 scr_insert_mode (0);
3511 else if (arg[0] == 20)
3512 priv_modes &= ~PrivMode_LFNL;
2698 break; 3513 break;
2699 3514
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3515 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3516 if (arg[0] == 4)
2702 scr_insert_mode (1); 3517 scr_insert_mode (1);
3518 else if (arg[0] == 20)
3519 priv_modes |= PrivMode_LFNL;
2703 break; 3520 break;
2704 3521
2705 /* 3522 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3523 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3524 */
… …
2719 break; 3536 break;
2720 case CSI_75: 3537 case CSI_75:
2721 scr_cursor (RESTORE); 3538 scr_cursor (RESTORE);
2722 break; 3539 break;
2723 3540
2724#ifndef NO_FRILLS 3541#if !ENABLE_MINIMAL
2725 case CSI_74: 3542 case CSI_74:
2726 process_window_ops (arg, nargs); 3543 process_window_ops (arg, nargs);
2727 break; 3544 break;
2728#endif 3545#endif
2729 3546
2730 case CSI_78: /* DECREQTPARM */ 3547 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3548 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3549 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3550 break;
2734 3551
2735 default: 3552 default:
2736 break; 3553 break;
2737 } 3554 }
2738} 3555}
2739/*}}} */ 3556/*}}} */
2740 3557
2741#ifndef NO_FRILLS 3558#if !ENABLE_MINIMAL
2742/* ARGSUSED */ 3559/* ARGSUSED */
2743void 3560void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3561rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3562{
2746 int x, y; 3563 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3564 XWindowAttributes wattr;
2751 Window wdummy; 3565 Window wdummy;
3566
3567 dLocal (Display *, dpy);
2752 3568
2753 if (nargs == 0) 3569 if (nargs == 0)
2754 return; 3570 return;
3571
2755 switch (args[0]) 3572 switch (args[0])
2756 { 3573 {
2757 /* 3574 /*
2758 * commands 3575 * commands
2759 */ 3576 */
2760 case 1: /* deiconify window */ 3577 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3578 XMapWindow (dpy, parent[0]);
2762 break; 3579 break;
2763 case 2: /* iconify window */ 3580 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3581 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3582 break;
2767 case 3: /* set position (pixels) */ 3583 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3584 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3585 break;
2770 case 4: /* set size (pixels) */ 3586 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3588 break;
2773 case 5: /* raise window */ 3589 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3590 XRaiseWindow (dpy, parent[0]);
2775 break; 3591 break;
2776 case 6: /* lower window */ 3592 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3593 XLowerWindow (dpy, parent[0]);
2778 break; 3594 break;
2779 case 7: /* refresh window */ 3595 case 7: /* refresh window */
2780 scr_touch (true); 3596 scr_touch (true);
2781 break; 3597 break;
2782 case 8: /* set size (chars) */ 3598 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3599 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3600 (unsigned int) (args[1] * fheight));
2785 break; 3601 break;
3602
3603 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3604 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3605 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3606 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3607 (unsigned int) (args[1] * fheight));
2790 break; 3608 break;
3609
2791 /* 3610 /*
2792 * reports - some output format copied from XTerm 3611 * reports - some output format copied from XTerm
2793 */ 3612 */
2794 case 11: /* report window state */ 3613 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3615 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3616 break;
2798 case 13: /* report window position */ 3617 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3618 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3619 XTranslateCoordinates (dpy, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3620 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3621 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3622 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3623 break;
2805 case 14: /* report window size (pixels) */ 3624 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3625 XGetWindowAttributes (dpy, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3626 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3627 break;
3628 case 18: /* report text area size (chars) */
3629 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3630 break;
2809 case 18: /* report window size (chars) */ 3631 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3633 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3634 case 20: /* report icon label */
3635 {
3636 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3637 XGetIconName (dpy, parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3639 XFree (s);
3640 }
2816 break; 3641 break;
2817 case 21: /* report window title */ 3642 case 21: /* report window title */
3643 {
3644 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3645 XFetchName (dpy, parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3647 XFree (s);
3648 }
2820 break; 3649 break;
2821#endif
2822
2823 } 3650 }
2824} 3651}
2825#endif 3652#endif
2826 3653
2827/*----------------------------------------------------------------------*/ 3654/*----------------------------------------------------------------------*/
2828/* 3655/*
2829 * get input up until STRING TERMINATOR (or BEL) 3656 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3657 * ends_how is terminator used. returned input must be free()'d
2831 */ 3658 */
2832unsigned char * 3659char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3660rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3661{
2835 int seen_esc = 0; /* seen escape? */ 3662 unicode_t ch;
3663 bool seen_esc = false;
2836 unsigned int n = 0; 3664 unsigned int n = 0;
2837 unsigned char *s; 3665 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3666
2840 for (; (ch = cmd_getc ());) 3667 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3668 {
2842 if (ch == C0_BEL 3669 if (seen_esc)
2843 || ch == CHAR_ST 3670 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3671 if (ch == 0x5c) /* 7bit ST */
2845 break; 3672 break;
3673 else
3674 return NULL;
3675 }
2846 if (ch == C0_ESC) 3676 else if (ch == C0_ESC)
2847 { 3677 {
2848 seen_esc = 1; 3678 seen_esc = true;
2849 continue; 3679 continue;
2850 } 3680 }
3681 else if (ch == C0_BEL || ch == CHAR_ST)
3682 break;
2851 else if (ch == '\t') 3683 else if (ch == C0_SYN)
2852 ch = ' '; /* translate '\t' to space */ 3684 ch = cmd_get8 ();
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3685 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3686 return NULL; /* other control character - exit */
2855 if (n < sizeof (string) - 1) 3687
3688 seen_esc = false;
3689
3690 if (n >= STRING_MAX - 1)
3691 // stop at some sane length
3692 return NULL;
3693
2856 string[n++] = ch; 3694 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3695 }
3696
2859 string[n++] = '\0'; 3697 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3698
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3700
2864 return s; 3701 return rxvt_wcstombs (string);
2865} 3702}
2866 3703
2867/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
2868/* 3705/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3707 */
2871void 3708void
2872rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
2873{ 3710{
2874 unsigned char eh, *s; 3711 char *s;
3712 unicode_t eh;
3713
2875 /* 3714 /*
2876 * Not handled yet 3715 * Not handled yet
2877 */ 3716 */
2878 s = get_to_st (&eh); 3717 s = get_to_st (eh);
2879 if (s) 3718 if (s)
2880 free (s); 3719 free (s);
3720
2881 return; 3721 return;
2882} 3722}
2883 3723
2884/*----------------------------------------------------------------------*/ 3724/*----------------------------------------------------------------------*/
2885/* 3725/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3726 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3727 */
2888void 3728void
2889rxvt_term::process_osc_seq () 3729rxvt_term::process_osc_seq ()
2890{ 3730{
2891 unsigned char ch, eh, *s; 3731 unicode_t ch, eh;
2892 int arg; 3732 int arg;
2893 3733
2894 ch = cmd_getc (); 3734 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
2897 3737
2898 if (ch == ';') 3738 if (ch == ';')
2899 { 3739 {
2900 s = get_to_st (&eh); 3740 char *s = get_to_st (eh);
3741
2901 if (s) 3742 if (s)
2902 { 3743 {
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); 3744 process_xterm_seq (arg, s, eh);
2915 free (s); 3745 free (s);
2916 } 3746 }
2917 } 3747 }
2918} 3748}
3749
3750void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{
3753 if (str[0] == '?' && !str[1])
3754 {
3755 rgba c;
3756 pix_colors_focused[color].get (c);
3757
3758#if XFT
3759 if (c.a != rgba::MAX_CC)
3760 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3761 else
3762#endif
3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764 }
3765 else
3766 set_window_color (color, str);
3767}
3768
2919/* 3769/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * 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 */ 3771 */
2942void 3772void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2944{ 3774{
2945 int changed = 0; 3775 int color;
2946 int color;
2947 char *buf, *name; 3776 char *buf, *name;
3777 bool query = str[0] == '?' && !str[1];
3778 int saveop = op;
3779
3780 dLocal (Display *, dpy);
2948 3781
2949 assert (str != NULL); 3782 assert (str != NULL);
3783
3784 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3785 return;
3786
2950 switch (op) 3787 switch (op)
2951 { 3788 {
2952 case XTerm_name: 3789 case XTerm_name:
2953 set_title (str); 3790 set_title (str);
2954 /* FALLTHROUGH */ 3791 /* FALLTHROUGH */
2955 case XTerm_iconName: 3792 case XTerm_iconName:
2956 set_iconName (str); 3793 set_icon_name (str);
2957 break; 3794 break;
2958 case XTerm_title: 3795 case XTerm_title:
2959 set_title (str); 3796 set_title (str);
2960 break; 3797 break;
3798 case XTerm_property:
3799 if (str[0] == '?')
3800 {
3801 Atom prop = display->atom (str + 1);
3802 Atom actual_type;
3803 int actual_format;
3804 unsigned long nitems;
3805 unsigned long bytes_after;
3806 unsigned char *value = 0;
3807 const char *str = "";
3808
3809 if (prop
3810 && XGetWindowProperty (dpy, parent[0],
3811 prop, 0, 1<<16, 0, AnyPropertyType,
3812 &actual_type, &actual_format,
3813 &nitems, &bytes_after, &value) == Success
3814 && actual_type != None
3815 && actual_format == 8)
3816 str = (const char *)(value);
3817
3818 tt_printf ("\033]%d;%s%c", op, str, resp);
3819
3820 XFree (value);
3821 }
3822 else
3823 {
3824 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3825
3826 if (eq)
3827 {
3828 *eq = 0;
3829 set_utf8_property (display->atom (str), eq + 1);
3830 }
3831 else
3832 XDeleteProperty (dpy, parent[0],
3833 display->atom (str));
3834 }
3835 break;
3836
2961 case XTerm_Color: 3837 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3838 for (buf = (char *)str; buf && *buf;)
2963 { 3839 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3840 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3841 break;
3842
2966 *name++ = '\0'; 3843 *name++ = '\0';
2967 color = atoi (buf); 3844 color = atoi (buf) + minCOLOR;
2968 if (color < 0 || color >= TOTAL_COLORS) 3845
3846 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2969 break; 3847 break;
3848
2970 if ((buf = STRCHR (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3850 *buf++ = '\0';
2972 set_window_color (color + minCOLOR, name); 3851
3852 process_color_seq (op, color, name, resp);
2973 } 3853 }
3854 break;
3855 case XTerm_Color00:
3856 process_color_seq (op, Color_fg, str, resp);
3857 break;
3858 case XTerm_Color01:
3859 process_color_seq (op, Color_bg, str, resp);
2974 break; 3860 break;
2975#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3863 process_color_seq (op, Color_cursor, str, resp);
2978 break; 3864 break;
2979#endif 3865#endif
2980 case XTerm_Color_pointer: 3866 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3867 process_color_seq (op, Color_pointer_fg, str, resp);
3868 break;
3869 case XTerm_Color_pointer_bg:
3870 process_color_seq (op, Color_pointer_bg, str, resp);
2982 break; 3871 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#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: 3873 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3874 process_color_seq (op, Color_RV, str, resp);
2992 break; 3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (op, Color_IT, str, resp);
3886 break;
2993#endif 3887#endif
3888#if TRANSPARENT && TINTING
3889 case URxvt_Color_tint:
3890 process_color_seq (op, Color_tint, str, resp);
2994 3891
2995 case XTerm_Menu: 3892 check_our_parents ();
3893
3894 if (am_transparent)
3895 want_full_refresh = want_refresh = 1;
3896
3897 break;
3898#endif
3899
3900 case Rxvt_Pixmap:
2996 /* 3901 {
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 != ';') 3902 if (*str != ';')
3003 { 3903 {
3004#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3007#endif
3008 scr_touch (true); 3907 scr_touch (true);
3908#endif
3009 } 3909 }
3910
3911 int changed = 0;
3912
3010 while ((str = STRCHR (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3011 { 3914 {
3012 str++; 3915 str++;
3013#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3015#endif 3918#endif
3016
3017 } 3919 }
3920
3018 if (changed) 3921 if (changed)
3019 { 3922 {
3020#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3924 resize_pixmap ();
3022#endif
3023 scr_touch (true); 3925 scr_touch (true);
3926#endif
3024 } 3927 }
3928 }
3025 break; 3929 break;
3026 3930
3027 case XTerm_restoreFG: 3931 case Rxvt_restoreFG:
3028 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3029 break; 3933 break;
3030 case XTerm_restoreBG: 3934 case Rxvt_restoreBG:
3031 set_window_color (Color_bg, str); 3935 set_window_color (Color_bg, str);
3032 break; 3936 break;
3937
3033 case XTerm_logfile: 3938 case XTerm_logfile:
3939 // TODO, when secure mode?
3034 break; 3940 break;
3035 case XTerm_font: 3941
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 3942#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3943 case Rxvt_dumpscreen: /* no error notices */
3059 { 3944 {
3060 int fd; 3945 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3946 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3947 {
3063 scr_dump (fd); 3948 scr_dump (fd);
3064 close (fd); 3949 close (fd);
3065 } 3950 }
3066 } 3951 }
3067 break; 3952 break;
3068#endif 3953#endif
3954 case XTerm_font:
3955 op = URxvt_font;
3956 case URxvt_font:
3957#if ENABLE_STYLES
3958 case URxvt_boldFont:
3959 case URxvt_italicFont:
3960 case URxvt_boldItalicFont:
3961#endif
3962 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp);
3967 else
3968 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)];
3069 3970
3971 res = strdup (str);
3972 allocated.push_back ((void *)res);
3973 set_fonts ();
3974 }
3975 break;
3976
3977 case URxvt_version:
3978 if (query)
3979 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3980 op,
3981 rs[Rs_name], VERSION[0], VERSION[2],
3982 resp);
3983 break;
3984
3985#if !ENABLE_MINIMAL
3986 case URxvt_locale:
3987 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3989 else
3990 {
3991 set_locale (str);
3992 pty->set_utf8_mode (enc_utf8);
3993 init_xlocale ();
3994 }
3995 break;
3996
3997 case URxvt_view_up:
3998 case URxvt_view_down:
3999 {
4000 int lines = atoi (str);
4001
4002 if (lines)
4003 scr_page (op == URxvt_view_up ? UP : DN, lines);
4004 else
4005 scr_erase_savelines ();
4006 }
4007
4008 break;
4009#endif
4010
4011#if ENABLE_PERL
4012 case URxvt_perl:
4013 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4014 ; // no responses yet
4015 break;
4016#endif
3070 } 4017 }
3071} 4018}
3072/*----------------------------------------------------------------------*/ 4019/*----------------------------------------------------------------------*/
3073 4020
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4021/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 4029 * so no need for fancy checking
3083 */ 4030 */
3084int 4031int
3085rxvt_term::privcases (int mode, unsigned long bit) 4032rxvt_term::privcases (int mode, unsigned long bit)
3086{ 4033{
3087 int state; 4034 int state;
3088 4035
3089 if (mode == 's') 4036 if (mode == 's')
3090 { 4037 {
3091 SavedModes |= (PrivateModes & bit); 4038 SavedModes |= (priv_modes & bit);
3092 return -1; 4039 return -1;
3093 } 4040 }
3094 else 4041 else
3095 { 4042 {
3096 if (mode == 'r') 4043 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4044 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 4045 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4046 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 4047 PrivMode (state, bit);
3101 } 4048 }
4049
3102 return state; 4050 return state;
3103} 4051}
3104 4052
3105/* we're not using priv _yet_ */ 4053/* we're not using priv _yet_ */
3106void 4054void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4055rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3108{ 4056{
3109 unsigned int i, j; 4057 unsigned int i, j;
3110 int state; 4058 int state;
4059
3111 static const struct 4060 static const struct
3112 { 4061 {
3113 const int argval; 4062 const int argval;
3114 const unsigned long bit; 4063 const unsigned long bit;
3115 } 4064 }
4065
3116 argtopriv[] = { 4066 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 4067 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 4068 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 4069 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 4070 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 4071 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 4072 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 4073 { 7, PrivMode_Autowrap },
4074 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 4075 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 4076 // 18, 19 printing-related
3126 { menuBar_esc, PrivMode_menuBar }, 4077 { 25, PrivMode_VisibleCursor },
3127#endif
3128#ifdef scrollBar_esc 4078#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 4079 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 4080#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 4081 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 4082 { 40, PrivMode_132OK },
4083 // 41 xterm more fixes NYI
4084 // 45 margin bell NYI
4085 // 46 start logging
3134 { 47, PrivMode_Screen }, 4086 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 4087 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 4088#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 4089 { 67, PrivMode_BackSpace },
3138#endif 4090#endif
3139 { 1000, PrivMode_MouseX11 }, 4091 { 1000, PrivMode_MouseX11 },
4092 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4093 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4094 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 4095 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 4096 { 1011, PrivMode_Keypress }, // rxvt extension
4097 // 1035 enable modifiers for alt, numlock NYI
4098 // 1036 send ESC for meta keys NYI
4099 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 4100 { 1047, PrivMode_Screen },
4101 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4102 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4103 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 4104 };
3145 4105
3146 if (nargs == 0) 4106 if (nargs == 0)
3147 return; 4107 return;
3148 4108
… …
3163 state = privcases (mode, argtopriv[j].bit); 4123 state = privcases (mode, argtopriv[j].bit);
3164 break; 4124 break;
3165 } 4125 }
3166 4126
3167 /* extra handling for values with state unkept */ 4127 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 4128 switch (arg[i])
3170 { 4129 {
4130#if ENABLE_STYLES
4131 case 1021:
4132 set_option (Opt_intensityStyles, mode);
4133
4134 scr_touch (true);
4135 break;
4136#endif
3171 case 1048: /* alternative cursor save */ 4137 case 1048: /* alternative cursor save */
4138 case 1049:
4139 if (OPTION (Opt_secondaryScreen))
3172 if (mode == 0) 4140 if (mode == 0)
3173 scr_cursor (RESTORE); 4141 scr_cursor (RESTORE);
3174 else if (mode == 1) 4142 else if (mode == 1)
3175 scr_cursor (SAVE); 4143 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; 4144 break;
4145 }
4146
4147 if (state >= 0)
4148 /* extra handling for values with valid 0 or 1 state */
4149 switch (arg[i])
4150 {
4151 /* case 1: - application cursor keys */
4152 case 2: /* VT52 mode */
4153 /* oddball mode. should be set regardless of set/reset
4154 * parameter. Return from VT52 mode with an ESC < from
4155 * within VT52 mode
4156 */
4157 PrivMode (1, PrivMode_vt52);
4158 break;
3192 case 3: /* 80/132 */ 4159 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4160 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4161 set_widthheight (((state ? 132 : 80) * fwidth), height);
3195 break; 4162 break;
3196 case 4: /* smooth scrolling */ 4163 case 4: /* smooth scrolling */
3197 if (state)
3198 Options &= ~Opt_jumpScroll;
3199 else
3200 Options |= Opt_jumpScroll; 4164 set_option (Opt_jumpScroll, !state);
3201 break; 4165 break;
3202 case 5: /* reverse video */ 4166 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4167 scr_rvideo_mode (state);
3204 break; 4168 break;
3205 case 6: /* relative/absolute origins */ 4169 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4170 scr_relative_origin (state);
3207 break; 4171 break;
3208 case 7: /* autowrap */ 4172 case 7: /* autowrap */
3209 scr_autowrap (state); 4173 scr_autowrap (state);
3210 break; 4174 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4175 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4176 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4177 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4178 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4179 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 4180#ifdef scrollBar_esc
3224 case scrollBar_esc: 4181 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4182 if (scrollbar_mapping (state))
3226 { 4183 {
3227 resize_all_windows (0, 0, 0); 4184 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4185 scr_touch (true);
3229 } 4186 }
3230 break; 4187 break;
3231#endif 4188#endif
3232 case 25: /* visible/invisible cursor */ 4189 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4190 scr_cursor_visible (state);
3234 break; 4191 break;
3235 /* case 35: - shift keys */ 4192 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4193 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4194 case 47: /* secondary screen */
3238 scr_change_screen (state); 4195 scr_change_screen (state);
3239 break; 4196 break;
3240 /* case 66: - application key pad */ 4197 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4198 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4199 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4201 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4202 break;
3246#if 0 4203#if 0
3247 case 1001: 4204 case 1001:
3248 break; /* X11 mouse highlighting */ 4205 break; /* X11 mouse highlighting */
3249#endif 4206#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4207 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state)
3252 Options &= ~Opt_scrollTtyOutput;
3253 else
3254 Options |= Opt_scrollTtyOutput; 4208 set_option (Opt_scrollTtyOutput, !state);
3255 break; 4209 break;
3256 case 1011: /* scroll to bottom on key press */ 4210 case 1011: /* scroll to bottom on key press */
3257 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4211 set_option (Opt_scrollTtyKeypress, state);
3259 else
3260 Options &= ~Opt_scrollTtyKeypress;
3261 break; 4212 break;
3262 case 1047: /* secondary screen w/ clearing */ 4213 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4214 if (OPTION (Opt_secondaryScreen))
3264 if (current_screen != PRIMARY) 4215 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4216 scr_erase_screen (2);
3266 scr_change_screen (state); 4217 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4218 break;
4219 case 1049: /* secondary screen w/ clearing first */
4220 scr_change_screen (state);
4221 if (OPTION (Opt_secondaryScreen))
4222 if (current_screen != PRIMARY)
4223 scr_erase_screen (2);
4224 break;
4225 default:
4226 break;
3270 } 4227 }
3271 } 4228 }
3272} 4229}
3273/*}}} */ 4230/*}}} */
3274 4231
3275/*{{{ process sgr sequences */ 4232/*{{{ process sgr sequences */
3276void 4233void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4234rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4235{
3279 unsigned int i; 4236 unsigned int i;
3280 short rendset; 4237 short rendset;
3281 int rendstyle; 4238 int rendstyle;
3282 4239
3283 if (nargs == 0) 4240 if (nargs == 0)
3284 { 4241 {
3285 scr_rendition (0, ~RS_None); 4242 scr_rendition (0, ~RS_None);
3286 return; 4243 return;
3287 } 4244 }
4245
3288 for (i = 0; i < nargs; i++) 4246 for (i = 0; i < nargs; i++)
3289 { 4247 {
3290 rendset = -1; 4248 rendset = -1;
3291 switch (arg[i]) 4249 switch (arg[i])
3292 { 4250 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4252 rendset = 0, rendstyle = ~RS_None;
3295 break; 4253 break;
3296 case 1: 4254 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4255 rendset = 1, rendstyle = RS_Bold;
3298 break; 4256 break;
4257 //case 2: // low intensity
4258 case 3:
4259 rendset = 1, rendstyle = RS_Italic;
4260 break;
3299 case 4: 4261 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4262 rendset = 1, rendstyle = RS_Uline;
3301 break; 4263 break;
3302 case 5: 4264 case 5: // slowly blinking
4265 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4266 rendset = 1, rendstyle = RS_Blink;
3304 break; 4267 break;
4268 //case 6: // scoansi light background
3305 case 7: 4269 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4270 rendset = 1, rendstyle = RS_RVid;
3307 break; 4271 break;
3308 case 22: 4272 case 8:
4273 // invisible. NYI
4274 break;
4275 //case 9: // crossed out
4276 //case 10: // scoansi acs off, primary font
4277 //case 11: // scoansi acs on, first alt font
4278 //case 12: // scoansi acs on, |0x80, second alt font
4279 //...
4280 //case 19: // ninth alt font
4281 //case 20: // gothic
4282 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4283 rendset = 0, rendstyle = RS_Bold;
4284 break;
4285 case 22: // normal intensity
4286 rendset = 0, rendstyle = RS_Bold;
4287 break;
4288 case 23: // disable italic
4289 rendset = 0, rendstyle = RS_Italic;
3310 break; 4290 break;
3311 case 24: 4291 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4292 rendset = 0, rendstyle = RS_Uline;
3313 break; 4293 break;
3314 case 25: 4294 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4295 rendset = 0, rendstyle = RS_Blink;
3316 break; 4296 break;
4297 case 26: // variable spacing (iso 8613)
4298 rendset = 0, rendstyle = RS_Blink;
4299 break;
3317 case 27: 4300 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4301 rendset = 0, rendstyle = RS_RVid;
3319 break; 4302 break;
4303 //case 28: // visible. NYI
4304 //case 29: // not crossed-out
3320 } 4305 }
4306
3321 if (rendset != -1) 4307 if (rendset != -1)
3322 { 4308 {
3323 scr_rendition (rendset, rendstyle); 4309 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4310 continue; /* for (;i;) */
3325 } 4311 }
… …
3332 case 33: 4318 case 33:
3333 case 34: 4319 case 34:
3334 case 35: 4320 case 35:
3335 case 36: 4321 case 36:
3336 case 37: 4322 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4323 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4324 break;
3340#ifdef TTY_256COLOR 4325 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4326 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4327 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4328 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4329 i += 2;
3347 } 4330 }
3348 break; 4331 break;
3349#endif
3350 case 39: /* default fg */ 4332 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4333 scr_color (Color_fg, Color_fg);
3352 break; 4334 break;
3353 4335
3354 case 40: 4336 case 40:
… …
3357 case 43: 4339 case 43:
3358 case 44: 4340 case 44:
3359 case 45: 4341 case 45:
3360 case 46: 4342 case 46:
3361 case 47: 4343 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4344 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4345 break;
3365#ifdef TTY_256COLOR 4346 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4347 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4348 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4350 i += 2;
3372 } 4351 }
3373 break; 4352 break;
3374#endif
3375 case 49: /* default bg */ 4353 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4354 scr_color (Color_bg, Color_bg);
3377 break; 4355 break;
3378 4356
3379#ifndef NO_BRIGHTCOLOR 4357 //case 50: // not variable spacing
4358
4359#if !ENABLE_MINIMAL
3380 case 90: 4360 case 90:
3381 case 91: /* set bright fg color */ 4361 case 91: /* set bright fg color */
3382 case 92: 4362 case 92:
3383 case 93: 4363 case 93:
3384 case 94: 4364 case 94:
3385 case 95: 4365 case 95:
3386 case 96: 4366 case 96:
3387 case 97: 4367 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4368 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4369 break;
3391 case 100: 4370 case 100:
3392 case 101: /* set bright bg color */ 4371 case 101: /* set bright bg color */
3393 case 102: 4372 case 102:
3394 case 103: 4373 case 103:
3395 case 104: 4374 case 104:
3396 case 105: 4375 case 105:
3397 case 106: 4376 case 106:
3398 case 107: 4377 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4378 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4379 break;
3402#endif 4380#endif
3403
3404 } 4381 }
3405 } 4382 }
3406} 4383}
3407/*}}} */ 4384/*}}} */
3408 4385
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4386/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4387void
3411rxvt_term::process_graphics () 4388rxvt_term::process_graphics ()
3412{ 4389{
3413 unsigned char ch, cmd = cmd_getc (); 4390 unicode_t ch, cmd = cmd_getc ();
3414 4391
3415 if (cmd == 'Q') 4392 if (cmd == 'Q')
3416 { /* query graphics */ 4393 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4394 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4395 return;
3419 } 4396 }
3420 /* swallow other graphics sequences until terminating ':' */ 4397 /* swallow other graphics sequences until terminating ':' */
3421 do 4398 do
3422 ch = cmd_getc (); 4399 ch = cmd_getc ();
… …
3432 */ 4409 */
3433void 4410void
3434rxvt_term::tt_printf (const char *fmt,...) 4411rxvt_term::tt_printf (const char *fmt,...)
3435{ 4412{
3436 va_list arg_ptr; 4413 va_list arg_ptr;
3437 unsigned char buf[256]; 4414 char buf[256];
3438 4415
3439 va_start (arg_ptr, fmt); 4416 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4417 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4418 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4419 tt_write (buf, strlen (buf));
3443} 4420}
3444 4421
3445/* ---------------------------------------------------------------------- */ 4422/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4423/* 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. 4424 * or generated by us in response to a query ESC sequence.
3448 */ 4425 */
4426const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4427
3449void 4428void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4429rxvt_term::tt_write (const char *data, unsigned int len)
3451{ 4430{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4431 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4432 return;
3453 4433
3454 if (len) 4434 if (pty->pty < 0)
4435 return;
4436
4437 if (v_buflen == 0)
4438 {
4439 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4440
4441 if ((unsigned int)written == len)
4442 return;
4443
4444 data += written;
4445 len -= written;
3455 { 4446 }
4447
4448 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4449
4450 memcpy (v_buffer + v_buflen, data, len);
4451 v_buflen += len;
4452
4453 pty_ev.set (EVENT_READ | EVENT_WRITE);
4454}
4455
4456void rxvt_term::pty_write ()
4457{
4458 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4459
4460 if (written > 0)
4461 {
4462 v_buflen -= written;
4463
3456 if (v_buflen == 0) 4464 if (v_buflen == 0)
3457 { 4465 {
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); 4466 free (v_buffer);
3485 v_buffer = 0; 4467 v_buffer = 0;
3486 v_buflen = 0; 4468 v_buflen = 0;
3487 4469
3488 pty_ev.set (EVENT_READ); 4470 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; 4471 return;
3501 } 4472 }
4473
4474 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4475 }
4476 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4477 pty_ev.set (EVENT_READ);
3503} 4478}
3504 4479
3505/*----------------------- end-of-file (C source) -----------------------*/ 4480/*----------------------- end-of-file (C source) -----------------------*/
3506 4481

Diff Legend

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