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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.315 by root, Tue Aug 22 13:07:17 2006 UTC

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

Diff Legend

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