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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 UTC

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

Diff Legend

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