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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.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 {
145 /* for some backwards compatibility */ 396#ifdef KEYSYM_RESOURCE
146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 397 if (keyboard->dispatch (this, keysym, ev.state))
147# ifdef HOTKEY_CTRL 398 return;
148 if (ctrl)
149# else
150 if (meta)
151# endif 399#endif
152 {
153 if (keysym == ks_bigfont)
154 {
155 change_font (FONT_UP);
156 return;
157 }
158 else if (keysym == ks_smallfont)
159 {
160 change_font (FONT_DN);
161 return;
162 }
163 }
164#endif
165 400
166 if (TermWin.saveLines) 401 if (saveLines)
167 { 402 {
168#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
169 if (!ctrl && !meta) 404 if (!ctrl && !meta)
170 {
171#else 405#else
172 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
173 { 408 {
174#endif
175 int lnsppg; 409 int lnsppg;
176 410
177#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
179#else 413#else
180 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
181#endif 415#endif
182 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
183 { 417 {
184 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
185 return; 419 return;
… …
213 scr_move_to (0, 1); 447 scr_move_to (0, 1);
214 return; 448 return;
215 } 449 }
216 else if (keysym == XK_End) 450 else if (keysym == XK_End)
217 { 451 {
218 scr_move_to (1, 0); 452 scr_move_to (1, 1);
219 return; 453 return;
220 } 454 }
221 } 455 }
222#endif 456#endif
223 } 457 }
… …
228 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
229 { 463 {
230 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
231 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
232 } 466 }
233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
234 { 468 {
235 switch (keysym) 469 switch (keysym)
236 { 470 {
237 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
238 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
239 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
240 return; 474 return;
475#if TODO
241 /* rxvt extras */ 476 /* rxvt extras */
242 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
243 change_font (FONT_UP); 478 change_font (FONT_UP);
244 return; 479 return;
245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
246 change_font (FONT_DN); 481 change_font (FONT_DN);
247 return; 482 return;
483#endif
248 } 484 }
249 } 485 }
250 } 486 }
251#ifdef PRINTPIPE 487
252 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
253 { 489 // ISO 14755 support
254 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
255 return;
256 } 491 {
257#endif 492 int hv;
258 493
259 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
260 { 495 && (keysym == XK_space || keysym == XK_KP_Space
261#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
263 { 497 {
264 unsigned int l; 498 commit_iso14755 ();
265 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
266 const unsigned char ch = C0_ESC; 500# if ISO_14755
267 501 iso14755_51 (0);
268 kbuf0 = (Keysym_map[keysym & 0xFF]);
269 l = (unsigned int)*kbuf0++;
270
271 /* escape prefix */
272 if (meta)
273# ifdef META8_OPTION
274 if (meta_char == C0_ESC)
275# endif 502# endif
276 tt_write (&ch, 1); 503 return;
277 tt_write (kbuf0, l); 504 }
505 else if ((hv = hex_keyval (ev)) >= 0)
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
278 return; 512 return;
279 } 513 }
280 else 514 else
515 {
516# if ENABLE_OVERLAY
517 scr_overlay_off ();
281#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 {
282 { 544 {
283 newlen = 1; 545 newlen = 1;
284 switch (keysym) 546 switch (keysym)
285 { 547 {
286#ifndef NO_BACKSPACE_KEY 548#ifndef NO_BACKSPACE_KEY
287 case XK_BackSpace: 549 case XK_BackSpace:
288 if (PrivateModes & PrivMode_HaveBackSpace) 550 if (priv_modes & PrivMode_HaveBackSpace)
289 { 551 {
290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
291 ^ !!ctrl) ? '\b' : '\177'; 553 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 554 kbuf[1] = '\0';
293 } 555 }
294 else 556 else
295 STRCPY (kbuf, key_backspace); 557 strcpy (kbuf, key_backspace);
296 break; 558 break;
297#endif 559#endif
298#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
299 case XK_Delete: 571 case XK_Delete:
300 STRCPY (kbuf, key_delete); 572 strcpy (kbuf, key_delete);
301 break; 573 break;
302#endif 574#endif
303 case XK_Tab: 575 case XK_Tab:
304 if (shft) 576 if (shft)
305 STRCPY (kbuf, "\033[Z"); 577 strcpy (kbuf, "\033[Z");
306 else 578 else
307 { 579 {
308#ifdef CTRL_TAB_MAKES_META 580#ifdef CTRL_TAB_MAKES_META
309 if (ctrl) 581 if (ctrl)
310 meta = 1; 582 meta = 1;
… …
316 newlen = 0; 588 newlen = 0;
317 } 589 }
318 break; 590 break;
319 591
320#ifdef XK_KP_Left 592#ifdef XK_KP_Left
321 case XK_KP_Up: /* \033Ox or standard */ 593 case XK_KP_Up: /* \033Ox or standard */
322 case XK_KP_Down: /* \033Or or standard */ 594 case XK_KP_Down: /* \033Or or standard */
323 case XK_KP_Right: /* \033Ov or standard */ 595 case XK_KP_Right: /* \033Ov or standard */
324 case XK_KP_Left: /* \033Ot or standard */ 596 case XK_KP_Left: /* \033Ot or standard */
325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
326 { 598 {
327 STRCPY (kbuf, "\033OZ"); 599 strcpy (kbuf, "\033OZ");
328 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
329 break; 601 break;
330 } 602 }
331 else 603 else
332 /* translate to std. cursor key */ 604 /* translate to std. cursor key */
… …
335#endif 607#endif
336 case XK_Up: /* "\033[A" */ 608 case XK_Up: /* "\033[A" */
337 case XK_Down: /* "\033[B" */ 609 case XK_Down: /* "\033[B" */
338 case XK_Right: /* "\033[C" */ 610 case XK_Right: /* "\033[C" */
339 case XK_Left: /* "\033[D" */ 611 case XK_Left: /* "\033[D" */
340 STRCPY (kbuf, "\033[Z"); 612 strcpy (kbuf, "\033[Z");
341 kbuf[2] = "DACB"[keysym - XK_Left]; 613 kbuf[2] = "DACB"[keysym - XK_Left];
342 /* do Shift first */ 614 /* do Shift first */
343 if (shft) 615 if (shft)
344 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
345 else if (ctrl) 617 else if (ctrl)
346 { 618 {
347 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
348 kbuf[2] = "dacb"[keysym - XK_Left]; 620 kbuf[2] = "dacb"[keysym - XK_Left];
349 } 621 }
350 else if (PrivateModes & PrivMode_aplCUR) 622 else if (priv_modes & PrivMode_aplCUR)
351 kbuf[1] = 'O'; 623 kbuf[1] = 'O';
352 break; 624 break;
353 625
354#ifndef UNSHIFTED_SCROLLKEYS 626#ifndef UNSHIFTED_SCROLLKEYS
355# ifdef XK_KP_Prior 627# ifdef XK_KP_Prior
356 case XK_KP_Prior: 628 case XK_KP_Prior:
357 /* allow shift to override */ 629 /* allow shift to override */
358 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
359 { 631 {
360 STRCPY (kbuf, "\033Oy"); 632 strcpy (kbuf, "\033Oy");
361 break; 633 break;
362 } 634 }
363 /* FALLTHROUGH */ 635 /* FALLTHROUGH */
364# endif 636# endif
365 case XK_Prior: 637 case XK_Prior:
366 STRCPY (kbuf, "\033[5~"); 638 strcpy (kbuf, "\033[5~");
367 break; 639 break;
368# ifdef XK_KP_Next 640# ifdef XK_KP_Next
369 case XK_KP_Next: 641 case XK_KP_Next:
370 /* allow shift to override */ 642 /* allow shift to override */
371 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
372 { 644 {
373 STRCPY (kbuf, "\033Os"); 645 strcpy (kbuf, "\033Os");
374 break; 646 break;
375 } 647 }
376 /* FALLTHROUGH */ 648 /* FALLTHROUGH */
377# endif 649# endif
378 case XK_Next: 650 case XK_Next:
379 STRCPY (kbuf, "\033[6~"); 651 strcpy (kbuf, "\033[6~");
380 break; 652 break;
381#endif 653#endif
382 case XK_KP_Enter: 654 case XK_KP_Enter:
383 /* allow shift to override */ 655 /* allow shift to override */
384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
385 { 657 {
386 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';
387 } 670 }
388 else 671 else
389 { 672 {
390 kbuf[0] = '\r'; 673 kbuf[0] = '\015';
391 kbuf[1] = '\0'; 674 kbuf[1] = '\0';
392 } 675 }
393 break; 676 break;
394 677
395#ifdef XK_KP_Begin 678#ifdef XK_KP_Begin
396 case XK_KP_Begin: 679 case XK_KP_Begin:
397 STRCPY (kbuf, "\033Ou"); 680 strcpy (kbuf, "\033Ou");
398 break; 681 break;
399 682
400 case XK_KP_Insert:
401 STRCPY (kbuf, "\033Op");
402 break;
403
404 case XK_KP_Delete:
405 STRCPY (kbuf, "\033On");
406 break;
407#endif 683#endif
408 case XK_KP_F1: /* "\033OP" */ 684 case XK_KP_F1: /* "\033OP" */
409 case XK_KP_F2: /* "\033OQ" */ 685 case XK_KP_F2: /* "\033OQ" */
410 case XK_KP_F3: /* "\033OR" */ 686 case XK_KP_F3: /* "\033OR" */
411 case XK_KP_F4: /* "\033OS" */ 687 case XK_KP_F4: /* "\033OS" */
412 STRCPY (kbuf, "\033OP"); 688 strcpy (kbuf, "\033OP");
413 kbuf[2] += (keysym - XK_KP_F1); 689 kbuf[2] += (keysym - XK_KP_F1);
414 break; 690 break;
415 691
416 case XK_KP_Multiply: /* "\033Oj" : "*" */ 692 case XK_KP_Multiply: /* "\033Oj" : "*" */
417 case XK_KP_Add: /* "\033Ok" : "+" */ 693 case XK_KP_Add: /* "\033Ok" : "+" */
… …
428 case XK_KP_6: /* "\033Ov" : "6" */ 704 case XK_KP_6: /* "\033Ov" : "6" */
429 case XK_KP_7: /* "\033Ow" : "7" */ 705 case XK_KP_7: /* "\033Ow" : "7" */
430 case XK_KP_8: /* "\033Ox" : "8" */ 706 case XK_KP_8: /* "\033Ox" : "8" */
431 case XK_KP_9: /* "\033Oy" : "9" */ 707 case XK_KP_9: /* "\033Oy" : "9" */
432 /* allow shift to override */ 708 /* allow shift to override */
433 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
434 { 710 {
435 STRCPY (kbuf, "\033Oj"); 711 strcpy (kbuf, "\033Oj");
436 kbuf[2] += (keysym - XK_KP_Multiply); 712 kbuf[2] += (keysym - XK_KP_Multiply);
437 } 713 }
438 else 714 else
439 { 715 {
440 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
441 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
442 } 718 }
443 break; 719 break;
444 720
445 case XK_Find: 721 case XK_Find:
446 STRCPY (kbuf, "\033[1~"); 722 strcpy (kbuf, "\033[1~");
447 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
448 case XK_Insert: 735 case XK_Insert:
449 STRCPY (kbuf, "\033[2~"); 736 strcpy (kbuf, "\033[2~");
450 break; 737 break;
451#ifdef DXK_Remove /* support for DEC remove like key */ 738#ifdef DXK_Remove /* support for DEC remove like key */
452 case DXK_Remove: 739 case DXK_Remove:
453 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
454#endif 741#endif
455 case XK_Execute: 742 case XK_Execute:
456 STRCPY (kbuf, "\033[3~"); 743 strcpy (kbuf, "\033[3~");
457 break; 744 break;
458 case XK_Select: 745 case XK_Select:
459 STRCPY (kbuf, "\033[4~"); 746 strcpy (kbuf, "\033[4~");
460 break; 747 break;
461#ifdef XK_KP_End 748#ifdef XK_KP_End
462 case XK_KP_End: 749 case XK_KP_End:
463 /* allow shift to override */ 750 /* allow shift to override */
464 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
465 { 752 {
466 STRCPY (kbuf, "\033Oq"); 753 strcpy (kbuf, "\033Oq");
467 break; 754 break;
468 } 755 }
469 /* FALLTHROUGH */ 756 /* FALLTHROUGH */
470#endif 757#endif
471 case XK_End: 758 case XK_End:
472 STRCPY (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
473 break; 760 break;
474#ifdef XK_KP_Home 761#ifdef XK_KP_Home
475 case XK_KP_Home: 762 case XK_KP_Home:
476 /* allow shift to override */ 763 /* allow shift to override */
477 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
478 { 765 {
479 STRCPY (kbuf, "\033Ow"); 766 strcpy (kbuf, "\033Ow");
480 break; 767 break;
481 } 768 }
482 /* FALLTHROUGH */ 769 /* FALLTHROUGH */
483#endif 770#endif
484 case XK_Home: 771 case XK_Home:
485 STRCPY (kbuf, KS_HOME); 772 strcpy (kbuf, KS_HOME);
486 break; 773 break;
487 774
488#define FKEY(n, fkey) \ 775#define FKEY(n, fkey) \
489 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
490 777
… …
542#undef FKEY 829#undef FKEY
543 default: 830 default:
544 newlen = 0; 831 newlen = 0;
545 break; 832 break;
546 } 833 }
834
547 if (newlen) 835 if (newlen)
548 len = STRLEN (kbuf); 836 len = strlen (kbuf);
549 } 837 }
838
550 /* 839 /*
551 * Pass meta for all function keys, if 'meta' option set 840 * Pass meta for all function keys, if 'meta' option set
552 */ 841 */
553#ifdef META8_OPTION 842#ifdef META8_OPTION
554 if (meta && (meta_char == 0x80) && len > 0) 843 if (meta && (meta_char == 0x80) && len > 0)
… …
559 else if (ctrl && keysym == XK_minus) 848 else if (ctrl && keysym == XK_minus)
560 { 849 {
561 len = 1; 850 len = 1;
562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 851 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
563 } 852 }
853 else if (keysym == XK_ISO_Left_Tab)
854 {
855 strcpy (kbuf, "\033[Z");
856 len = 3;
857 }
564 else 858 else
565 { 859 {
566#ifdef META8_OPTION 860#ifdef META8_OPTION
567 /* set 8-bit on */ 861 /* set 8-bit on */
568 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
569 { 863 {
570 unsigned char *ch; 864 char *ch;
571 865
572 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
573 *ch |= 0x80; 867 *ch |= 0x80;
868
574 meta = 0; 869 meta = 0;
575 } 870 }
576#endif 871#endif
577 /* nil */ ; 872 /* nil */ ;
578 } 873 }
579 } 874 }
580 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
581 if (len <= 0) 879 if (len <= 0)
582 return; /* not mapped */ 880 return; /* not mapped */
583 881
584 if (Options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
585 if (TermWin.view_start) 883 if (view_start)
586 { 884 {
587 TermWin.view_start = 0; 885 view_start = 0;
588 want_refresh = 1; 886 want_refresh = 1;
589 } 887 }
590 888
591 /* 889 /*
592 * these modifications only affect the static keybuffer 890 * these modifications only affect the static keybuffer
… …
607#ifdef META8_OPTION 905#ifdef META8_OPTION
608 && meta_char == C0_ESC 906 && meta_char == C0_ESC
609#endif 907#endif
610 ) 908 )
611 { 909 {
612 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
613 tt_write (&ch, 1); 911 tt_write (&ch, 1);
614 } 912 }
615 913
616#if defined(DEBUG_CMD)
617 /* Display keyboard buffer contents */
618 unsigned char *p;
619 int i;
620
621 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
622 for (i = 0, p = kbuf; i < len; i++, p++)
623 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
624 fprintf (stderr, "'\n");
625#endif /* DEBUG_CMD */
626 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
627} 915}
628/*}}} */
629 916
630#if (MENUBAR_MAX) 917void
631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 918rxvt_term::key_release (XKeyEvent &ev)
632/* 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)
633unsigned int 995unsigned int
634rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
635{ 997{
636 unsigned int n, s; 998 unsigned int n, s;
637 999
638 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
640 1002
641 if (n > 0 && s < count) 1003 if (n > 0 && s < count)
642 { 1004 {
643 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1005 memmove (cmdbuf_base, cmdbuf_ptr,
644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
645 cmdbuf_ptr = cmdbuf_base; 1007 cmdbuf_ptr = cmdbuf_base;
646 cmdbuf_endp -= n; 1008 cmdbuf_endp -= n;
647 s += n; 1009 s += n;
648 } 1010 }
649 1011
650 if (count > s) 1012 if (count > s)
651 { 1013 {
652 rxvt_print_error ("data loss: cmd_write too large"); 1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
653 count = s; 1015 count = s;
654 } 1016 }
655 1017
656 for (; count--;) 1018 for (; count--;)
657 *cmdbuf_endp++ = *str++; 1019 *cmdbuf_endp++ = *str++;
658 1020
659 cmd_parse (); 1021 cmd_parse ();
660 1022
661 return 0; 1023 return 0;
662} 1024}
663#endif /* MENUBAR_MAX */ 1025#endif
664 1026
665void 1027void
666rxvt_term::flush () 1028rxvt_term::flush ()
667{ 1029{
1030 flush_ev.stop ();
1031
668#ifdef TRANSPARENT 1032#ifdef TRANSPARENT
669 if (want_full_refresh) 1033 if (want_full_refresh)
670 { 1034 {
671 want_full_refresh = 0; 1035 want_full_refresh = 0;
672 scr_clear (); 1036 scr_clear ();
673 scr_touch (false); 1037 scr_touch (false);
674 want_refresh = 1;
675 } 1038 }
676#endif 1039#endif
677 1040
678 if (want_refresh) 1041 if (want_refresh)
679 { 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
680 scr_refresh (refresh_type); 1081 scr_refresh ();
681 scrollbar_show (1); 1082 scrollbar_show (1);
682#ifdef USE_XIM 1083#ifdef USE_XIM
683 IMSendSpot (); 1084 IMSendSpot ();
684#endif 1085#endif
685
686 } 1086 }
687 1087
688 display->flush (); 1088 display->flush ();
689} 1089}
690 1090
691void 1091void
692rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
693{ 1093{
694 SET_R (this); 1094 make_current ();
695 SET_LOCALE (locale);
696 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;
697 flush (); 1109 flush ();
698} 1110}
699 1111
700#ifdef CURSOR_BLINK 1112#ifdef CURSOR_BLINK
701void 1113void
702rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
703{ 1115{
704 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
705 want_refresh = 1; 1117 want_refresh = 1;
706 1118
707 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
708} 1120}
709#endif 1121#endif
710 1122
711#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
712void 1124void
… …
719 w.start (w.at + TEXT_BLINK_INTERVAL); 1131 w.start (w.at + TEXT_BLINK_INTERVAL);
720 } 1132 }
721} 1133}
722#endif 1134#endif
723 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
724bool 1204bool
725rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
726{ 1206{
727 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 }
728 1214
729 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
730 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
731 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
732 1218
733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
734 1220
735 if (n > 0) 1221 if (r > 0)
736 { 1222 {
737 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
738 return true; 1224 return true;
739 } 1225 }
740 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))
741 destroy (); 1238 destroy ();
1239 }
742 1240
743 return false; 1241 return false;
744} 1242}
745 1243
746void 1244void
747rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
748{ 1246{
749 SET_R (this); 1247 make_current ();
750 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;
751 1254
752 if (revents & EVENT_WRITE) 1255 if (revents & EVENT_WRITE)
753 tt_write (0, 0); 1256 pty_write ();
754 else if (revents & EVENT_READ)
755 {
756 bool flag = true;
757
758 // loop, but don't allow a single term to monopolize us
759 // the number of loops is fully arbitrary, and thus wrong
760 while (flag && pty_fill ())
761 {
762 if (!seen_input)
763 {
764 seen_input = 1;
765 /* once we know the shell is running, send the screen size. Again! */
766 tt_winch ();
767 }
768
769 if (cmd_parse ())
770 break;
771 }
772 }
773} 1257}
774 1258
775bool 1259void
776rxvt_term::cmd_parse () 1260rxvt_term::pointer_unblank ()
777{ 1261{
778 bool flag = false; 1262 XDefineCursor (dpy, vt, TermWin_cursor);
779 uint32_t ch = NOCHAR; 1263 recolour_cursor ();
780 1264
781 for (;;) 1265#ifdef POINTER_BLANK
782 { 1266 hidden_pointer = 0;
783 if (ch == NOCHAR)
784 ch = next_char ();
785 1267
786 if (ch == NOCHAR) // TODO: improve 1268 if (OPTION (Opt_pointerBlank))
787 break; 1269 pointer_ev.start (NOW + pointerBlankDelay);
788 1270#endif
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
798
799 for (;;)
800 {
801 ch = next_char ();
802
803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
804 break;
805 else
806 {
807 *str++ = ch;
808
809 if (ch == '\n')
810 {
811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
816 {
817 refreshnow = true;
818 flag = false;
819 ch = NOCHAR;
820 break;
821 }
822
823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
824 if (nlines >= TermWin.nrow - 1)
825 {
826 scr_add_lines (buf, nlines, str - buf);
827 nlines = 0;
828 str = buf;
829 }
830 }
831
832 if (str >= buf + BUFSIZ)
833 {
834 ch = NOCHAR;
835 break;
836 }
837 }
838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
876 }
877
878 return flag;
879}
880
881// read the next character, currently handles UTF-8
882// will probably handle all sorts of other stuff in the future
883uint32_t
884rxvt_term::next_char ()
885{
886 while (cmdbuf_ptr < cmdbuf_endp)
887 {
888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
890 || !*cmdbuf_ptr)
891 return *cmdbuf_ptr++;
892
893 wchar_t wc;
894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
895
896 if (len == (size_t)-2)
897 {
898 // the mbstate stores incomplete sequences. didn't know this :/
899 cmdbuf_ptr = cmdbuf_endp;
900 break;
901 }
902
903 if (len == (size_t)-1)
904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
905
906 // assume wchar == unicode
907 cmdbuf_ptr += len;
908 return wc;
909 }
910
911 return NOCHAR;
912}
913
914/* rxvt_cmd_getc () - Return next input character */
915/*
916 * Return the next input character after first passing any keyboard input
917 * to the command.
918 */
919uint32_t
920rxvt_term::cmd_getc ()
921{
922 for (;;)
923 {
924 uint32_t c = next_char ();
925 if (c != NOCHAR)
926 return c;
927
928 // incomplete sequences should occur rarely, still, a better solution
929 // would be preferred. either setjmp/longjmp or better design.
930 fcntl (cmd_fd, F_SETFL, 0);
931 pty_fill ();
932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
933 }
934} 1271}
935 1272
936#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
937void 1274void
938rxvt_term::pointer_unblank ()
939{
940 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
941 recolour_cursor ();
942
943 hidden_pointer = 0;
944
945 if (Options & Opt_pointerBlank)
946 pointer_ev.start (NOW + pointerBlankDelay);
947}
948
949void
950rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
951{ 1276{
952 if (! (Options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
953 return; 1278 return;
954 1279
955 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
956 XFlush (display->display); 1281 XFlush (dpy);
957 1282
958 hidden_pointer = 1; 1283 hidden_pointer = 1;
959} 1284}
960 1285
961void 1286void
962rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
963{ 1288{
964 SET_R (this); 1289 make_current ();
965 SET_LOCALE (locale);
966 1290
967 pointer_blank (); 1291 pointer_blank ();
968} 1292}
969#endif 1293#endif
970 1294
… …
977 x = ev.x; 1301 x = ev.x;
978 y = ev.y; 1302 y = ev.y;
979 pixel_position (&x, &y); 1303 pixel_position (&x, &y);
980 1304
981 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
982 {
983 button_number = 3; 1306 button_number = 3;
984 }
985 else 1307 else
986 { 1308 {
987 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
988 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
989 if (button_number >= 3) 1311 if (button_number >= 3)
990 button_number += (64 - 3); 1312 button_number += (64 - 3);
991 } 1313 }
992 1314
993 if (PrivateModes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
994 { 1316 {
995 /* 1317 /*
996 * do not report ButtonRelease 1318 * do not report ButtonRelease
997 * no state info allowed 1319 * no state info allowed
998 */ 1320 */
… …
1013 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1335 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1014 + ((MEvent.state & ControlMask) ? 16 : 0); 1336 + ((MEvent.state & ControlMask) ? 16 : 0);
1015#ifdef MOUSE_REPORT_DOUBLECLICK 1337#ifdef MOUSE_REPORT_DOUBLECLICK
1016 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1338 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1017#endif 1339#endif
1018
1019 } 1340 }
1020 1341
1021#ifdef DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1022 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1023 if (key_state & 16) 1344 if (key_state & 16)
1024 fputc ('C', stderr); 1345 fputc ('C', stderr);
1025 if (key_state & 4) 1346 if (key_state & 4)
1026 fputc ('S', stderr); 1347 fputc ('S', stderr);
… …
1030 fputc ('2', stderr); 1351 fputc ('2', stderr);
1031 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1032 button_number, 1353 button_number,
1033 x + 1, 1354 x + 1,
1034 y + 1); 1355 y + 1);
1035#else 1356#endif
1357
1036 tt_printf ("\033[M%c%c%c", 1358 tt_printf ("\033[M%c%c%c",
1037 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1038 (32 + x + 1), 1360 (32 + x + 1),
1039 (32 + y + 1)); 1361 (32 + y + 1));
1040#endif
1041} 1362}
1042
1043#ifdef USING_W11LIB
1044void
1045rxvt_W11_process_x_event (XEvent *ev)
1046{
1047 rxvt_t *r = rxvt_get_r ();
1048
1049 x_cb (*ev);
1050}
1051#endif
1052 1363
1053/*{{{ process an X event */ 1364/*{{{ process an X event */
1054void 1365void
1055rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1056{ 1367{
1057 SET_R (this); 1368 make_current ();
1058 SET_LOCALE (locale);
1059 1369
1060#if defined(CURSOR_BLINK) 1370 dLocal (Display *, dpy);
1061 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1062 {
1063 if (hidden_cursor)
1064 {
1065 hidden_cursor = 0;
1066 want_refresh = 1;
1067 }
1068 1371
1069 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1372 if (ev.xany.window == vt
1070 } 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1071#endif 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1072
1073#if defined(POINTER_BLANK)
1074 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1075 {
1076 if (ev.type == MotionNotify
1077 || ev.type == ButtonPress
1078 || ev.type == ButtonRelease)
1079 if (hidden_pointer)
1080 pointer_unblank ();
1081
1082 if (ev.type == KeyPress && hidden_pointer == 0)
1083 pointer_blank ();
1084 }
1085#endif
1086
1087#ifdef USE_XIM
1088 if (XFilterEvent (&ev, None))
1089 return; 1375 return;
1090#endif
1091 1376
1377 // for XQueryPointer
1092 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1093 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1094 unsigned int unused_mask; 1380 unsigned int unused_mask;
1095
1096#ifdef DEBUG_X
1097 const char *const eventnames[] =
1098 { /* mason - this matches my system */
1099 "",
1100 "",
1101 "KeyPress",
1102 "KeyRelease",
1103 "ButtonPress",
1104 "ButtonRelease",
1105 "MotionNotify",
1106 "EnterNotify",
1107 "LeaveNotify",
1108 "FocusIn",
1109 "FocusOut",
1110 "KeymapNotify",
1111 "Expose",
1112 "GraphicsExpose",
1113 "NoExpose",
1114 "VisibilityNotify",
1115 "CreateNotify",
1116 "DestroyNotify",
1117 "UnmapNotify",
1118 "MapNotify",
1119 "MapRequest",
1120 "ReparentNotify",
1121 "ConfigureNotify",
1122 "ConfigureRequest",
1123 "GravityNotify",
1124 "ResizeRequest",
1125 "CirculateNotify",
1126 "CirculateRequest",
1127 "PropertyNotify",
1128 "SelectionClear",
1129 "SelectionRequest",
1130 "SelectionNotify",
1131 "ColormapNotify",
1132 "ClientMessage",
1133 "MappingNotify"
1134 };
1135#endif
1136
1137#ifdef DEBUG_X
1138 struct timeval tp;
1139 struct tm *ltt;
1140 (void)gettimeofday (&tp, NULL);
1141 ltt = localtime (& (tp.tv_sec));
1142 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1143#endif
1144 1381
1145 switch (ev.type) 1382 switch (ev.type)
1146 { 1383 {
1147 case KeyPress: 1384 case KeyPress:
1148 lookup_key (ev.xkey); 1385 key_press (ev.xkey);
1149 break; 1386 break;
1150 1387
1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1152 case KeyRelease: 1388 case KeyRelease:
1153 { 1389 key_release (ev.xkey);
1154 if (! (ev.xkey.state & ControlMask))
1155 mouse_slip_wheel_speed = 0;
1156 else
1157 {
1158 KeySym ks;
1159
1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1161 if (ks == XK_Control_L || ks == XK_Control_R)
1162 mouse_slip_wheel_speed = 0;
1163 }
1164 break; 1390 break;
1165 }
1166#endif
1167 1391
1168 case ButtonPress: 1392 case ButtonPress:
1169 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1170 break; 1394 break;
1171 1395
… …
1173 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1174 break; 1398 break;
1175 1399
1176 case ClientMessage: 1400 case ClientMessage:
1177 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1178 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1179 destroy ();
1180#ifdef OFFIX_DND
1181 /* OffiX Dnd (drag 'n' drop) protocol */
1182 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1183 && (ev.xclient.data.l[0] == DndFile
1184 || ev.xclient.data.l[0] == DndDir
1185 || ev.xclient.data.l[0] == DndLink))
1186 { 1403 {
1187 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1188 Atom ActualType; 1405 {
1189 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1190 unsigned char *data; 1407 {
1191 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1192 1409 {
1193 XGetWindowProperty (display->display, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1194 xa[XA_DNDSELECTION], 1411 destroy ();
1195 0L, 1000000L, 1412 }
1196 False, AnyPropertyType, 1413#if ENABLE_EWMH
1197 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1198 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1199 &data); 1417 &ev);
1200 XChangeProperty (display->display, display->root, 1418#endif
1201 XA_CUT_BUFFER0, XA_STRING, 1419 }
1202 8, PropModeReplace, 1420 }
1203 data, STRLEN (data)); 1421#if ENABLE_XEMBED
1204 selection_paste (display->root, XA_CUT_BUFFER0, True); 1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1205 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
1206 } 1430 }
1207#endif /* OFFIX_DND */
1208 break; 1431 break;
1209 1432
1210 case MappingNotify: 1433 case MappingNotify:
1211 XRefreshKeyboardMapping (& (ev.xmapping)); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1212 break; 1435 break;
1213 1436
1214 /* 1437 /*
1215 * XXX: this is not the _current_ arrangement 1438 * XXX: this is not the _current_ arrangement
1216 * Here's my conclusion: 1439 * Here's my conclusion:
… …
1235 break; 1458 break;
1236 } 1459 }
1237 break; 1460 break;
1238 1461
1239 case FocusIn: 1462 case FocusIn:
1240 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])
1241 { 1474 {
1242 TermWin.focus = 1; 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1243 want_refresh = 1; 1476 ;
1244#ifdef USE_XIM
1245 if (Input_Context != NULL)
1246 XSetICFocus (Input_Context);
1247#endif
1248#ifdef CURSOR_BLINK
1249 if (Options & Opt_cursorBlink)
1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1251#endif
1252 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
1253 } 1492 }
1254 break; 1493 break;
1255 1494
1256 case FocusOut:
1257 if (TermWin.focus)
1258 {
1259 TermWin.focus = 0;
1260 want_refresh = 1;
1261#ifdef USE_XIM
1262 if (Input_Context != NULL)
1263 XUnsetICFocus (Input_Context);
1264#endif
1265#ifdef CURSOR_BLINK
1266 if (Options & Opt_cursorBlink)
1267 cursor_blink_ev.stop ();
1268 hidden_cursor = 0;
1269#endif
1270
1271 }
1272 break;
1273
1274 case ConfigureNotify: 1495 case PropertyNotify:
1275 if (ev.xconfigure.window == TermWin.parent[0]) 1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1276 { 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1277 int height, width; 1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1278 1500
1279 do
1280 { /* Wrap lots of configures into one */
1281 width = ev.xconfigure.width;
1282 height = ev.xconfigure.height;
1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1284 }
1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286
1287 if (szHint.width != width || szHint.height != height)
1288 {
1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1290 resize_all_windows (width, height, 1);
1291 }
1292#ifdef DEBUG_SIZE
1293 else
1294 {
1295 D_SIZE ((stderr, "Size: Not resizing"));
1296 }
1297#endif
1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1299 if (Options & Opt_transparent)
1300 {
1301 check_our_parents ();
1302 if (am_transparent)
1303 want_full_refresh = 1;
1304 }
1305#endif
1306
1307 }
1308 break; 1501 break;
1309 1502
1310 case SelectionClear: 1503 case SelectionClear:
1311 display->set_selection_owner (0); 1504 selection_clear ();
1312 break; 1505 break;
1313 1506
1314 case SelectionNotify: 1507 case SelectionNotify:
1315 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1316 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1317 ev.xselection.property, True);
1318 break; 1510 break;
1319 1511
1320 case SelectionRequest: 1512 case SelectionRequest:
1321 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1322 break; 1514 break;
1323 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
1324 case UnmapNotify: 1524 case UnmapNotify:
1325 TermWin.mapped = 0; 1525 mapped = 0;
1326#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1327 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1328#endif 1528#endif
1329 break; 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1330
1331 case MapNotify:
1332 TermWin.mapped = 1;
1333#ifdef TEXT_BLINK
1334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1335#endif
1336 break; 1530 break;
1337 1531
1338#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1339 case ReparentNotify: 1533 case ReparentNotify:
1340 rootwin_cb (ev); 1534 rootwin_cb (ev);
1341 break; 1535 break;
1342#endif /* TRANSPARENT */ 1536#endif /* TRANSPARENT */
1343 1537
1344 case GraphicsExpose: 1538 case GraphicsExpose:
1345 case Expose: 1539 case Expose:
1346 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1347 { 1541 {
1348#ifdef NO_SLOW_LINK_SUPPORT 1542 do
1349 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1350 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, False);
1351#else 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1352 // 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))
1353 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1354 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1355 //scr_expose (ev.xexpose.x, 0, 1552
1356 // ev.xexpose.width, TermWin.height, False);
1357#endif
1358 want_refresh = 1; 1553 want_refresh = 1;
1359 } 1554 }
1360 else 1555 else
1361 { 1556 {
1362 XEvent unused_event; 1557 XEvent unused_event;
1363 1558
1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1365 Expose, 1560 ;
1366 &unused_event)) ; 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1562 ;
1368 GraphicsExpose, 1563
1369 &unused_event)) ;
1370 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1371 { 1565 {
1372 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1373 scrollbar_show (0); 1567 scrollbar_show (0);
1374 } 1568 }
1375#ifdef MENUBAR 1569
1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1570#ifdef TRANSPARENT
1377 menubar_expose (); 1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (dpy, ev.xany.window);
1378#endif 1573#endif
1379 } 1574 }
1380 break; 1575 break;
1381 1576
1382 case MotionNotify: 1577 case MotionNotify:
1383#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1384 if (hidden_pointer) 1579 if (hidden_pointer)
1385 pointer_unblank (); 1580 pointer_unblank ();
1386#endif 1581#endif
1387#if MENUBAR 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1388 if (isMenuBarWindow (ev.xany.window)) 1583 break;
1584
1585 if (ev.xany.window == vt)
1389 { 1586 {
1390 menubar_control (ev.xbutton); 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1391 break; 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1392 } 1589 ; // nop
1393#endif
1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1395 break;
1396
1397 if (ev.xany.window == TermWin.vt)
1398 {
1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1400 { 1591 {
1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1402 ; 1593 ;
1403 1594
1404 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (dpy, vt,
1405 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1406 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1407 & (ev.xbutton.x), & (ev.xbutton.y), 1598 &ev.xbutton.x, &ev.xbutton.y,
1408 &unused_mask); 1599 &ev.xbutton.state);
1409#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
1410 /* deal with a `jumpy' mouse */ 1601 /* deal with a `jumpy' mouse */
1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1602 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1412 { 1603 {
1413#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
1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1415 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1615
1416#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1417 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1419 { 1619 {
1420 int dist; 1620 int dist;
1421
1422 pending_scroll_selection=1;
1423 1621
1424 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1425 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
1426 */ 1624 */
1427 if (scroll_selection_delay<=0) 1625 if (!sel_scroll_ev.active)
1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1429 1627
1430 /* save the event params so we can highlight 1628 /* save the event params so we can highlight
1431 * the selection in the pending-scroll loop 1629 * the selection in the pending-scroll loop
1432 */ 1630 */
1433 selection_save_x=ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1434 selection_save_y=ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1435 selection_save_state=
1436 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1437 1634
1438 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1439 if (ev.xbutton.y<TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1440 { 1637 {
1441 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1442 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1443 } 1640 }
1444 else 1641 else
1445 { 1642 {
1446 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1447 dist = ev.xbutton.y - 1644 dist = ev.xbutton.y - (int_bwidth + height);
1448 (TermWin.int_bwidth + TermWin.height);
1449 } 1645 }
1646
1450 scroll_selection_lines= (Pixel2Height (dist)/ 1647 scroll_selection_lines = Pixel2Height (dist)
1451 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1;
1452 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1453 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1454 } 1652 }
1455 else 1653 else
1456 { 1654 {
1457 /* we are within the text window, so we 1655 /* we are within the text window, so we
1458 * shouldn't be scrolling 1656 * shouldn't be scrolling
1459 */ 1657 */
1460 pending_scroll_selection = 0; 1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop();
1461 } 1660 }
1462#endif 1661#endif
1463#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1464
1465 } 1663 }
1466#endif 1664#endif
1467
1468 } 1665 }
1469 } 1666 }
1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1471 { 1668 {
1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1473 MotionNotify, &ev)) ; 1670 MotionNotify, &ev))
1671 ;
1672
1474 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1475 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1476 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1477 & (ev.xbutton.x), & (ev.xbutton.y), 1676 &ev.xbutton.x, &ev.xbutton.y,
1478 &unused_mask); 1677 &unused_mask);
1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1480 scrollbar_size ()); 1679 scrollbar_size ());
1481 scr_refresh (refresh_type); 1680 want_refresh = 1;
1482 refresh_limit = 0; 1681 refresh_limit = 0;
1483 scrollbar_show (1); 1682 scrollbar_show (1);
1484 } 1683 }
1485 break; 1684 break;
1486 } 1685 }
1487}
1488 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
1489void 1798void
1490rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1491{ 1800{
1492 SET_R (this); 1801 make_current ();
1493 SET_LOCALE (locale);
1494 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
1495 switch (ev.type) 1808 switch (ev.type)
1496 { 1809 {
1497 case PropertyNotify: 1810 case PropertyNotify:
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1499 {
1500 if (ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 break;
1503 }
1504#ifdef TRANSPARENT
1505 else
1506 {
1507 /* 1811 /*
1508 * 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,
1509 * 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.
1510 */ 1814 */
1511 if (xa[XA_XROOTPMAPID] == 0)
1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1513
1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1815 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1515 return; 1817 return;
1516 }
1517 1818
1518 /* FALLTHROUGH */ 1819 /* FALLTHROUGH */
1519 case ReparentNotify: 1820 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ()) 1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1521 if (am_transparent)
1522 want_full_refresh = 1; 1822 want_refresh = want_full_refresh = 1;
1523 break; 1823 break;
1824 }
1524#endif 1825# endif
1525 }
1526} 1826}
1827#endif
1527 1828
1528void 1829void
1529rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1530{ 1831{
1531 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1532 1833
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1534 if (!bypass_keystate) 1836 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1838
1536 /* 1839 /*
1537 * VT window processing of button press 1840 * VT window processing of button press
1538 */ 1841 */
1539 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1540 { 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
1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1856 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1857
1542 if (reportmode) 1858 if (reportmode)
1543 { 1859 {
1544 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */ 1861 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state; 1862 MEvent.state = ev.state;
1547#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1548 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1549 { 1865 {
1550 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1551 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1552 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1553 { 1870 {
1554 /* only report double clicks */ 1871 /* only report double clicks */
1555 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1556 mouse_report (ev); 1873 mouse_report (ev);
… …
1575 } 1892 }
1576 else 1893 else
1577 { 1894 {
1578 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1897
1580 switch (ev.button) 1898 switch (ev.button)
1581 { 1899 {
1582 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
1583 /* allow shift+left click to extend selection */ 1909 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1910 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1585 { 1911 {
1586 if (MEvent.button == Button1 && clickintime) 1912 if (MEvent.button == Button1 && clickintime)
1587 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1588 else 1914 else
1589 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
… …
1604 case Button3: 1930 case Button3:
1605 if (MEvent.button == Button3 && clickintime) 1931 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1607 else 1933 else
1608 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
1935
1609 MEvent.button = Button3; 1936 MEvent.button = Button3;
1610 break; 1937 break;
1611 } 1938 }
1612 } 1939 }
1940
1613 MEvent.time = ev.time; 1941 MEvent.time = ev.time;
1614 return; 1942 return;
1615 } 1943 }
1616 1944
1617 /* 1945 /*
… …
1683 upordown = 1; /* down */ 2011 upordown = 1; /* down */
1684 } 2012 }
1685 if (upordown) 2013 if (upordown)
1686 { 2014 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2015#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2016 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1689#endif 2017#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1)) 2018 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 { 2019 {
1692 if (upordown < 0) 2020 if (upordown < 0)
1693 scrollBar.setUp (); 2021 scrollBar.setUp ();
… …
1709 break; 2037 break;
1710 case R_SB_ALIGN_BOTTOM: 2038 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top; 2039 csrO = scrollBar.bot - scrollBar.top;
1712 break; 2040 break;
1713 } 2041 }
2042
1714 if (scrollBar.style == R_SB_XTERM 2043 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y) 2044 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y)) 2045 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO, 2046 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1718 scrollbar_size ()); 2047
1719 scrollBar.setMotion (); 2048 scrollBar.setMotion ();
1720 break; 2049 break;
1721 2050
1722 case Button1: 2051 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2052 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1727 case Button3: 2056 case Button3:
1728 if (scrollBar.style != R_SB_XTERM) 2057 if (scrollBar.style != R_SB_XTERM)
1729 { 2058 {
1730 if (scrollbar_above_slider (ev.y)) 2059 if (scrollbar_above_slider (ev.y))
1731# ifdef RXVT_SCROLL_FULL 2060# ifdef RXVT_SCROLL_FULL
1732 scr_page (UP, TermWin.nrow - 1); 2061 scr_page (UP, nrow - 1);
1733# else 2062# else
1734 scr_page (UP, TermWin.nrow / 4); 2063 scr_page (UP, nrow / 4);
1735# endif 2064# endif
1736 else if (scrollbar_below_slider (ev.y)) 2065 else if (scrollbar_below_slider (ev.y))
1737# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
1738 scr_page (DN, TermWin.nrow - 1); 2067 scr_page (DN, nrow - 1);
1739# else 2068# else
1740 scr_page (DN, TermWin.nrow / 4); 2069 scr_page (DN, nrow / 4);
1741# endif 2070# endif
1742 else 2071 else
1743 scrollBar.setMotion (); 2072 scrollBar.setMotion ();
1744 } 2073 }
1745 else 2074 else
1746 { 2075 {
1747 scr_page ((ev.button == Button1 ? DN : UP), 2076 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow 2077 (nrow
1749 * scrollbar_position (ev.y) 2078 * scrollbar_position (ev.y)
1750 / scrollbar_size ())); 2079 / scrollbar_size ()));
1751 } 2080 }
2081
1752 break; 2082 break;
1753 } 2083 }
1754 } 2084 }
2085
1755 return; 2086 return;
1756 } 2087 }
1757#if MENUBAR
1758 /*
1759 * Menubar window processing of button press
1760 */
1761 if (isMenuBarWindow (ev.window))
1762 menubar_control (ev);
1763#endif
1764} 2088}
1765 2089
1766void 2090void
1767rxvt_term::button_release (XButtonEvent &ev) 2091rxvt_term::button_release (XButtonEvent &ev)
1768{ 2092{
1769 int reportmode = 0; 2093 int reportmode = 0;
1770 2094
1771 csrO = 0; /* reset csr Offset */ 2095 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate) 2096 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2097 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 2098
1775 if (scrollbar_isUpDn ()) 2099 if (scrollbar_isUpDn ())
1776 { 2100 {
1777 scrollBar.setIdle (); 2101 scrollBar.setIdle ();
1778 scrollbar_show (0); 2102 scrollbar_show (0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 refresh_type &= ~SMOOTH_REFRESH;
1781#endif
1782
1783 } 2103 }
2104
1784#ifdef SELECTION_SCROLLING 2105#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0; 2106 if (sel_scroll_ev.active)
2107 sel_scroll_ev.stop();
1786#endif 2108#endif
2109
1787 if (ev.window == TermWin.vt) 2110 if (ev.window == vt)
1788 { 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
1789 if (reportmode) 2121 if (reportmode)
1790 { 2122 {
1791 /* mouse report from vt window */ 2123 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */ 2124 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4) 2125 if (ev.button >= 4)
… …
1807 MEvent.button = AnyButton; 2139 MEvent.button = AnyButton;
1808 mouse_report (ev); 2140 mouse_report (ev);
1809#endif /* MOUSE_REPORT_DOUBLECLICK */ 2141#endif /* MOUSE_REPORT_DOUBLECLICK */
1810 return; 2142 return;
1811 } 2143 }
2144
1812 /* 2145 /*
1813 * dumb hack to compensate for the failure of click-and-drag 2146 * dumb hack to compensate for the failure of click-and-drag
1814 * when overriding mouse reporting 2147 * when overriding mouse reporting
1815 */ 2148 */
1816 if (PrivateModes & PrivMode_mouse_report 2149 if (priv_modes & PrivMode_mouse_report
1817 && bypass_keystate 2150 && bypass_keystate
1818 && ev.button == Button1 && MEvent.clicks <= 1) 2151 && ev.button == Button1 && MEvent.clicks <= 1)
1819 selection_extend (ev.x, ev.y, 0); 2152 selection_extend (ev.x, ev.y, 0);
1820 2153
1821 switch (ev.button) 2154 switch (ev.button)
1822 { 2155 {
1823 case Button1: 2156 case Button1:
1824 case Button3: 2157 case Button3:
1825 selection_make (ev.time); 2158 selection_make (ev.time);
1826 break; 2159 break;
2160
1827 case Button2: 2161 case Button2:
1828 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);
1829 break; 2164 break;
2165
1830#ifdef MOUSE_WHEEL 2166#ifdef MOUSE_WHEEL
1831 case Button4: 2167 case Button4:
1832 case Button5: 2168 case Button5:
1833 { 2169 {
1834 int i; 2170 int i;
1835 page_dirn v; 2171 page_dirn v;
1836 2172
1837 v = (ev.button == Button4) ? UP : DN; 2173 v = ev.button == Button4 ? UP : DN;
2174
1838 if (ev.state & ShiftMask) 2175 if (ev.state & ShiftMask)
1839 i = 1; 2176 i = 1;
1840 else if ((Options & Opt_mouseWheelScrollPage)) 2177 else if (OPTION (Opt_mouseWheelScrollPage))
1841 i = TermWin.nrow - 1; 2178 i = nrow - 1;
1842 else 2179 else
1843 i = 5; 2180 i = 5;
2181
1844# ifdef MOUSE_SLIP_WHEELING 2182# ifdef MOUSE_SLIP_WHEELING
1845 if (ev.state & ControlMask) 2183 if (ev.state & ControlMask)
1846 { 2184 {
1847 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)
1848 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
1849 } 2200 }
1850# endif 2201# endif
1851# ifdef JUMP_MOUSE_WHEEL
1852 scr_page (v, i);
1853 scr_refresh (SMOOTH_REFRESH);
1854 scrollbar_show (1);
1855# else
1856 while (i--)
1857 {
1858 scr_page (v, 1);
1859 scr_refresh (SMOOTH_REFRESH);
1860 scrollbar_show (1);
1861 }
1862# endif
1863
1864 } 2202 }
1865 break; 2203 break;
1866#endif 2204#endif
1867
1868 } 2205 }
1869 } 2206 }
1870#ifdef MENUBAR
1871 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev);
1873#endif
1874} 2207}
1875
1876 2208
1877#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
1878/* 2441/*
1879 * Check our parents are still who we think they are. 2442 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 2443 * Do transparency updates if required
1881 */ 2444 */
1882int 2445int
1883rxvt_term::check_our_parents () 2446rxvt_term::check_our_parents ()
1884{ 2447{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 2448 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 2449 unsigned long nitems, bytes_after;
1887 Atom atype; 2450 Atom atype;
1888 unsigned char *prop = NULL; 2451 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 2452 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 2453 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 2454 XWindowAttributes wattr, wrootattr;
1892 2455
1893 pchanged = 0; 2456 pchanged = 0;
1894 2457
1895 if (! (Options & Opt_transparent)) 2458 if (!OPTION (Opt_transparent))
1896 return pchanged; /* Don't try any more */ 2459 return pchanged; /* Don't try any more */
1897 2460
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 2462 rootdepth = wrootattr.depth;
1900 2463
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2465
1902 if (rootdepth != wattr.depth) 2466 if (rootdepth != wattr.depth)
1903 { 2467 {
1904 if (am_transparent) 2468 if (am_transparent)
1905 { 2469 {
1906 pchanged = 1; 2470 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 2472 am_transparent = am_pixmap_trans = 0;
1910 } 2473 }
2474
1911 return pchanged; /* Don't try any more */ 2475 return pchanged; /* Don't try any more */
1912 } 2476 }
1913 2477
1914 /* 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. */
1915 XSync (display->display, False); 2479 XSync (dpy, False);
1916 2480
1917 /* 2481 /*
1918 * Make the frame window set by the window manager have 2482 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 2483 * the root background. Some window managers put multiple nested frame
1920 * 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.
1921 */ 2485 */
1922 i = (xa[XA_XROOTPMAPID] != 0 2486 i = (xa[XA_XROOTPMAP_ID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 2489 &nitems, &bytes_after, &prop) == Success);
2490
1926 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 )
1927 have_pixmap = 0; 2502 have_pixmap = 0;
1928 else 2503 else
1929 { 2504 {
1930 have_pixmap = 1; 2505 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2506 rootpixmap = *(Pixmap *)prop;
1932 XFree (prop); 2507 XFree (prop);
1933 } 2508 }
2509
1934 if (have_pixmap) 2510 if (have_pixmap)
1935 { 2511 {
1936 /* 2512 /*
1937 * Copy display->root pixmap transparency 2513 * Copy display->root pixmap transparency
1938 */ 2514 */
… …
1941 Window cr; 2517 Window cr;
1942 XImage *image; 2518 XImage *image;
1943 GC gc; 2519 GC gc;
1944 XGCValues gcvalue; 2520 XGCValues gcvalue;
1945 2521
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2522 XTranslateCoordinates (dpy, parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2523 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2524 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2525 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2526 nx = ny = 0;
1951 2527
1952 if (sx < 0) 2528 if (sx < 0)
… …
1961 nh += sy; 2537 nh += sy;
1962 ny = -sy; 2538 ny = -sy;
1963 sy = 0; 2539 sy = 0;
1964 } 2540 }
1965 2541
1966 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
1967 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545 XSync (dpy, False);
1968 allowedxerror = -1; 2546 allowedxerror = -1;
1969 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1970 ZPixmap); 2548
1971 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1972 /* XXX: may need a delay here? */ 2550 /* XXX: may need a delay here? */
1973 allowedxerror = 0; 2551 allowedxerror = 0;
2552
1974 if (image == NULL) 2553 if (image == NULL)
1975 { 2554 {
1976 if (am_transparent && am_pixmap_trans) 2555 if (am_transparent && am_pixmap_trans)
1977 { 2556 {
1978 pchanged = 1; 2557 pchanged = 1;
1979 if (TermWin.pixmap != None) 2558 if (pixmap != None)
1980 { 2559 {
1981 XFreePixmap (display->display, TermWin.pixmap); 2560 XFreePixmap (dpy, pixmap);
1982 TermWin.pixmap = None; 2561 pixmap = None;
1983 } 2562 }
1984 } 2563 }
2564
1985 am_pixmap_trans = 0; 2565 am_pixmap_trans = 0;
1986 } 2566 }
1987 else 2567 else
1988 { 2568 {
1989 if (TermWin.pixmap != None) 2569 if (pixmap != None)
1990 XFreePixmap (display->display, TermWin.pixmap); 2570 XFreePixmap (dpy, pixmap);
1991 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2571
1992 (unsigned int)szHint.width, 2572#if TINTING
1993 (unsigned int)szHint.height, 2573 if (ISSET_PIXCOLOR (Color_tint))
1994 (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);
1995 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1996 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
1997 nx, ny, (unsigned int)image->width,
1998 (unsigned int)image->height); 2587 nx, ny, image->width, image->height);
1999 XFreeGC (display->display, gc); 2588 XFreeGC (dpy, gc);
2000 XDestroyImage (image); 2589 XDestroyImage (image);
2001 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2002 TermWin.pixmap); 2591 XClearWindow (dpy, parent[0]);
2592
2003 if (!am_transparent || !am_pixmap_trans) 2593 if (!am_transparent || !am_pixmap_trans)
2004 pchanged = 1; 2594 pchanged = 1;
2595
2005 am_transparent = am_pixmap_trans = 1; 2596 am_transparent = am_pixmap_trans = 1;
2006 } 2597 }
2007 } 2598 }
2008 2599
2009 if (!am_pixmap_trans) 2600 if (am_pixmap_trans)
2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602 else
2010 { 2603 {
2011 unsigned int n; 2604 unsigned int n;
2012 /* 2605 /*
2013 * InheritPixmap transparency 2606 * InheritPixmap transparency
2014 */ 2607 */
2015 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2016 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2017 i++)
2018 { 2609 {
2019 oldp = TermWin.parent[i]; 2610 oldp = parent[i];
2020 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2021 &TermWin.parent[i], &list, &n);
2022 XFree (list); 2612 XFree (list);
2023 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2613
2024 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
2025 { 2615 {
2026 if (oldp != None) 2616 if (oldp != None)
2027 pchanged = 1; 2617 pchanged = 1;
2618
2028 break; 2619 break;
2029 } 2620 }
2621
2030 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
2031 pchanged = 1; 2623 pchanged = 1;
2032 } 2624 }
2033 2625
2034 n = 0; 2626 n = 0;
2035 2627
2036 if (pchanged) 2628 if (pchanged)
2037 {
2038 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++)
2039 { 2650 {
2040 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2041 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2652 XClearWindow (dpy, parent[n]);
2042 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)
2043 { 2732 {
2044 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;
2045 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;
2046 } 2796 }
2047 } 2797 }
2048 }
2049 2798
2050 if (n > (int) (sizeof (TermWin.parent)
2051 / sizeof (TermWin.parent[0])))
2052 {
2053 D_X ((stderr, "InheritPixmap Turning off"));
2054 XSetWindowBackground (display->display, TermWin.parent[0],
2055 PixColors[Color_fg]);
2056 XSetWindowBackground (display->display, TermWin.vt,
2057 PixColors[Color_bg]);
2058 am_transparent = 0;
2059 /* XXX: also turn off Opt_transparent? */
2060 } 2799 }
2061 else 2800 else
2062 { 2801 {
2063 /* wait (an arbitrary period) for the WM to do its thing 2802 try
2064 * needed for fvwm2.2.2 (and before?) */ 2803 {
2065# ifdef HAVE_NANOSLEEP 2804 process_nonprinting (ch);
2066 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 }
2067 2812
2068 rqt.tv_sec = 1; 2813 ch = NOCHAR;
2069 rqt.tv_nsec = 0; 2814 }
2070 nanosleep (&rqt, NULL); 2815 }
2071# else 2816
2072 sleep (1); 2817 return flag;
2073# endif 2818}
2074 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2819
2075 for (n = 0; n < (unsigned int)i; n++) 2820// read the next character
2076 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2821wchar_t
2077 ParentRelative); 2822rxvt_term::next_char () NOTHROW
2078 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2823{
2079 ParentRelative); 2824 while (cmdbuf_ptr < cmdbuf_endp)
2080 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)
2081 } 2834 {
2835 // the mbstate stores incomplete sequences. didn't know this :/
2836 cmdbuf_ptr = cmdbuf_endp;
2837 break;
2838 }
2082 2839
2083 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2840 if (len == (size_t)-1)
2084 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;
2085 } 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
2086 return pchanged; 2875 return c;
2087} 2876}
2088#endif
2089 2877
2090/*}}} */ 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}
2091 2888
2092/*{{{ print pipe */ 2889/*{{{ print pipe */
2093/*----------------------------------------------------------------------*/ 2890/*----------------------------------------------------------------------*/
2094#ifdef PRINTPIPE 2891#ifdef PRINTPIPE
2095FILE * 2892FILE *
2096rxvt_term::popen_printer () 2893rxvt_term::popen_printer ()
2097{ 2894{
2098 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2895 FILE *stream = popen (rs[Rs_print_pipe], "w");
2099 2896
2100 if (stream == NULL) 2897 if (stream == NULL)
2101 rxvt_print_error ("can't open printer pipe"); 2898 rxvt_warn ("can't open printer pipe, not printing.\n");
2899
2102 return stream; 2900 return stream;
2103} 2901}
2104 2902
2105int 2903int
2106rxvt_term::pclose_printer (FILE *stream) 2904rxvt_term::pclose_printer (FILE *stream)
2107{ 2905{
2108 fflush (stream); 2906 fflush (stream);
2109 /* pclose () reported not to work on SunOS 4.1.3 */
2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2111 /* pclose works provided SIGCHLD handler uses waitpid */
2112 return pclose (stream); /* return fclose (stream); */
2113# else
2114 return pclose (stream); 2907 return pclose (stream);
2115# endif
2116} 2908}
2117 2909
2118/* 2910/*
2119 * simulate attached vt100 printer 2911 * simulate attached vt100 printer
2120 */ 2912 */
2121void 2913void
2122rxvt_term::process_print_pipe () 2914rxvt_term::process_print_pipe ()
2123{ 2915{
2124 int done; 2916 int done;
2125 FILE *fd; 2917 FILE *fd;
2126 2918
2127 if ((fd = popen_printer ()) == NULL) 2919 if ((fd = popen_printer ()) == NULL)
2128 return; 2920 return;
2129 2921
2130 /* 2922 /*
2131 * 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
2132 * is received. 2924 * is received.
2133 */ 2925 */
2134 for (done = 0; !done;) 2926 for (done = 0; !done;)
2135 { 2927 {
2136 unsigned char buf[8]; 2928 unsigned char buf[8];
2137 unsigned char ch; 2929 unicode_t ch;
2138 unsigned int i, len; 2930 unsigned int i, len;
2139 2931
2140 if ((ch = cmd_getc ()) != C0_ESC) 2932 if ((ch = cmd_getc ()) != C0_ESC)
2141 { 2933 {
2142 if (putc (ch, fd) == EOF) 2934 if (putc (ch, fd) == EOF)
2143 break; /* done = 1 */ 2935 break; /* done = 1 */
… …
2158 { 2950 {
2159 if ((buf[len++] = cmd_getc ()) == 'i') 2951 if ((buf[len++] = cmd_getc ()) == 'i')
2160 break; /* done = 1 */ 2952 break; /* done = 1 */
2161 } 2953 }
2162 } 2954 }
2955
2163 for (i = 0; i < len; i++) 2956 for (i = 0; i < len; i++)
2164 if (putc (buf[i], fd) == EOF) 2957 if (putc (buf[i], fd) == EOF)
2165 { 2958 {
2166 done = 1; 2959 done = 1;
2167 break; 2960 break;
2168 } 2961 }
2169 } 2962 }
2170 } 2963 }
2964
2171 pclose_printer (fd); 2965 pclose_printer (fd);
2172} 2966}
2173#endif /* PRINTPIPE */ 2967#endif /* PRINTPIPE */
2174/*}}} */ 2968/*}}} */
2175 2969
2176/* *INDENT-OFF* */ 2970/* *INDENT-OFF* */
2177enum { 2971enum {
2178 C1_40 = 0x40, 2972 C1_40 = 0x40,
2179 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,
2180 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,
2181 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,
2182 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,
2183}; 2977};
2184/* *INDENT-ON* */ 2978/* *INDENT-ON* */
2185 2979
2186/*{{{ process non-printing single characters */ 2980/*{{{ process non-printing single characters */
2187void 2981void
2188rxvt_term::process_nonprinting (unsigned char ch) 2982rxvt_term::process_nonprinting (unicode_t ch)
2189{ 2983{
2190 switch (ch) 2984 switch (ch)
2191 { 2985 {
2986 case C0_ESC:
2987 process_escape_seq ();
2988 break;
2192 case C0_ENQ: /* terminal Status */ 2989 case C0_ENQ: /* terminal Status */
2193 if (rs[Rs_answerbackstring]) 2990 if (rs[Rs_answerbackstring])
2194 tt_write ( 2991 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2195 (const unsigned char *)rs[Rs_answerbackstring],
2196 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2197 else 2992 else
2198 tt_write ((unsigned char *)VT100_ANS, 2993 tt_write (VT100_ANS, strlen (VT100_ANS));
2199 (unsigned int)STRLEN (VT100_ANS));
2200 break; 2994 break;
2201 case C0_BEL: /* bell */ 2995 case C0_BEL: /* bell */
2202 scr_bell (); 2996 scr_bell ();
2203 break; 2997 break;
2204 case C0_BS: /* backspace */ 2998 case C0_BS: /* backspace */
… …
2219 scr_charset_choose (1); 3013 scr_charset_choose (1);
2220 break; 3014 break;
2221 case C0_SI: /* shift in - acs */ 3015 case C0_SI: /* shift in - acs */
2222 scr_charset_choose (0); 3016 scr_charset_choose (0);
2223 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
2224 } 3031 }
2225} 3032}
2226/*}}} */ 3033/*}}} */
2227 3034
2228 3035
2229/*{{{ process VT52 escape sequences */ 3036/*{{{ process VT52 escape sequences */
2230void 3037void
2231rxvt_term::process_escape_vt52 (unsigned char ch) 3038rxvt_term::process_escape_vt52 (unicode_t ch)
2232{ 3039{
2233 int row, col; 3040 int row, col;
2234 3041
2235 switch (ch) 3042 switch (ch)
2236 { 3043 {
… …
2288 3095
2289/*{{{ process escape sequences */ 3096/*{{{ process escape sequences */
2290void 3097void
2291rxvt_term::process_escape_seq () 3098rxvt_term::process_escape_seq ()
2292{ 3099{
2293 unsigned char ch = cmd_getc (); 3100 unicode_t ch = cmd_getc ();
2294 3101
2295 if (PrivateModes & PrivMode_vt52) 3102 if (priv_modes & PrivMode_vt52)
2296 { 3103 {
2297 process_escape_vt52 (ch); 3104 process_escape_vt52 (ch);
2298 return; 3105 return;
2299 } 3106 }
2300 3107
… …
2315 scr_charset_set (2, (unsigned int)cmd_getc ()); 3122 scr_charset_set (2, (unsigned int)cmd_getc ());
2316 break; 3123 break;
2317 case '+': 3124 case '+':
2318 scr_charset_set (3, (unsigned int)cmd_getc ()); 3125 scr_charset_set (3, (unsigned int)cmd_getc ());
2319 break; 3126 break;
2320#ifndef NO_FRILLS 3127#if !ENABLE_MINIMAL
2321 case '6': 3128 case '6':
2322 scr_backindex (); 3129 scr_backindex ();
2323 break; 3130 break;
2324#endif 3131#endif
2325 case '7': 3132 case '7':
2326 scr_cursor (SAVE); 3133 scr_cursor (SAVE);
2327 break; 3134 break;
2328 case '8': 3135 case '8':
2329 scr_cursor (RESTORE); 3136 scr_cursor (RESTORE);
2330 break; 3137 break;
2331#ifndef NO_FRILLS 3138#if !ENABLE_MINIMAL
2332 case '9': 3139 case '9':
2333 scr_forwardindex (); 3140 scr_forwardindex ();
2334 break; 3141 break;
2335#endif 3142#endif
2336 case '=': 3143 case '=':
… …
2346 break; 3153 break;
2347 3154
2348 /* 8.3.87: NEXT LINE */ 3155 /* 8.3.87: NEXT LINE */
2349 case C1_NEL: /* ESC E */ 3156 case C1_NEL: /* ESC E */
2350 { 3157 {
2351 uint32_t nlcr[] = { '\n', '\r' }; 3158 wchar_t nlcr[] = { C0_LF, C0_CR };
2352 scr_add_lines (nlcr, 1, 2); 3159 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2353 } 3160 }
2354 break; 3161 break;
2355 3162
2356 /* kidnapped escape sequence: Should be 8.3.48 */ 3163 /* kidnapped escape sequence: Should be 8.3.48 */
2357 case C1_ESA: /* ESC G */ 3164 case C1_ESA: /* ESC G */
… …
2367 case C1_RI: /* ESC M */ 3174 case C1_RI: /* ESC M */
2368 scr_index (DN); 3175 scr_index (DN);
2369 break; 3176 break;
2370 3177
2371 /* 8.3.142: SINGLE-SHIFT TWO */ 3178 /* 8.3.142: SINGLE-SHIFT TWO */
2372 /*case C1_SS2: scr_single_shift (2); break; */ 3179 /*case C1_SS2: scr_single_shift (2); break; */
2373 3180
2374 /* 8.3.143: SINGLE-SHIFT THREE */ 3181 /* 8.3.143: SINGLE-SHIFT THREE */
2375 /*case C1_SS3: scr_single_shift (3); break; */ 3182 /*case C1_SS3: scr_single_shift (3); break; */
2376 3183
2377 /* 8.3.27: DEVICE CONTROL STRING */ 3184 /* 8.3.27: DEVICE CONTROL STRING */
2378 case C1_DCS: /* ESC P */ 3185 case C1_DCS: /* ESC P */
2379 process_dcs_seq (); 3186 process_dcs_seq ();
2380 break; 3187 break;
2381 3188
2382 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3189 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2383 case C1_SCI: /* ESC Z */ 3190 case C1_SCI: /* ESC Z */
2384 tt_write ((const unsigned char *)ESCZ_ANSWER, 3191 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2385 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2386 break; /* steal obsolete ESC [ c */ 3192 break; /* steal obsolete ESC [ c */
2387 3193
2388 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3194 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2389 case C1_CSI: /* ESC [ */ 3195 case C1_CSI: /* ESC [ */
2390 process_csi_seq (); 3196 process_csi_seq ();
… …
2395 process_osc_seq (); 3201 process_osc_seq ();
2396 break; 3202 break;
2397 3203
2398 /* 8.3.106: RESET TO INITIAL STATE */ 3204 /* 8.3.106: RESET TO INITIAL STATE */
2399 case 'c': 3205 case 'c':
3206 mbstate.reset ();
2400 scr_poweron (); 3207 scr_poweron ();
2401 scrollbar_show (1); 3208 scrollbar_show (1);
2402 break; 3209 break;
2403 3210
2404 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3211 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2416 3223
2417/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3224/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2418/* *INDENT-OFF* */ 3225/* *INDENT-OFF* */
2419enum { 3226enum {
2420 CSI_ICH = 0x40, 3227 CSI_ICH = 0x40,
2421 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,
2422 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 ,
2423 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,
2424 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,
2425 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,
2426 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,
… …
2441 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, */
2442 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, [, \, ], ^, _, */
2443 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, */
2444 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, */
2445 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, */
2446 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, {, |, }, ~, */
2447 }; 3254 };
2448/* *INDENT-ON* */ 3255/* *INDENT-ON* */
2449 3256
2450void 3257void
2451rxvt_term::process_csi_seq () 3258rxvt_term::process_csi_seq ()
2452{ 3259{
2453 unsigned char ch, priv, i; 3260 unicode_t ch, priv, i;
2454 unsigned int nargs, p; 3261 unsigned int nargs, p;
2455 int n, ndef; 3262 int n, ndef;
2456 int arg[ESC_ARGS]; 3263 int arg[ESC_ARGS];
2457 3264
2458 for (nargs = ESC_ARGS; nargs > 0;) 3265 for (nargs = ESC_ARGS; nargs > 0;)
2459 arg[--nargs] = 0; 3266 arg[--nargs] = 0;
2460 3267
2461 priv = 0; 3268 priv = 0;
… …
2463 if (ch >= '<' && ch <= '?') 3270 if (ch >= '<' && ch <= '?')
2464 { /* '<' '=' '>' '?' */ 3271 { /* '<' '=' '>' '?' */
2465 priv = ch; 3272 priv = ch;
2466 ch = cmd_getc (); 3273 ch = cmd_getc ();
2467 } 3274 }
3275
2468 /* read any numerical arguments */ 3276 /* read any numerical arguments */
2469 for (n = -1; ch < CSI_ICH; ) 3277 for (n = -1; ch < CSI_ICH; )
2470 { 3278 {
2471 if (isdigit (ch)) 3279 if (isdigit (ch))
2472 { 3280 {
… …
2479 { 3287 {
2480 if (nargs < ESC_ARGS) 3288 if (nargs < ESC_ARGS)
2481 arg[nargs++] = n; 3289 arg[nargs++] = n;
2482 n = -1; 3290 n = -1;
2483 } 3291 }
2484 else if (ch == '\b') 3292 else if (IS_CONTROL (ch))
2485 {
2486 scr_backspace ();
2487 }
2488 else if (ch == C0_ESC)
2489 {
2490 process_escape_seq ();
2491 return;
2492 }
2493 else if (ch < ' ')
2494 {
2495 process_nonprinting (ch); 3293 process_nonprinting (ch);
2496 } 3294
2497 ch = cmd_getc (); 3295 ch = cmd_getc ();
2498 } 3296 }
2499 3297
2500 if (ch > CSI_7F) 3298 if (ch > CSI_7F)
2501 return; 3299 return;
… …
2507 ndef = get_byte_array_bit (csi_defaults, i); 3305 ndef = get_byte_array_bit (csi_defaults, i);
2508 for (p = 0; p < nargs; p++) 3306 for (p = 0; p < nargs; p++)
2509 if (arg[p] == -1) 3307 if (arg[p] == -1)
2510 arg[p] = ndef; 3308 arg[p] = ndef;
2511 3309
2512#ifdef DEBUG_CMD
2513 fprintf (stderr, "CSI ");
2514 for (p = 0; p < nargs; p++)
2515 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2516 fprintf (stderr, "%c\n", ch);
2517#endif
2518
2519 /* 3310 /*
2520 * private mode handling 3311 * private mode handling
2521 */ 3312 */
2522 if (priv) 3313 if (priv)
2523 { 3314 {
2524 switch (priv) 3315 switch (priv)
2525 { 3316 {
2526 case '>': 3317 case '>':
2527 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 //
2528 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;94;0c", 'U');
3328 }
2529 break; 3329 break;
2530 case '?': 3330 case '?':
2531 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2532 process_terminal_mode (ch, priv, nargs, arg); 3332 process_terminal_mode (ch, priv, nargs, arg);
2533 break; 3333 break;
… …
2638 3438
2639 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3439 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2640 arg[0] = -arg[0]; 3440 arg[0] = -arg[0];
2641 /* FALLTHROUGH */ 3441 /* FALLTHROUGH */
2642 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3442 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2643 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3443 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2644 break; 3444 break;
2645 3445
2646 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3446 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2647 tt_write ((const unsigned char *)VT100_ANS, 3447 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2648 (unsigned int) (sizeof (VT100_ANS) - 1));
2649 break; 3448 break;
2650 3449
2651 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3450 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2652 process_sgr_mode (nargs, arg); 3451 process_sgr_mode (nargs, arg);
2653 break; 3452 break;
… …
2659 tt_printf ("\033[0n"); 3458 tt_printf ("\033[0n");
2660 break; 3459 break;
2661 case 6: /* CPR requested */ 3460 case 6: /* CPR requested */
2662 scr_report_position (); 3461 scr_report_position ();
2663 break; 3462 break;
2664#if defined (ENABLE_DISPLAY_ANSWER)
2665 case 7: /* unofficial extension */ 3463 case 7: /* unofficial extension */
3464 if (OPTION (Opt_insecure))
2666 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3465 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2667 break; 3466 break;
2668#endif
2669 case 8: /* unofficial extension */ 3467 case 8: /* unofficial extension */
2670 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2671 break; 3469 break;
2672 } 3470 }
2673 break; 3471 break;
2674 3472
2675 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3473 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2708 break; 3506 break;
2709 3507
2710 case CSI_RM: /* 8.3.107: RESET MODE */ 3508 case CSI_RM: /* 8.3.107: RESET MODE */
2711 if (arg[0] == 4) 3509 if (arg[0] == 4)
2712 scr_insert_mode (0); 3510 scr_insert_mode (0);
3511 else if (arg[0] == 20)
3512 priv_modes &= ~PrivMode_LFNL;
2713 break; 3513 break;
2714 3514
2715 case CSI_SM: /* 8.3.126: SET MODE */ 3515 case CSI_SM: /* 8.3.126: SET MODE */
2716 if (arg[0] == 4) 3516 if (arg[0] == 4)
2717 scr_insert_mode (1); 3517 scr_insert_mode (1);
3518 else if (arg[0] == 20)
3519 priv_modes |= PrivMode_LFNL;
2718 break; 3520 break;
2719 3521
2720 /* 3522 /*
2721 * PRIVATE USE beyond this point. All CSI_7? sequences here 3523 * PRIVATE USE beyond this point. All CSI_7? sequences here
2722 */ 3524 */
… …
2734 break; 3536 break;
2735 case CSI_75: 3537 case CSI_75:
2736 scr_cursor (RESTORE); 3538 scr_cursor (RESTORE);
2737 break; 3539 break;
2738 3540
2739#ifndef NO_FRILLS 3541#if !ENABLE_MINIMAL
2740 case CSI_74: 3542 case CSI_74:
2741 process_window_ops (arg, nargs); 3543 process_window_ops (arg, nargs);
2742 break; 3544 break;
2743#endif 3545#endif
2744 3546
2745 case CSI_78: /* DECREQTPARM */ 3547 case CSI_78: /* DECREQTPARM */
2746 if (arg[0] == 0 || arg[0] == 1) 3548 if (arg[0] == 0 || arg[0] == 1)
2747 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);
2748 /* FALLTHROUGH */ 3550 break;
2749 3551
2750 default: 3552 default:
2751 break; 3553 break;
2752 } 3554 }
2753} 3555}
2754/*}}} */ 3556/*}}} */
2755 3557
2756#ifndef NO_FRILLS 3558#if !ENABLE_MINIMAL
2757/* ARGSUSED */ 3559/* ARGSUSED */
2758void 3560void
2759rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3561rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2760{ 3562{
2761 int x, y; 3563 int x, y;
2762#if 0
2763 char *s;
2764#endif
2765 XWindowAttributes wattr; 3564 XWindowAttributes wattr;
2766 Window wdummy; 3565 Window wdummy;
3566
3567 dLocal (Display *, dpy);
2767 3568
2768 if (nargs == 0) 3569 if (nargs == 0)
2769 return; 3570 return;
3571
2770 switch (args[0]) 3572 switch (args[0])
2771 { 3573 {
2772 /* 3574 /*
2773 * commands 3575 * commands
2774 */ 3576 */
2775 case 1: /* deiconify window */ 3577 case 1: /* deiconify window */
2776 XMapWindow (display->display, TermWin.parent[0]); 3578 XMapWindow (dpy, parent[0]);
2777 break; 3579 break;
2778 case 2: /* iconify window */ 3580 case 2: /* iconify window */
2779 XIconifyWindow (display->display, TermWin.parent[0], 3581 XIconifyWindow (dpy, parent[0], display->screen);
2780 DefaultScreen (display->display));
2781 break; 3582 break;
2782 case 3: /* set position (pixels) */ 3583 case 3: /* set position (pixels) */
2783 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3584 XMoveWindow (dpy, parent[0], args[1], args[2]);
2784 break; 3585 break;
2785 case 4: /* set size (pixels) */ 3586 case 4: /* set size (pixels) */
2786 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2787 break; 3588 break;
2788 case 5: /* raise window */ 3589 case 5: /* raise window */
2789 XRaiseWindow (display->display, TermWin.parent[0]); 3590 XRaiseWindow (dpy, parent[0]);
2790 break; 3591 break;
2791 case 6: /* lower window */ 3592 case 6: /* lower window */
2792 XLowerWindow (display->display, TermWin.parent[0]); 3593 XLowerWindow (dpy, parent[0]);
2793 break; 3594 break;
2794 case 7: /* refresh window */ 3595 case 7: /* refresh window */
2795 scr_touch (true); 3596 scr_touch (true);
2796 break; 3597 break;
2797 case 8: /* set size (chars) */ 3598 case 8: /* set size (chars) */
2798 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3599 set_widthheight ((unsigned int) (args[2] * fwidth),
2799 (unsigned int) (args[1] * TermWin.fheight)); 3600 (unsigned int) (args[1] * fheight));
2800 break; 3601 break;
3602
3603 //case 9: NYI, TODO, restore maximized window or maximize window
2801 default: 3604 default:
2802 if (args[0] >= 24) /* set height (chars) */ 3605 if (args[0] >= 24) /* set height (chars) */
2803 set_widthheight ((unsigned int)TermWin.width, 3606 set_widthheight ((unsigned int)width,
2804 (unsigned int) (args[1] * TermWin.fheight)); 3607 (unsigned int) (args[1] * fheight));
2805 break; 3608 break;
3609
2806 /* 3610 /*
2807 * reports - some output format copied from XTerm 3611 * reports - some output format copied from XTerm
2808 */ 3612 */
2809 case 11: /* report window state */ 3613 case 11: /* report window state */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3615 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2812 break; 3616 break;
2813 case 13: /* report window position */ 3617 case 13: /* report window position */
2814 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3618 XGetWindowAttributes (dpy, parent[0], &wattr);
2815 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3619 XTranslateCoordinates (dpy, parent[0], wattr.root,
2816 -wattr.border_width, -wattr.border_width, 3620 -wattr.border_width, -wattr.border_width,
2817 &x, &y, &wdummy); 3621 &x, &y, &wdummy);
2818 tt_printf ("\033[3;%d;%dt", x, y); 3622 tt_printf ("\033[3;%d;%dt", x, y);
2819 break; 3623 break;
2820 case 14: /* report window size (pixels) */ 3624 case 14: /* report window size (pixels) */
2821 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3625 XGetWindowAttributes (dpy, parent[0], &wattr);
2822 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3626 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2823 break; 3627 break;
3628 case 18: /* report text area size (chars) */
3629 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3630 break;
2824 case 18: /* report window size (chars) */ 3631 case 19: /* report window size (chars) */
2825 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2826 break; 3633 break;
2827#if 0 /* XXX: currently disabled due to security concerns */
2828 case 20: /* report icon label */ 3634 case 20: /* report icon label */
3635 {
3636 char *s;
2829 XGetIconName (display->display, TermWin.parent[0], &s); 3637 XGetIconName (dpy, parent[0], &s);
2830 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 }
2831 break; 3641 break;
2832 case 21: /* report window title */ 3642 case 21: /* report window title */
3643 {
3644 char *s;
2833 XFetchName (display->display, TermWin.parent[0], &s); 3645 XFetchName (dpy, parent[0], &s);
2834 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 }
2835 break; 3649 break;
2836#endif
2837
2838 } 3650 }
2839} 3651}
2840#endif 3652#endif
2841 3653
2842/*----------------------------------------------------------------------*/ 3654/*----------------------------------------------------------------------*/
2843/* 3655/*
2844 * get input up until STRING TERMINATOR (or BEL) 3656 * get input up until STRING TERMINATOR (or BEL)
2845 * ends_how is terminator used. returned input must be free ()d 3657 * ends_how is terminator used. returned input must be free()'d
2846 */ 3658 */
2847unsigned char * 3659char *
2848rxvt_term::get_to_st (unsigned char *ends_how) 3660rxvt_term::get_to_st (unicode_t &ends_how)
2849{ 3661{
2850 int seen_esc = 0; /* seen escape? */ 3662 unicode_t ch;
3663 bool seen_esc = false;
2851 unsigned int n = 0; 3664 unsigned int n = 0;
2852 unsigned char *s; 3665 wchar_t string[STRING_MAX];
2853 unsigned char ch, string[STRING_MAX];
2854 3666
2855 for (; (ch = cmd_getc ());) 3667 while ((ch = cmd_getc ()) != NOCHAR)
2856 { 3668 {
2857 if (ch == C0_BEL 3669 if (seen_esc)
2858 || ch == CHAR_ST 3670 {
2859 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3671 if (ch == 0x5c) /* 7bit ST */
2860 break; 3672 break;
3673 else
3674 return NULL;
3675 }
2861 if (ch == C0_ESC) 3676 else if (ch == C0_ESC)
2862 { 3677 {
2863 seen_esc = 1; 3678 seen_esc = true;
2864 continue; 3679 continue;
2865 } 3680 }
3681 else if (ch == C0_BEL || ch == CHAR_ST)
3682 break;
2866 else if (ch == '\t') 3683 else if (ch == C0_SYN)
2867 ch = ' '; /* translate '\t' to space */ 3684 ch = cmd_get8 ();
2868 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3685 else if (ch < 0x20)
2869 return NULL; /* other control character - exit */ 3686 return NULL; /* other control character - exit */
2870 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
2871 string[n++] = ch; 3694 string[n++] = ch;
2872 seen_esc = 0;
2873 } 3695 }
3696
2874 string[n++] = '\0'; 3697 string[n++] = '\0';
2875 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3698
2876 return NULL;
2877 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
2878 STRNCPY (s, string, n); 3700
2879 return s; 3701 return rxvt_wcstombs (string);
2880} 3702}
2881 3703
2882/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
2883/* 3705/*
2884 * 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)'
2885 */ 3707 */
2886void 3708void
2887rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
2888{ 3710{
2889 unsigned char eh, *s; 3711 char *s;
3712 unicode_t eh;
3713
2890 /* 3714 /*
2891 * Not handled yet 3715 * Not handled yet
2892 */ 3716 */
2893 s = get_to_st (&eh); 3717 s = get_to_st (eh);
2894 if (s) 3718 if (s)
2895 free (s); 3719 free (s);
3720
2896 return; 3721 return;
2897} 3722}
2898 3723
2899/*----------------------------------------------------------------------*/ 3724/*----------------------------------------------------------------------*/
2900/* 3725/*
2901 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3726 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2902 */ 3727 */
2903void 3728void
2904rxvt_term::process_osc_seq () 3729rxvt_term::process_osc_seq ()
2905{ 3730{
2906 unsigned char ch, eh, *s; 3731 unicode_t ch, eh;
2907 int arg; 3732 int arg;
2908 3733
2909 ch = cmd_getc (); 3734 ch = cmd_getc ();
2910 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2911 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
2912 3737
2913 if (ch == ';') 3738 if (ch == ';')
2914 { 3739 {
2915 s = get_to_st (&eh); 3740 char *s = get_to_st (eh);
3741
2916 if (s) 3742 if (s)
2917 { 3743 {
2918 /*
2919 * rxvt_menubar_dispatch () violates the constness of the string,
2920 * so do it here
2921 */
2922 if (arg == XTerm_Menu)
2923#if 0 /* XXX: currently disabled due to security concerns */
2924 menubar_dispatch ((char *)s);
2925#else
2926 (void)0;
2927#endif
2928 else
2929 xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
2930 free (s); 3745 free (s);
2931 } 3746 }
2932 } 3747 }
2933} 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
2934/* 3769/*
2935 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2936 * 0 = change iconName/title
2937 * 1 = change iconName
2938 * 2 = change title
2939 * 4 = change color
2940 * 12 = change text color
2941 * 13 = change mouse foreground color
2942 * 17 = change highlight character colour
2943 * 18 = change bold character color
2944 * 19 = change underlined character color
2945 * 46 = change logfile (not implemented)
2946 * 50 = change font
2947 *
2948 * rxvt extensions:
2949 * 10 = menu (may change in future)
2950 * 20 = bg pixmap
2951 * 39 = change default fg color
2952 * 49 = change default bg color
2953 * 55 = dump scrollback buffer and all of screen
2954 * 701 = change locale
2955 * 702 = find font
2956 */ 3771 */
2957void 3772void
2958rxvt_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)
2959{ 3774{
2960 int changed = 0; 3775 int color;
2961 int color;
2962 char *buf, *name; 3776 char *buf, *name;
3777 bool query = str[0] == '?' && !str[1];
3778 int saveop = op;
3779
3780 dLocal (Display *, dpy);
2963 3781
2964 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
2965 switch (op) 3787 switch (op)
2966 { 3788 {
2967 case XTerm_name: 3789 case XTerm_name:
2968 set_title (str); 3790 set_title (str);
2969 /* FALLTHROUGH */ 3791 /* FALLTHROUGH */
2970 case XTerm_iconName: 3792 case XTerm_iconName:
2971 set_iconName (str); 3793 set_icon_name (str);
2972 break; 3794 break;
2973 case XTerm_title: 3795 case XTerm_title:
2974 set_title (str); 3796 set_title (str);
2975 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
2976 case XTerm_Color: 3837 case XTerm_Color:
2977 for (buf = (char *)str; buf && *buf;) 3838 for (buf = (char *)str; buf && *buf;)
2978 { 3839 {
2979 if ((name = STRCHR (buf, ';')) == NULL) 3840 if ((name = strchr (buf, ';')) == NULL)
2980 break; 3841 break;
3842
2981 *name++ = '\0'; 3843 *name++ = '\0';
2982 color = atoi (buf); 3844 color = atoi (buf) + minCOLOR;
2983 if (color < 0 || color >= TOTAL_COLORS) 3845
3846 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2984 break; 3847 break;
3848
2985 if ((buf = STRCHR (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
2986 *buf++ = '\0'; 3850 *buf++ = '\0';
2987 set_window_color (color + minCOLOR, name); 3851
3852 process_color_seq (op, color, name, resp);
2988 } 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);
2989 break; 3860 break;
2990#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
2991 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
2992 set_window_color (Color_cursor, str); 3863 process_color_seq (op, Color_cursor, str, resp);
2993 break; 3864 break;
2994#endif 3865#endif
2995 case XTerm_Color_pointer: 3866 case XTerm_Color_pointer_fg:
2996 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);
2997 break; 3871 break;
2998#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
2999 case XTerm_Color_BD:
3000 set_window_color (Color_BD, str);
3001 break;
3002 case XTerm_Color_UL:
3003 set_window_color (Color_UL, str);
3004 break;
3005 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3006 set_window_color (Color_RV, str); 3874 process_color_seq (op, Color_RV, str, resp);
3007 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;
3008#endif 3887#endif
3888#if TRANSPARENT && TINTING
3889 case URxvt_Color_tint:
3890 process_color_seq (op, Color_tint, str, resp);
3009 3891
3010 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:
3011 /* 3901 {
3012 * rxvt_menubar_dispatch () violates the constness of the string,
3013 * so DON'T do it here
3014 */
3015 break;
3016 case XTerm_Pixmap:
3017 if (*str != ';') 3902 if (*str != ';')
3018 { 3903 {
3019#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3020 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3021 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3022#endif
3023 scr_touch (true); 3907 scr_touch (true);
3908#endif
3024 } 3909 }
3910
3911 int changed = 0;
3912
3025 while ((str = STRCHR (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3026 { 3914 {
3027 str++; 3915 str++;
3028#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3029 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3030#endif 3918#endif
3031
3032 } 3919 }
3920
3033 if (changed) 3921 if (changed)
3034 { 3922 {
3035#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3036 resize_pixmap (); 3924 resize_pixmap ();
3037#endif
3038 scr_touch (true); 3925 scr_touch (true);
3926#endif
3039 } 3927 }
3928 }
3040 break; 3929 break;
3041 3930
3042 case XTerm_restoreFG: 3931 case Rxvt_restoreFG:
3043 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3044 break; 3933 break;
3045 case XTerm_restoreBG: 3934 case Rxvt_restoreBG:
3046 set_window_color (Color_bg, str); 3935 set_window_color (Color_bg, str);
3047 break; 3936 break;
3937
3048 case XTerm_logfile: 3938 case XTerm_logfile:
3939 // TODO, when secure mode?
3049 break; 3940 break;
3050 case XTerm_font: 3941
3051 change_font (str);
3052 break;
3053#ifndef NO_FRILLS
3054 case XTerm_locale:
3055 if (str[0] == '?' && !str[1])
3056 tt_printf ("%-.250s\n", locale);
3057 else
3058 {
3059 set_locale (str);
3060# ifdef USE_XIM
3061 im_cb ();
3062# endif
3063 }
3064 break;
3065 case XTerm_findfont:
3066 {
3067 int fid = TermWin.fontset->find_font (atoi (str));
3068 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3069 }
3070 break;
3071#endif
3072#if 0 3942#if 0
3073 case XTerm_dumpscreen: /* no error notices */ 3943 case Rxvt_dumpscreen: /* no error notices */
3074 { 3944 {
3075 int fd; 3945 int fd;
3076 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)
3077 { 3947 {
3078 scr_dump (fd); 3948 scr_dump (fd);
3079 close (fd); 3949 close (fd);
3080 } 3950 }
3081 } 3951 }
3082 break; 3952 break;
3083#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)];
3084 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
3085 } 4017 }
3086} 4018}
3087/*----------------------------------------------------------------------*/ 4019/*----------------------------------------------------------------------*/
3088 4020
3089/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4021/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3097 * so no need for fancy checking 4029 * so no need for fancy checking
3098 */ 4030 */
3099int 4031int
3100rxvt_term::privcases (int mode, unsigned long bit) 4032rxvt_term::privcases (int mode, unsigned long bit)
3101{ 4033{
3102 int state; 4034 int state;
3103 4035
3104 if (mode == 's') 4036 if (mode == 's')
3105 { 4037 {
3106 SavedModes |= (PrivateModes & bit); 4038 SavedModes |= (priv_modes & bit);
3107 return -1; 4039 return -1;
3108 } 4040 }
3109 else 4041 else
3110 { 4042 {
3111 if (mode == 'r') 4043 if (mode == 'r')
3112 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4044 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3113 else 4045 else
3114 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4046 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3115 PrivMode (state, bit); 4047 PrivMode (state, bit);
3116 } 4048 }
4049
3117 return state; 4050 return state;
3118} 4051}
3119 4052
3120/* we're not using priv _yet_ */ 4053/* we're not using priv _yet_ */
3121void 4054void
3122rxvt_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)
3123{ 4056{
3124 unsigned int i, j; 4057 unsigned int i, j;
3125 int state; 4058 int state;
4059
3126 static const struct 4060 static const struct
3127 { 4061 {
3128 const int argval; 4062 const int argval;
3129 const unsigned long bit; 4063 const unsigned long bit;
3130 } 4064 }
4065
3131 argtopriv[] = { 4066 argtopriv[] = {
3132 { 1, PrivMode_aplCUR }, 4067 { 1, PrivMode_aplCUR },
3133 { 2, PrivMode_vt52 }, 4068 { 2, PrivMode_vt52 },
3134 { 3, PrivMode_132 }, 4069 { 3, PrivMode_132 },
3135 { 4, PrivMode_smoothScroll }, 4070 { 4, PrivMode_smoothScroll },
3136 { 5, PrivMode_rVideo }, 4071 { 5, PrivMode_rVideo },
3137 { 6, PrivMode_relOrigin }, 4072 { 6, PrivMode_relOrigin },
3138 { 7, PrivMode_Autowrap }, 4073 { 7, PrivMode_Autowrap },
4074 // 8, bi-directional support mode
3139 { 9, PrivMode_MouseX10 }, 4075 { 9, PrivMode_MouseX10 },
3140#ifdef menuBar_esc 4076 // 18, 19 printing-related
3141 { menuBar_esc, PrivMode_menuBar }, 4077 { 25, PrivMode_VisibleCursor },
3142#endif
3143#ifdef scrollBar_esc 4078#ifdef scrollBar_esc
3144 { scrollBar_esc, PrivMode_scrollBar }, 4079 { scrollBar_esc, PrivMode_scrollBar },
3145#endif 4080#endif
3146 { 25, PrivMode_VisibleCursor },
3147 { 35, PrivMode_ShiftKeys }, 4081 { 35, PrivMode_ShiftKeys }, // rxvt extension
3148 { 40, PrivMode_132OK }, 4082 { 40, PrivMode_132OK },
4083 // 41 xterm more fixes NYI
4084 // 45 margin bell NYI
4085 // 46 start logging
3149 { 47, PrivMode_Screen }, 4086 { 47, PrivMode_Screen },
3150 { 66, PrivMode_aplKP }, 4087 { 66, PrivMode_aplKP },
3151#ifndef NO_BACKSPACE_KEY 4088#ifndef NO_BACKSPACE_KEY
3152 { 67, PrivMode_BackSpace }, 4089 { 67, PrivMode_BackSpace },
3153#endif 4090#endif
3154 { 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
3155 { 1010, PrivMode_TtyOutputInh }, 4095 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3156 { 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
3157 { 1047, PrivMode_Screen }, 4100 { 1047, PrivMode_Screen },
4101 // 1048 save and restore cursor
3158 { 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
3159 }; 4104 };
3160 4105
3161 if (nargs == 0) 4106 if (nargs == 0)
3162 return; 4107 return;
3163 4108
… …
3178 state = privcases (mode, argtopriv[j].bit); 4123 state = privcases (mode, argtopriv[j].bit);
3179 break; 4124 break;
3180 } 4125 }
3181 4126
3182 /* extra handling for values with state unkept */ 4127 /* extra handling for values with state unkept */
3183 if (state == -1)
3184 switch (arg[i]) 4128 switch (arg[i])
3185 { 4129 {
4130#if ENABLE_STYLES
4131 case 1021:
4132 set_option (Opt_intensityStyles, mode);
4133
4134 scr_touch (true);
4135 break;
4136#endif
3186 case 1048: /* alternative cursor save */ 4137 case 1048: /* alternative cursor save */
4138 case 1049:
4139 if (OPTION (Opt_secondaryScreen))
3187 if (mode == 0) 4140 if (mode == 0)
3188 scr_cursor (RESTORE); 4141 scr_cursor (RESTORE);
3189 else if (mode == 1) 4142 else if (mode == 1)
3190 scr_cursor (SAVE); 4143 scr_cursor (SAVE);
3191 /* FALLTHROUGH */
3192 default:
3193 continue; /* for (;i;) */
3194 }
3195
3196 /* extra handling for values with valid 0 or 1 state */
3197 switch (arg[i])
3198 {
3199 /* case 1: - application cursor keys */
3200 case 2: /* VT52 mode */
3201 /* oddball mode. should be set regardless of set/reset
3202 * parameter. Return from VT52 mode with an ESC < from
3203 * within VT52 mode
3204 */
3205 PrivMode (1, PrivMode_vt52);
3206 break; 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;
3207 case 3: /* 80/132 */ 4159 case 3: /* 80/132 */
3208 if (PrivateModes & PrivMode_132OK) 4160 if (priv_modes & PrivMode_132OK)
3209 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4161 set_widthheight (((state ? 132 : 80) * fwidth), height);
3210 break; 4162 break;
3211 case 4: /* smooth scrolling */ 4163 case 4: /* smooth scrolling */
3212 if (state)
3213 Options &= ~Opt_jumpScroll;
3214 else
3215 Options |= Opt_jumpScroll; 4164 set_option (Opt_jumpScroll, !state);
3216 break; 4165 break;
3217 case 5: /* reverse video */ 4166 case 5: /* reverse video */
3218 scr_rvideo_mode (state); 4167 scr_rvideo_mode (state);
3219 break; 4168 break;
3220 case 6: /* relative/absolute origins */ 4169 case 6: /* relative/absolute origins */
3221 scr_relative_origin (state); 4170 scr_relative_origin (state);
3222 break; 4171 break;
3223 case 7: /* autowrap */ 4172 case 7: /* autowrap */
3224 scr_autowrap (state); 4173 scr_autowrap (state);
3225 break; 4174 break;
3226 /* 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 */
3227 case 9: /* X10 mouse reporting */ 4176 case 9: /* X10 mouse reporting */
3228 if (state) /* orthogonal */ 4177 if (state) /* orthogonal */
3229 PrivateModes &= ~ (PrivMode_MouseX11); 4178 priv_modes &= ~PrivMode_MouseX11;
3230 break; 4179 break;
3231#ifdef menuBar_esc
3232 case menuBar_esc:
3233#ifdef MENUBAR
3234 map_menuBar (state);
3235#endif
3236 break;
3237#endif
3238#ifdef scrollBar_esc 4180#ifdef scrollBar_esc
3239 case scrollBar_esc: 4181 case scrollBar_esc:
3240 if (scrollbar_mapping (state)) 4182 if (scrollbar_mapping (state))
3241 { 4183 {
3242 resize_all_windows (0, 0, 0); 4184 resize_all_windows (0, 0, 0);
3243 scr_touch (true); 4185 scr_touch (true);
3244 } 4186 }
3245 break; 4187 break;
3246#endif 4188#endif
3247 case 25: /* visible/invisible cursor */ 4189 case 25: /* visible/invisible cursor */
3248 scr_cursor_visible (state); 4190 scr_cursor_visible (state);
3249 break; 4191 break;
3250 /* case 35: - shift keys */ 4192 /* case 35: - shift keys */
3251 /* case 40: - 80 <--> 132 mode */ 4193 /* case 40: - 80 <--> 132 mode */
3252 case 47: /* secondary screen */ 4194 case 47: /* secondary screen */
3253 scr_change_screen (state); 4195 scr_change_screen (state);
3254 break; 4196 break;
3255 /* case 66: - application key pad */ 4197 /* case 66: - application key pad */
3256 /* case 67: - backspace key */ 4198 /* case 67: - backspace key */
3257 case 1000: /* X11 mouse reporting */ 4199 case 1000: /* X11 mouse reporting */
3258 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
3259 PrivateModes &= ~ (PrivMode_MouseX10); 4201 priv_modes &= ~PrivMode_MouseX10;
3260 break; 4202 break;
3261#if 0 4203#if 0
3262 case 1001: 4204 case 1001:
3263 break; /* X11 mouse highlighting */ 4205 break; /* X11 mouse highlighting */
3264#endif 4206#endif
3265 case 1010: /* scroll to bottom on TTY output inhibit */ 4207 case 1010: /* scroll to bottom on TTY output inhibit */
3266 if (state)
3267 Options &= ~Opt_scrollTtyOutput;
3268 else
3269 Options |= Opt_scrollTtyOutput; 4208 set_option (Opt_scrollTtyOutput, !state);
3270 break; 4209 break;
3271 case 1011: /* scroll to bottom on key press */ 4210 case 1011: /* scroll to bottom on key press */
3272 if (state)
3273 Options |= Opt_scrollTtyKeypress; 4211 set_option (Opt_scrollTtyKeypress, state);
3274 else
3275 Options &= ~Opt_scrollTtyKeypress;
3276 break; 4212 break;
3277 case 1047: /* secondary screen w/ clearing */ 4213 case 1047: /* secondary screen w/ clearing last */
3278 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4214 if (OPTION (Opt_secondaryScreen))
3279 if (current_screen != PRIMARY) 4215 if (current_screen != PRIMARY)
3280 scr_erase_screen (2); 4216 scr_erase_screen (2);
3281 scr_change_screen (state); 4217 scr_change_screen (state);
3282 /* FALLTHROUGH */
3283 default:
3284 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;
3285 } 4227 }
3286 } 4228 }
3287} 4229}
3288/*}}} */ 4230/*}}} */
3289 4231
3290/*{{{ process sgr sequences */ 4232/*{{{ process sgr sequences */
3291void 4233void
3292rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4234rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3293{ 4235{
3294 unsigned int i; 4236 unsigned int i;
3295 short rendset; 4237 short rendset;
3296 int rendstyle; 4238 int rendstyle;
3297 4239
3298 if (nargs == 0) 4240 if (nargs == 0)
3299 { 4241 {
3300 scr_rendition (0, ~RS_None); 4242 scr_rendition (0, ~RS_None);
3301 return; 4243 return;
3302 } 4244 }
4245
3303 for (i = 0; i < nargs; i++) 4246 for (i = 0; i < nargs; i++)
3304 { 4247 {
3305 rendset = -1; 4248 rendset = -1;
3306 switch (arg[i]) 4249 switch (arg[i])
3307 { 4250 {
… …
3309 rendset = 0, rendstyle = ~RS_None; 4252 rendset = 0, rendstyle = ~RS_None;
3310 break; 4253 break;
3311 case 1: 4254 case 1:
3312 rendset = 1, rendstyle = RS_Bold; 4255 rendset = 1, rendstyle = RS_Bold;
3313 break; 4256 break;
4257 //case 2: // low intensity
4258 case 3:
4259 rendset = 1, rendstyle = RS_Italic;
4260 break;
3314 case 4: 4261 case 4:
3315 rendset = 1, rendstyle = RS_Uline; 4262 rendset = 1, rendstyle = RS_Uline;
3316 break; 4263 break;
3317 case 5: 4264 case 5: // slowly blinking
4265 case 6: // rapidly blinking
3318 rendset = 1, rendstyle = RS_Blink; 4266 rendset = 1, rendstyle = RS_Blink;
3319 break; 4267 break;
4268 //case 6: // scoansi light background
3320 case 7: 4269 case 7:
3321 rendset = 1, rendstyle = RS_RVid; 4270 rendset = 1, rendstyle = RS_RVid;
3322 break; 4271 break;
3323 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)
3324 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;
3325 break; 4290 break;
3326 case 24: 4291 case 24:
3327 rendset = 0, rendstyle = RS_Uline; 4292 rendset = 0, rendstyle = RS_Uline;
3328 break; 4293 break;
3329 case 25: 4294 case 25:
3330 rendset = 0, rendstyle = RS_Blink; 4295 rendset = 0, rendstyle = RS_Blink;
3331 break; 4296 break;
4297 case 26: // variable spacing (iso 8613)
4298 rendset = 0, rendstyle = RS_Blink;
4299 break;
3332 case 27: 4300 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 4301 rendset = 0, rendstyle = RS_RVid;
3334 break; 4302 break;
4303 //case 28: // visible. NYI
4304 //case 29: // not crossed-out
3335 } 4305 }
4306
3336 if (rendset != -1) 4307 if (rendset != -1)
3337 { 4308 {
3338 scr_rendition (rendset, rendstyle); 4309 scr_rendition (rendset, rendstyle);
3339 continue; /* for (;i;) */ 4310 continue; /* for (;i;) */
3340 } 4311 }
… …
3347 case 33: 4318 case 33:
3348 case 34: 4319 case 34:
3349 case 35: 4320 case 35:
3350 case 36: 4321 case 36:
3351 case 37: 4322 case 37:
3352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4323 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3353 Color_fg);
3354 break; 4324 break;
3355#ifdef TTY_256COLOR 4325 case 38: // set fg color, ISO 8613-6
3356 case 38:
3357 if (nargs > i + 2 && arg[i + 1] == 5) 4326 if (nargs > i + 2 && arg[i + 1] == 5)
3358 { 4327 {
3359 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4328 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3360 Color_fg);
3361 i += 2; 4329 i += 2;
3362 } 4330 }
3363 break; 4331 break;
3364#endif
3365 case 39: /* default fg */ 4332 case 39: /* default fg */
3366 scr_color (Color_fg, Color_fg); 4333 scr_color (Color_fg, Color_fg);
3367 break; 4334 break;
3368 4335
3369 case 40: 4336 case 40:
… …
3372 case 43: 4339 case 43:
3373 case 44: 4340 case 44:
3374 case 45: 4341 case 45:
3375 case 46: 4342 case 46:
3376 case 47: 4343 case 47:
3377 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4344 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3378 Color_bg);
3379 break; 4345 break;
3380#ifdef TTY_256COLOR 4346 case 48: // set bg color, ISO 8613-6
3381 case 48:
3382 if (nargs > i + 2 && arg[i + 1] == 5) 4347 if (nargs > i + 2 && arg[i + 1] == 5)
3383 { 4348 {
3384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3385 Color_bg);
3386 i += 2; 4350 i += 2;
3387 } 4351 }
3388 break; 4352 break;
3389#endif
3390 case 49: /* default bg */ 4353 case 49: /* default bg */
3391 scr_color (Color_bg, Color_bg); 4354 scr_color (Color_bg, Color_bg);
3392 break; 4355 break;
3393 4356
3394#ifndef NO_BRIGHTCOLOR 4357 //case 50: // not variable spacing
4358
4359#if !ENABLE_MINIMAL
3395 case 90: 4360 case 90:
3396 case 91: /* set bright fg color */ 4361 case 91: /* set bright fg color */
3397 case 92: 4362 case 92:
3398 case 93: 4363 case 93:
3399 case 94: 4364 case 94:
3400 case 95: 4365 case 95:
3401 case 96: 4366 case 96:
3402 case 97: 4367 case 97:
3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4368 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3404 Color_fg);
3405 break; 4369 break;
3406 case 100: 4370 case 100:
3407 case 101: /* set bright bg color */ 4371 case 101: /* set bright bg color */
3408 case 102: 4372 case 102:
3409 case 103: 4373 case 103:
3410 case 104: 4374 case 104:
3411 case 105: 4375 case 105:
3412 case 106: 4376 case 106:
3413 case 107: 4377 case 107:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4378 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3415 Color_bg);
3416 break; 4379 break;
3417#endif 4380#endif
3418
3419 } 4381 }
3420 } 4382 }
3421} 4383}
3422/*}}} */ 4384/*}}} */
3423 4385
3424/*{{{ process Rob Nation's own graphics mode sequences */ 4386/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 4387void
3426rxvt_term::process_graphics () 4388rxvt_term::process_graphics ()
3427{ 4389{
3428 unsigned char ch, cmd = cmd_getc (); 4390 unicode_t ch, cmd = cmd_getc ();
3429 4391
3430 if (cmd == 'Q') 4392 if (cmd == 'Q')
3431 { /* query graphics */ 4393 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 4394 tt_printf ("\033G0\012"); /* no graphics */
3433 return; 4395 return;
3434 } 4396 }
3435 /* swallow other graphics sequences until terminating ':' */ 4397 /* swallow other graphics sequences until terminating ':' */
3436 do 4398 do
3437 ch = cmd_getc (); 4399 ch = cmd_getc ();
… …
3447 */ 4409 */
3448void 4410void
3449rxvt_term::tt_printf (const char *fmt,...) 4411rxvt_term::tt_printf (const char *fmt,...)
3450{ 4412{
3451 va_list arg_ptr; 4413 va_list arg_ptr;
3452 unsigned char buf[256]; 4414 char buf[256];
3453 4415
3454 va_start (arg_ptr, fmt); 4416 va_start (arg_ptr, fmt);
3455 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4417 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3456 va_end (arg_ptr); 4418 va_end (arg_ptr);
3457 tt_write (buf, STRLEN (buf)); 4419 tt_write (buf, strlen (buf));
3458} 4420}
3459 4421
3460/* ---------------------------------------------------------------------- */ 4422/* ---------------------------------------------------------------------- */
3461/* 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,
3462 * or generated by us in response to a query ESC sequence. 4424 * or generated by us in response to a query ESC sequence.
3463 */ 4425 */
4426const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4427
3464void 4428void
3465rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4429rxvt_term::tt_write (const char *data, unsigned int len)
3466{ 4430{
3467 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;
3468 4433
3469 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;
3470 { 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
3471 if (v_buflen == 0) 4464 if (v_buflen == 0)
3472 { 4465 {
3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3475 if ((unsigned int)written == len)
3476 return;
3477
3478 data += written;
3479 len -= written;
3480 }
3481
3482
3483 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3484
3485 memcpy (v_buffer + v_buflen, data, len);
3486 v_buflen += len;
3487 }
3488
3489 for (;;)
3490 {
3491 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3492
3493 if (written > 0)
3494 {
3495 v_buflen -= written;
3496
3497 if (v_buflen == 0)
3498 {
3499 free (v_buffer); 4466 free (v_buffer);
3500 v_buffer = 0; 4467 v_buffer = 0;
3501 v_buflen = 0; 4468 v_buflen = 0;
3502 4469
3503 pty_ev.set (EVENT_READ); 4470 pty_ev.set (EVENT_READ);
3504 return;
3505 }
3506
3507 memmove (v_buffer, v_buffer + written, v_buflen);
3508 }
3509 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3510 // original code just ignores this...
3511 destroy ();
3512 else
3513 {
3514 pty_ev.set (EVENT_READ | EVENT_WRITE);
3515 return; 4471 return;
3516 } 4472 }
4473
4474 memmove (v_buffer, v_buffer + written, v_buflen);
3517 } 4475 }
4476 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4477 pty_ev.set (EVENT_READ);
3518} 4478}
3519 4479
3520/*----------------------- end-of-file (C source) -----------------------*/ 4480/*----------------------- end-of-file (C source) -----------------------*/
3521 4481

Diff Legend

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