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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.313 by root, Wed Jul 5 22:46:14 2006 UTC

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

Diff Legend

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