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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

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

Diff Legend

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