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.54 by pcg, Sun Feb 22 12:58:02 2004 UTC vs.
Revision 1.341 by ayin, Fri Aug 3 23:15:34 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 ISO_14755
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 ISO_14755
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_Insert
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 ISO_14755
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 ISO_14755
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 ENABLE_TRANSPARENCY
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_count = 0;
743 flush (); 1116 flush ();
744} 1117}
745 1118
746#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
747void 1120void
748rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
749{ 1122{
750 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
751 want_refresh = 1; 1124 want_refresh = 1;
752 1125
753 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
754} 1127}
755#endif 1128#endif
756 1129
757#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
758void 1131void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 1138 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 1139 }
767} 1140}
768#endif 1141#endif
769 1142
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void
1145rxvt_term::cont_scroll_cb (time_watcher &w)
1146{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1149 {
1150 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1152 }
1153}
1154#endif
1155
1156#ifdef SELECTION_SCROLLING
1157void
1158rxvt_term::sel_scroll_cb (time_watcher &w)
1159{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165 }
1166}
1167#endif
1168
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void
1171rxvt_term::slip_wheel_cb (time_watcher &w)
1172{
1173 if (mouse_slip_wheel_speed == 0
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182 }
1183}
1184#endif
1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
770bool 1211bool
771rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
772{ 1213{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1215
1216 if (CBUFSIZ == n)
1217 {
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1219 n = 0;
1220 }
774 1221
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
778 1225
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
780 1227
781 if (n > 0) 1228 if (r > 0)
782 { 1229 {
783 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
784 return true; 1231 return true;
785 } 1232 }
786 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
787 destroy (); 1245 destroy ();
1246 }
788 1247
789 return false; 1248 return false;
790} 1249}
791 1250
792void 1251void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
794{ 1253{
795 SET_R (this); 1254 make_current ();
796 SET_LOCALE (locale); 1255
1256 if (revents & EVENT_READ)
1257 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ())
1259 if (cmd_parse ())
1260 break;
797 1261
798 if (revents & EVENT_WRITE) 1262 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1263 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} 1264}
916 1265
917// read the next character, currently handles UTF-8 1266void
918// will probably handle all sorts of other stuff in the future 1267rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1268{
922 while (cmdbuf_ptr < cmdbuf_endp) 1269 XDefineCursor (dpy, vt, TermWin_cursor);
923 { 1270 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1271
927 wchar_t wc; 1272#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1273 hidden_pointer = 0;
929 1274
930 if (len == (size_t)-2) 1275 if (option (Opt_pointerBlank))
931 return NOCHAR; 1276 pointer_ev.start (NOW + pointerBlankDelay);
932 1277#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} 1278}
965 1279
966#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
967void 1281void
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 () 1282rxvt_term::pointer_blank ()
981{ 1283{
982 if (! (Options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
983 return; 1285 return;
984 1286
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
986 XFlush (display->display); 1288 XFlush (dpy);
987 1289
988 hidden_pointer = 1; 1290 hidden_pointer = 1;
989} 1291}
990 1292
991void 1293void
992rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
993{ 1295{
994 SET_R (this); 1296 make_current ();
995 SET_LOCALE (locale);
996 1297
997 pointer_blank (); 1298 pointer_blank ();
998} 1299}
999#endif 1300#endif
1000 1301
1001void 1302void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1303rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1304{
1004 int button_number, key_state = 0; 1305 int button_number, key_state = 0;
1005 int x, y; 1306 int x, y;
1006 1307
1007 x = ev.x; 1308 x = ev.x;
1008 y = ev.y; 1309 y = ev.y;
1009 pixel_position (&x, &y); 1310 pixel_position (&x, &y);
1010 1311
1011 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1313 button_number = 3;
1014 }
1015 else 1314 else
1016 { 1315 {
1017 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1318 if (button_number >= 3)
1020 button_number += (64 - 3); 1319 button_number += (64 - 3);
1021 } 1320 }
1022 1321
1023 if (PrivateModes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1024 { 1323 {
1025 /* 1324 /*
1026 * do not report ButtonRelease 1325 * do not report ButtonRelease
1027 * no state info allowed 1326 * no state info allowed
1028 */ 1327 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1342 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1343 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1344#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1345 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1346#endif
1048
1049 } 1347 }
1050 1348
1051#ifdef DEBUG_MOUSEREPORT 1349#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1350 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1351 if (key_state & 16)
1054 fputc ('C', stderr); 1352 fputc ('C', stderr);
1055 if (key_state & 4) 1353 if (key_state & 4)
1056 fputc ('S', stderr); 1354 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1358 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1360 button_number,
1063 x + 1, 1361 x + 1,
1064 y + 1); 1362 y + 1);
1065#else 1363#endif
1364
1066 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1068 (32 + x + 1), 1367 (32 + x + 1),
1069 (32 + y + 1)); 1368 (32 + y + 1));
1070#endif
1071} 1369}
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 1370
1083/*{{{ process an X event */ 1371/*{{{ process an X event */
1084void 1372void
1085rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1086{ 1374{
1087 SET_R (this); 1375 make_current ();
1088 SET_LOCALE (locale);
1089 1376
1090#if defined(CURSOR_BLINK) 1377 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 1378
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
1100 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1101#endif 1381 && 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; 1382 return;
1120#endif
1121 1383
1384 // for XQueryPointer
1122 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1387 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 1388
1175 switch (ev.type) 1389 switch (ev.type)
1176 { 1390 {
1177 case KeyPress: 1391 case KeyPress:
1178 lookup_key (ev.xkey); 1392 key_press (ev.xkey);
1179 break; 1393 break;
1180 1394
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1395 case KeyRelease:
1183 { 1396 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; 1397 break;
1195 }
1196#endif
1197 1398
1198 case ButtonPress: 1399 case ButtonPress:
1199 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1200 break; 1401 break;
1201 1402
… …
1203 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1204 break; 1405 break;
1205 1406
1206 case ClientMessage: 1407 case ClientMessage:
1207 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !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 { 1410 {
1217 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1218 Atom ActualType; 1412 {
1219 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1220 unsigned char *data; 1414 {
1221 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1222 1416 {
1223 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1224 xa[XA_DNDSELECTION], 1418 destroy ();
1225 0L, 1000000L, 1419 }
1226 False, AnyPropertyType, 1420#if ENABLE_EWMH
1227 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1228 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1229 &data); 1424 &ev);
1230 XChangeProperty (display->display, display->root, 1425#endif
1231 XA_CUT_BUFFER0, XA_STRING, 1426 }
1232 8, PropModeReplace, 1427 }
1233 data, STRLEN (data)); 1428#if ENABLE_XEMBED
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1236 } 1437 }
1237#endif /* OFFIX_DND */
1238 break;
1239
1240 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping));
1242 break; 1438 break;
1243 1439
1244 /* 1440 /*
1245 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1265 break; 1461 break;
1266 } 1462 }
1267 break; 1463 break;
1268 1464
1269 case FocusIn: 1465 case FocusIn:
1270 if (!TermWin.focus) 1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1469 focus_in ();
1470 break;
1471
1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1476 focus_out ();
1477 break;
1478
1479 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0])
1271 { 1481 {
1272 TermWin.focus = 1; 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1273 want_refresh = 1; 1483 ;
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 1484
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 {
1487 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1497 }
1498
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 check_our_parents ();
1504#endif
1283 } 1505 }
1284 break; 1506 break;
1285 1507
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: 1508 case PropertyNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1306 { 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1307 int height, width; 1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1308 1513
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; 1514 break;
1339 1515
1340 case SelectionClear: 1516 case SelectionClear:
1341 display->set_selection_owner (0); 1517 selection_clear ();
1342 break; 1518 break;
1343 1519
1344 case SelectionNotify: 1520 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1521 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1523 break;
1349 1524
1350 case SelectionRequest: 1525 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1352 break; 1527 break;
1353 1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break;
1536
1354 case UnmapNotify: 1537 case UnmapNotify:
1355 TermWin.mapped = 0; 1538 mapped = 0;
1356#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1357 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1358#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1359 break; 1543 break;
1360 1544
1361 case MapNotify:
1362 TermWin.mapped = 1;
1363#ifdef TEXT_BLINK
1364 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1365#endif
1366 break;
1367
1368#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1369 case ReparentNotify: 1546 case ReparentNotify:
1370 rootwin_cb (ev); 1547 rootwin_cb (ev);
1371 break; 1548 break;
1372#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1373 1550
1374 case GraphicsExpose: 1551 case GraphicsExpose:
1375 case Expose: 1552 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == vt)
1377 { 1554 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1555 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1559
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1565
1386 // ev.xexpose.width, TermWin.height, False);
1387#endif
1388 want_refresh = 1; 1566 want_refresh = 1;
1389 } 1567 }
1390 else 1568 else
1391 { 1569 {
1392 XEvent unused_event; 1570 XEvent unused_event;
1393 1571
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1395 Expose, 1573 ;
1396 &unused_event)) ; 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1575 ;
1398 GraphicsExpose, 1576
1399 &unused_event)) ;
1400 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1401 { 1578 {
1402 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1403 scrollbar_show (0); 1580 scrollbar_show (0);
1404 } 1581 }
1405#ifdef MENUBAR 1582
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1583#ifdef ENABLE_TRANSPARENCY
1407 menubar_expose (); 1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1408#endif 1586#endif
1409 } 1587 }
1410 break; 1588 break;
1411 1589
1412 case MotionNotify: 1590 case MotionNotify:
1413#ifdef POINTER_BLANK 1591#ifdef POINTER_BLANK
1414 if (hidden_pointer) 1592 if (hidden_pointer)
1415 pointer_unblank (); 1593 pointer_unblank ();
1416#endif 1594#endif
1417#if MENUBAR 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1418 if (isMenuBarWindow (ev.xany.window)) 1596 break;
1597
1598 if (ev.xany.window == vt)
1419 { 1599 {
1420 menubar_control (& (ev.xbutton)); 1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1421 break; 1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1422 } 1602 ; // 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))) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1604 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1432 ; 1606 ;
1433 1607
1434 XQueryPointer (display->display, TermWin.vt, 1608 XQueryPointer (dpy, vt,
1435 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1611 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1612 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1614 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1615 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1616 {
1443#endif 1617#endif
1618#if ISO_14755
1619 // 5.4
1620 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1621 {
1622 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1623 break;
1624 }
1625#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1626 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1627 ev.xbutton.state & Button3Mask ? 2 : 0);
1628
1446#ifdef SELECTION_SCROLLING 1629#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1630 if (ev.xbutton.y < int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1631 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1449 { 1632 {
1450 int dist; 1633 int dist;
1451
1452 pending_scroll_selection=1;
1453 1634
1454 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1456 */ 1637 */
1457 if (scroll_selection_delay<=0) 1638 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1639 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1640
1460 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1462 */ 1643 */
1463 selection_save_x=ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1645 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1646 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1647
1468 /* calc number of lines to scroll */ 1648 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1649 if (ev.xbutton.y < int_bwidth)
1470 { 1650 {
1471 scroll_selection_dir = UP; 1651 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1473 } 1653 }
1474 else 1654 else
1475 { 1655 {
1476 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y - 1657 dist = ev.xbutton.y - (int_bwidth + height);
1478 (TermWin.int_bwidth + TermWin.height);
1479 } 1658 }
1659
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1660 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1;
1482 MIN_IT (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1484 } 1665 }
1485 else 1666 else
1486 { 1667 {
1487 /* we are within the text window, so we 1668 /* we are within the text window, so we
1488 * shouldn't be scrolling 1669 * shouldn't be scrolling
1489 */ 1670 */
1490 pending_scroll_selection = 0; 1671 if (sel_scroll_ev.active)
1672 sel_scroll_ev.stop();
1491 } 1673 }
1492#endif 1674#endif
1493#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1494
1495 } 1676 }
1496#endif 1677#endif
1497
1498 } 1678 }
1499 } 1679 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1681 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1503 MotionNotify, &ev)) ; 1683 MotionNotify, &ev))
1684 ;
1685
1504 XQueryPointer (display->display, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1505 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1689 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1690 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1692 scrollbar_size ());
1511 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1693 want_refresh = 1;
1513 scrollbar_show (1); 1694 scrollbar_show (1);
1514 } 1695 }
1515 break; 1696 break;
1516 } 1697 }
1517}
1518 1698
1699#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1709 }
1710#endif
1711
1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 {
1715 if (ev.type == MotionNotify
1716 || ev.type == ButtonPress
1717 || ev.type == ButtonRelease)
1718 if (hidden_pointer)
1719 pointer_unblank ();
1720
1721 if (ev.type == KeyPress && hidden_pointer == 0)
1722 pointer_blank ();
1723 }
1724#endif
1725}
1726
1727void
1728rxvt_term::focus_in ()
1729{
1730 if (!focus)
1731 {
1732 focus = 1;
1733 want_refresh = 1;
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1736
1737#if USE_XIM
1738 if (Input_Context != NULL)
1739 {
1740 IMSetPosition ();
1741 XSetICFocus (Input_Context);
1742 }
1743#endif
1744#if CURSOR_BLINK
1745 if (option (Opt_cursorBlink))
1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1747#endif
1748#if OFF_FOCUS_FADING
1749 if (rs[Rs_fade])
1750 {
1751 pix_colors = pix_colors_focused;
1752 scr_recolour ();
1753 }
1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1768 }
1769}
1770
1771void
1772rxvt_term::focus_out ()
1773{
1774 if (focus)
1775 {
1776 focus = 0;
1777 want_refresh = 1;
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780
1781#if ENABLE_FRILLS || ISO_14755
1782 if (iso14755buf)
1783 {
1784 iso14755buf = 0;
1785# if ISO_14755
1786 scr_overlay_off ();
1787# endif
1788 }
1789#endif
1790#if USE_XIM
1791 if (Input_Context != NULL)
1792 XUnsetICFocus (Input_Context);
1793#endif
1794#if CURSOR_BLINK
1795 if (option (Opt_cursorBlink))
1796 cursor_blink_ev.stop ();
1797 hidden_cursor = 0;
1798#endif
1799#if OFF_FOCUS_FADING
1800 if (rs[Rs_fade])
1801 {
1802 pix_colors = pix_colors_unfocused;
1803 scr_recolour ();
1804 }
1805#endif
1806 }
1807}
1808
1809void
1810rxvt_term::update_fade_color (unsigned int idx)
1811{
1812#if OFF_FOCUS_FADING
1813 if (rs[Rs_fade])
1814 {
1815 rgba c;
1816 pix_colors [Color_fade].get (c);
1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1818 }
1819#endif
1820}
1821
1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1519void 1823void
1520rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1825{
1522 SET_R (this); 1826 make_current ();
1523 SET_LOCALE (locale);
1524 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1525 switch (ev.type) 1833 switch (ev.type)
1526 { 1834 {
1527 case PropertyNotify: 1835 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 /* 1836 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1837 * 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. 1838 * use the property to determine the pixmap. We use it later on.
1540 */ 1839 */
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]) 1840 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1545 return; 1842 return;
1546 }
1547 1843
1548 /* FALLTHROUGH */ 1844 /* FALLTHROUGH */
1549 case ReparentNotify: 1845 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ())
1551 if (am_transparent) 1846 if (option (Opt_transparent))
1552 want_full_refresh = 1; 1847 check_our_parents ();
1553 break; 1848 break;
1849 }
1554#endif 1850# endif
1555 }
1556} 1851}
1852#endif
1557 1853
1558void 1854void
1559rxvt_term::button_press (const XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
1560{ 1856{
1561 int reportmode = 0, clickintime; 1857 int reportmode = 0, clickintime;
1562 1858
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1859 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1860
1564 if (!bypass_keystate) 1861 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1862 reportmode = !! (priv_modes & PrivMode_mouse_report);
1863
1566 /* 1864 /*
1567 * VT window processing of button press 1865 * VT window processing of button press
1568 */ 1866 */
1569 if (ev.window == TermWin.vt) 1867 if (ev.window == vt)
1570 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1872#if ISO_14755
1873 // 5.4
1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1875 {
1876 iso14755_54 (ev.x, ev.y);
1877 return;
1878 }
1879#endif
1880
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1882
1572 if (reportmode) 1883 if (reportmode)
1573 { 1884 {
1574 /* mouse report from vt window */ 1885 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1577#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1578 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1579 { 1890 {
1580 /* same button, within alloted time */ 1891 /* same button, within alloted time */
1581 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1582 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1583 { 1895 {
1584 /* only report double clicks */ 1896 /* only report double clicks */
1585 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1586 mouse_report (ev); 1898 mouse_report (ev);
… …
1605 } 1917 }
1606 else 1918 else
1607 { 1919 {
1608 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1922
1610 switch (ev.button) 1923 switch (ev.button)
1611 { 1924 {
1612 case Button1: 1925 case Button1:
1926 /* allow meta + click to select rectangular areas */
1927 /* should be done in screen.C */
1928#if ENABLE_FRILLS
1929 selection.rect = !!(ev.state & ModMetaMask);
1930#else
1931 selection.rect = false;
1932#endif
1933
1613 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1615 { 1936 {
1616 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1618 else 1939 else
1619 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
… …
1634 case Button3: 1955 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1637 else 1958 else
1638 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1960
1639 MEvent.button = Button3; 1961 MEvent.button = Button3;
1640 break; 1962 break;
1641 } 1963 }
1642 } 1964 }
1965
1643 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1644 return; 1967 return;
1645 } 1968 }
1646 1969
1647 /* 1970 /*
… …
1713 upordown = 1; /* down */ 2036 upordown = 1; /* down */
1714 } 2037 }
1715 if (upordown) 2038 if (upordown)
1716 { 2039 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2040#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2041 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 2042#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 2044 {
1722 if (upordown < 0) 2045 if (upordown < 0)
1723 scrollBar.setUp (); 2046 scrollBar.setUp ();
… …
1739 break; 2062 break;
1740 case R_SB_ALIGN_BOTTOM: 2063 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 2064 csrO = scrollBar.bot - scrollBar.top;
1742 break; 2065 break;
1743 } 2066 }
2067
1744 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 2072
1749 scrollBar.setMotion (); 2073 scrollBar.setMotion ();
1750 break; 2074 break;
1751 2075
1752 case Button1: 2076 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1757 case Button3: 2081 case Button3:
1758 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
1759 { 2083 {
1760 if (scrollbar_above_slider (ev.y)) 2084 if (scrollbar_above_slider (ev.y))
1761# ifdef RXVT_SCROLL_FULL 2085# ifdef RXVT_SCROLL_FULL
1762 scr_page (UP, TermWin.nrow - 1); 2086 scr_page (UP, nrow - 1);
1763# else 2087# else
1764 scr_page (UP, TermWin.nrow / 4); 2088 scr_page (UP, nrow / 4);
1765# endif 2089# endif
1766 else if (scrollbar_below_slider (ev.y)) 2090 else if (scrollbar_below_slider (ev.y))
1767# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
1768 scr_page (DN, TermWin.nrow - 1); 2092 scr_page (DN, nrow - 1);
1769# else 2093# else
1770 scr_page (DN, TermWin.nrow / 4); 2094 scr_page (DN, nrow / 4);
1771# endif 2095# endif
1772 else 2096 else
1773 scrollBar.setMotion (); 2097 scrollBar.setMotion ();
1774 } 2098 }
1775 else 2099 else
1776 { 2100 {
1777 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 2102 (nrow
1779 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 2104 / scrollbar_size ()));
1781 } 2105 }
2106
1782 break; 2107 break;
1783 } 2108 }
1784 } 2109 }
2110
1785 return; 2111 return;
1786 } 2112 }
1787#if MENUBAR
1788 /*
1789 * Menubar window processing of button press
1790 */
1791 if (isMenuBarWindow (ev.window))
1792 menubar_control (ev);
1793#endif
1794} 2113}
1795 2114
1796void 2115void
1797rxvt_term::button_release (const XButtonEvent &ev) 2116rxvt_term::button_release (XButtonEvent &ev)
1798{ 2117{
1799 int reportmode = 0; 2118 int reportmode = 0;
1800 2119
1801 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 2121 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 2123
1805 if (scrollbar_isUpDn ()) 2124 if (scrollbar_isUpDn ())
1806 { 2125 {
1807 scrollBar.setIdle (); 2126 scrollBar.setIdle ();
1808 scrollbar_show (0); 2127 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH;
1811#endif
1812
1813 } 2128 }
2129
1814#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 2131 if (sel_scroll_ev.active)
2132 sel_scroll_ev.stop();
1816#endif 2133#endif
2134
1817 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
1818 { 2136 {
2137 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2138 return;
2139
2140#if ISO_14755
2141 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return;
2144#endif
2145
1819 if (reportmode) 2146 if (reportmode)
1820 { 2147 {
1821 /* mouse report from vt window */ 2148 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 2149 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 2150 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 2164 MEvent.button = AnyButton;
1838 mouse_report (ev); 2165 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 2166#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2167 return;
1841 } 2168 }
2169
1842 /* 2170 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2171 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2172 * when overriding mouse reporting
1845 */ 2173 */
1846 if (PrivateModes & PrivMode_mouse_report 2174 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2175 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2176 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2177 selection_extend (ev.x, ev.y, 0);
1850 2178
1851 switch (ev.button) 2179 switch (ev.button)
1852 { 2180 {
1853 case Button1: 2181 case Button1:
1854 case Button3: 2182 case Button3:
1855 selection_make (ev.time); 2183 selection_make (ev.time);
1856 break; 2184 break;
2185
1857 case Button2: 2186 case Button2:
1858 selection_request (ev.time, ev.x, ev.y); 2187 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2188 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1859 break; 2189 break;
2190
1860#ifdef MOUSE_WHEEL 2191#ifdef MOUSE_WHEEL
1861 case Button4: 2192 case Button4:
1862 case Button5: 2193 case Button5:
1863 { 2194 {
1864 int i; 2195 int i;
1865 page_dirn v; 2196 page_dirn v;
1866 2197
1867 v = (ev.button == Button4) ? UP : DN; 2198 v = ev.button == Button4 ? UP : DN;
2199
1868 if (ev.state & ShiftMask) 2200 if (ev.state & ShiftMask)
1869 i = 1; 2201 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2202 else if (option (Opt_mouseWheelScrollPage))
1871 i = TermWin.nrow - 1; 2203 i = nrow - 1;
1872 else 2204 else
1873 i = 5; 2205 i = 5;
2206
1874# ifdef MOUSE_SLIP_WHEELING 2207# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2208 if (ev.state & ControlMask)
1876 { 2209 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2210 mouse_slip_wheel_speed += v ? -1 : 1;
2211 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2212 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2213
2214 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2215 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2216
2217 slip_wheel_ev.start ();
2218 }
2219 else
2220 {
2221# endif
2222 scr_page (v, i);
2223 scrollbar_show (1);
2224# ifdef MOUSE_SLIP_WHEELING
1879 } 2225 }
1880# endif 2226# 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 } 2227 }
1895 break; 2228 break;
1896#endif 2229#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 { 2230 }
1936 pchanged = 1; 2231 }
1937 XSetWindowBackground (display->display, TermWin.vt, 2232}
1938 PixColors[Color_bg]); 2233
1939 am_transparent = am_pixmap_trans = 0; 2234/*}}} */
2235
2236bool
2237rxvt_term::cmd_parse ()
2238{
2239 bool flag = false;
2240 wchar_t ch = NOCHAR;
2241 char *seq_begin; // remember start of esc-sequence here
2242
2243 for (;;)
2244 {
2245 if (ch == NOCHAR)
1940 } 2246 {
1941 return pchanged; /* Don't try any more */ 2247 seq_begin = cmdbuf_ptr;
1942 } 2248 ch = next_char ();
1943 2249
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2250 if (ch == NOCHAR)
1945 XSync (display->display, False); 2251 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 { 2252 }
1983 nw += sx; 2253
1984 nx = -sx; 2254 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1985 sx = 0;
1986 } 2255 {
1987 if (sy < 0) 2256 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 { 2257 {
2005 pchanged = 1; 2258 seen_input = 1;
2006 if (TermWin.pixmap != None) 2259 // many badly-written programs (e.g. jed) contain a race condition:
2260 // they first read the screensize and then install a SIGWINCH handler.
2261 // some window managers resize the window early, and these programs
2262 // then sometimes get the size wrong.
2263 // unfortunately other programs are even more buggy and dislike
2264 // being sent SIGWINCH, so only do it when we were in fact being
2265 // resized.
2266 if (seen_resize && cmd_pid)
2267 kill (-cmd_pid, SIGWINCH);
2268 }
2269
2270 /* Read a text string from the input buffer */
2271 wchar_t buf[UBUFSIZ];
2272 bool refreshnow = false;
2273 int nlines = 0;
2274 wchar_t *str = buf;
2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2276
2277 for (;;)
2278 {
2279 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2280 break;
2281
2282 *str++ = ch;
2283
2284 if (ch == C0_LF || str >= eol)
2007 { 2285 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2286 if (ch == C0_LF)
2009 TermWin.pixmap = None; 2287 nlines++;
2288
2289 refresh_count++;
2290
2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2292 {
2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2296 {
2297 refreshnow = true;
2298 ch = NOCHAR;
2299 break;
2300 }
2301 }
2302
2303 // scr_add_lines only works for nlines <= nrow - 1.
2304 if (nlines >= nrow - 1)
2305 {
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2308 scr_add_lines (buf, str - buf, nlines);
2309
2310 nlines = 0;
2311 str = buf;
2312 eol = str + min (ncol, UBUFSIZ);
2313 }
2314
2315 if (str >= eol)
2316 {
2317 if (eol >= buf + UBUFSIZ)
2318 {
2319 ch = NOCHAR;
2320 break;
2321 }
2322 else
2323 eol = min (eol + ncol, buf + UBUFSIZ);
2324 }
2325
2010 } 2326 }
2327
2328 seq_begin = cmdbuf_ptr;
2329 ch = next_char ();
2011 } 2330 }
2012 am_pixmap_trans = 0; 2331
2332 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2334 scr_add_lines (buf, str - buf, nlines);
2335
2336 /*
2337 * If there have been a lot of new lines, then update the screen
2338 * What the heck we'll cheat and only refresh less than every page-full.
2339 * if skipScroll is enabled.
2340 */
2341 if (refreshnow)
2342 {
2343 flag = true;
2344 scr_refresh ();
2345 want_refresh = 1;
2346 }
2347
2013 } 2348 }
2014 else 2349 else
2015 { 2350 {
2016 if (TermWin.pixmap != None) 2351 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 { 2352 {
2052 if (oldp != None) 2353 process_nonprinting (ch);
2053 pchanged = 1; 2354 }
2355 catch (const class out_of_input &o)
2356 {
2357 // we ran out of input, retry later
2358 cmdbuf_ptr = seq_begin;
2054 break; 2359 break;
2055 } 2360 }
2056 if (oldp != TermWin.parent[i]) 2361
2057 pchanged = 1; 2362 ch = NOCHAR;
2058 }
2059 n = 0;
2060 if (pchanged)
2061 { 2363 }
2062 for (; n < (unsigned int)i; n++) 2364 }
2063 { 2365
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2366 return flag;
2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2367}
2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2368
2067 { 2369// read the next character
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2370wchar_t
2069 break; 2371rxvt_term::next_char () NOTHROW
2070 } 2372{
2071 } 2373 while (cmdbuf_ptr < cmdbuf_endp)
2374 {
2375 // assume 7-bit to be ascii ALWAYS
2376 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2377 return *cmdbuf_ptr++;
2378
2379 wchar_t wc;
2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2381
2382 if (len == (size_t)-2)
2072 } 2383 {
2073 if (n > (int) (sizeof (TermWin.parent) 2384 // the mbstate stores incomplete sequences. didn't know this :/
2074 / sizeof (TermWin.parent[0]))) 2385 cmdbuf_ptr = cmdbuf_endp;
2386 break;
2075 { 2387 }
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 2388
2091 rqt.tv_sec = 1; 2389 if (len == (size_t)-1)
2092 rqt.tv_nsec = 0; 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2093 nanosleep (&rqt, NULL); 2391
2094# else 2392 // assume wchar == unicode
2095 sleep (1); 2393 cmdbuf_ptr += len;
2096# endif 2394 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 } 2395 }
2396
2397 return NOCHAR;
2398}
2399
2400// read the next octet
2401uint32_t
2402rxvt_term::next_octet () NOTHROW
2403{
2404 return cmdbuf_ptr < cmdbuf_endp
2405 ? (unsigned char)*cmdbuf_ptr++
2406 : NOCHAR;
2407}
2408
2409static class out_of_input out_of_input;
2410
2411/* rxvt_cmd_getc () - Return next input character */
2412/*
2413 * Return the next input character after first passing any keyboard input
2414 * to the command.
2415 */
2416wchar_t
2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2418{
2419 wchar_t c = next_char ();
2420
2421 if (c == NOCHAR)
2422 throw out_of_input;
2423
2108 return pchanged; 2424 return c;
2109} 2425}
2110#endif
2111 2426
2112/*}}} */ 2427uint32_t
2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2429{
2430 uint32_t c = next_octet ();
2431
2432 if (c == NOCHAR)
2433 throw out_of_input;
2434
2435 return c;
2436}
2113 2437
2114/*{{{ print pipe */ 2438/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2117FILE * 2441FILE *
2118rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2119{ 2443{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2444 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2445
2122 if (stream == NULL) 2446 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2448
2124 return stream; 2449 return stream;
2125} 2450}
2126 2451
2127int 2452int
2128rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2129{ 2454{
2130 fflush (stream); 2455 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); 2456 return pclose (stream);
2137# endif
2138} 2457}
2139 2458
2140/* 2459/*
2141 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2142 */ 2461 */
2143void 2462void
2144rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2145{ 2464{
2146 int done; 2465 int done;
2147 FILE *fd; 2466 FILE *fd;
2148 2467
2149 if ((fd = popen_printer ()) == NULL) 2468 if ((fd = popen_printer ()) == NULL)
2150 return; 2469 return;
2151 2470
2152 /* 2471 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2472 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2473 * is received.
2155 */ 2474 */
2156 for (done = 0; !done;) 2475 for (done = 0; !done;)
2157 { 2476 {
2158 unsigned char buf[8]; 2477 unsigned char buf[8];
2159 unsigned char ch; 2478 unicode_t ch;
2160 unsigned int i, len; 2479 unsigned int i, len;
2161 2480
2162 if ((ch = cmd_getc ()) != C0_ESC) 2481 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2482 {
2164 if (putc (ch, fd) == EOF) 2483 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2484 break; /* done = 1 */
… …
2180 { 2499 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2500 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2501 break; /* done = 1 */
2183 } 2502 }
2184 } 2503 }
2504
2185 for (i = 0; i < len; i++) 2505 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2506 if (putc (buf[i], fd) == EOF)
2187 { 2507 {
2188 done = 1; 2508 done = 1;
2189 break; 2509 break;
2190 } 2510 }
2191 } 2511 }
2192 } 2512 }
2513
2193 pclose_printer (fd); 2514 pclose_printer (fd);
2194} 2515}
2195#endif /* PRINTPIPE */ 2516#endif /* PRINTPIPE */
2196/*}}} */ 2517/*}}} */
2197 2518
2198/* *INDENT-OFF* */ 2519/* *INDENT-OFF* */
2199enum { 2520enum {
2200 C1_40 = 0x40, 2521 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2522 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, 2523 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, 2524 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 2525 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2526};
2206/* *INDENT-ON* */ 2527/* *INDENT-ON* */
2207 2528
2208/*{{{ process non-printing single characters */ 2529/*{{{ process non-printing single characters */
2209void 2530void
2210rxvt_term::process_nonprinting (unsigned char ch) 2531rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2532{
2212 switch (ch) 2533 switch (ch)
2213 { 2534 {
2535 case C0_ESC:
2536 process_escape_seq ();
2537 break;
2214 case C0_ENQ: /* terminal Status */ 2538 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2539 if (rs[Rs_answerbackstring])
2216 tt_write ( 2540 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 2541 else
2220 tt_write ((unsigned char *)VT100_ANS, 2542 tt_write (VT100_ANS, strlen (VT100_ANS));
2221 (unsigned int)STRLEN (VT100_ANS));
2222 break; 2543 break;
2223 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2224 scr_bell (); 2545 scr_bell ();
2225 break; 2546 break;
2226 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2562 scr_charset_choose (1);
2242 break; 2563 break;
2243 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2565 scr_charset_choose (0);
2245 break; 2566 break;
2567
2568#ifdef EIGHT_BIT_CONTROLS
2569 // 8-bit controls
2570 case 0x90: /* DCS */
2571 process_dcs_seq ();
2572 break;
2573 case 0x9b: /* CSI */
2574 process_csi_seq ();
2575 break;
2576 case 0x9d: /* OSC */
2577 process_osc_seq ();
2578 break;
2579#endif
2246 } 2580 }
2247} 2581}
2248/*}}} */ 2582/*}}} */
2249 2583
2250 2584
2251/*{{{ process VT52 escape sequences */ 2585/*{{{ process VT52 escape sequences */
2252void 2586void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2587rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2588{
2255 int row, col; 2589 int row, col;
2256 2590
2257 switch (ch) 2591 switch (ch)
2258 { 2592 {
… …
2310 2644
2311/*{{{ process escape sequences */ 2645/*{{{ process escape sequences */
2312void 2646void
2313rxvt_term::process_escape_seq () 2647rxvt_term::process_escape_seq ()
2314{ 2648{
2315 unsigned char ch = cmd_getc (); 2649 unicode_t ch = cmd_getc ();
2316 2650
2317 if (PrivateModes & PrivMode_vt52) 2651 if (priv_modes & PrivMode_vt52)
2318 { 2652 {
2319 process_escape_vt52 (ch); 2653 process_escape_vt52 (ch);
2320 return; 2654 return;
2321 } 2655 }
2322 2656
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2672 break;
2339 case '+': 2673 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 2675 break;
2342#ifdef MULTICHAR_SET 2676#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': 2677 case '6':
2349 scr_backindex (); 2678 scr_backindex ();
2350 break; 2679 break;
2351#endif 2680#endif
2352 case '7': 2681 case '7':
2353 scr_cursor (SAVE); 2682 scr_cursor (SAVE);
2354 break; 2683 break;
2355 case '8': 2684 case '8':
2356 scr_cursor (RESTORE); 2685 scr_cursor (RESTORE);
2357 break; 2686 break;
2358#ifndef NO_FRILLS 2687#if !ENABLE_MINIMAL
2359 case '9': 2688 case '9':
2360 scr_forwardindex (); 2689 scr_forwardindex ();
2361 break; 2690 break;
2362#endif 2691#endif
2363 case '=': 2692 case '=':
… …
2373 break; 2702 break;
2374 2703
2375 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2377 { 2706 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 2707 wchar_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2380 } 2709 }
2381 break; 2710 break;
2382 2711
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
2384 case C1_ESA: /* ESC G */ 2713 case C1_ESA: /* ESC G */
… …
2394 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2395 scr_index (DN); 2724 scr_index (DN);
2396 break; 2725 break;
2397 2726
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2400 2729
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2403 2732
2404 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 2735 process_dcs_seq ();
2407 break; 2736 break;
2408 2737
2409 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2410 case C1_SCI: /* ESC Z */ 2739 case C1_SCI: /* ESC Z */
2411 tt_write ((const unsigned char *)ESCZ_ANSWER, 2740 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2412 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2413 break; /* steal obsolete ESC [ c */ 2741 break; /* steal obsolete ESC [ c */
2414 2742
2415 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2416 case C1_CSI: /* ESC [ */ 2744 case C1_CSI: /* ESC [ */
2417 process_csi_seq (); 2745 process_csi_seq ();
… …
2422 process_osc_seq (); 2750 process_osc_seq ();
2423 break; 2751 break;
2424 2752
2425 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2427 scr_poweron (); 2756 scr_poweron ();
2428 scrollbar_show (1); 2757 scrollbar_show (1);
2429 break; 2758 break;
2430 2759
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 2772
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2446enum { 2775enum {
2447 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 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 , 2778 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, 2779 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, 2780 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, 2781 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, 2782 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, */ 2797 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, [, \, ], ^, _, */ 2798 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, */ 2799 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, */ 2800 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, */ 2801 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, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 2803 };
2475/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2476 2805
2477void 2806void
2478rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
2479{ 2808{
2480 unsigned char ch, priv, i; 2809 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 2810 unsigned int nargs, p;
2482 int n, ndef; 2811 int n, ndef;
2483 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2484 2813
2485 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
2486 arg[--nargs] = 0; 2815 nargs = 0;
2487 2816
2488 priv = 0; 2817 priv = 0;
2489 ch = cmd_getc (); 2818 ch = cmd_getc ();
2490 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
2492 priv = ch; 2821 priv = ch;
2493 ch = cmd_getc (); 2822 ch = cmd_getc ();
2494 } 2823 }
2824
2495 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2497 { 2827 {
2498 if (isdigit (ch)) 2828 if (isdigit (ch))
2499 { 2829 {
… …
2506 { 2836 {
2507 if (nargs < ESC_ARGS) 2837 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 2838 arg[nargs++] = n;
2509 n = -1; 2839 n = -1;
2510 } 2840 }
2511 else if (ch == '\b') 2841 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); 2842 process_nonprinting (ch);
2523 } 2843
2524 ch = cmd_getc (); 2844 ch = cmd_getc ();
2525 } 2845 }
2526 2846
2527 if (ch > CSI_7F) 2847 if (ch > CSI_7F)
2528 return; 2848 return;
… …
2534 ndef = get_byte_array_bit (csi_defaults, i); 2854 ndef = get_byte_array_bit (csi_defaults, i);
2535 for (p = 0; p < nargs; p++) 2855 for (p = 0; p < nargs; p++)
2536 if (arg[p] == -1) 2856 if (arg[p] == -1)
2537 arg[p] = ndef; 2857 arg[p] = ndef;
2538 2858
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 /* 2859 /*
2547 * private mode handling 2860 * private mode handling
2548 */ 2861 */
2549 if (priv) 2862 if (priv)
2550 { 2863 {
2551 switch (priv) 2864 switch (priv)
2552 { 2865 {
2553 case '>': 2866 case '>':
2554 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
2868 {
2869 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2871 //
2872 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2873 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2874 // that we do not support xterm mouse reporting (should be 95 when we do).
2875 //
2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2876 tt_printf ("\033[>%d;94;0c", 'U');
2877 }
2556 break; 2878 break;
2557 case '?': 2879 case '?':
2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2559 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2560 break; 2882 break;
… …
2665 2987
2666 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2988 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2667 arg[0] = -arg[0]; 2989 arg[0] = -arg[0];
2668 /* FALLTHROUGH */ 2990 /* FALLTHROUGH */
2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2991 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2992 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2671 break; 2993 break;
2672 2994
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2995 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 2996 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2675 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 2997 break;
2677 2998
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3000 process_sgr_mode (nargs, arg);
2680 break; 3001 break;
… …
2686 tt_printf ("\033[0n"); 3007 tt_printf ("\033[0n");
2687 break; 3008 break;
2688 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2689 scr_report_position (); 3010 scr_report_position ();
2690 break; 3011 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (option (Opt_insecure))
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3015 break;
2695#endif
2696 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3018 break;
2699 } 3019 }
2700 break; 3020 break;
2701 3021
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3055 break;
2736 3056
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3057 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3058 if (arg[0] == 4)
2739 scr_insert_mode (0); 3059 scr_insert_mode (0);
3060 else if (arg[0] == 20)
3061 priv_modes &= ~PrivMode_LFNL;
2740 break; 3062 break;
2741 3063
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3064 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3065 if (arg[0] == 4)
2744 scr_insert_mode (1); 3066 scr_insert_mode (1);
3067 else if (arg[0] == 20)
3068 priv_modes |= PrivMode_LFNL;
2745 break; 3069 break;
2746 3070
2747 /* 3071 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3072 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3073 */
… …
2761 break; 3085 break;
2762 case CSI_75: 3086 case CSI_75:
2763 scr_cursor (RESTORE); 3087 scr_cursor (RESTORE);
2764 break; 3088 break;
2765 3089
2766#ifndef NO_FRILLS 3090#if !ENABLE_MINIMAL
2767 case CSI_74: 3091 case CSI_74:
2768 process_window_ops (arg, nargs); 3092 process_window_ops (arg, nargs);
2769 break; 3093 break;
2770#endif 3094#endif
2771 3095
2772 case CSI_78: /* DECREQTPARM */ 3096 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3097 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3098 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3099 break;
2776 3100
2777 default: 3101 default:
2778 break; 3102 break;
2779 } 3103 }
2780} 3104}
2781/*}}} */ 3105/*}}} */
2782 3106
2783#ifndef NO_FRILLS 3107#if !ENABLE_MINIMAL
2784/* ARGSUSED */ 3108/* ARGSUSED */
2785void 3109void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3110rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3111{
2788 int x, y; 3112 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3113 XWindowAttributes wattr;
2793 Window wdummy; 3114 Window wdummy;
3115
3116 dLocal (Display *, dpy);
2794 3117
2795 if (nargs == 0) 3118 if (nargs == 0)
2796 return; 3119 return;
3120
2797 switch (args[0]) 3121 switch (args[0])
2798 { 3122 {
2799 /* 3123 /*
2800 * commands 3124 * commands
2801 */ 3125 */
2802 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3127 XMapWindow (dpy, parent[0]);
2804 break; 3128 break;
2805 case 2: /* iconify window */ 3129 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3130 XIconifyWindow (dpy, parent[0], display->screen);
2807 DefaultScreen (display->display));
2808 break; 3131 break;
2809 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent[0], args[1], args[2]);
2811 break; 3134 break;
2812 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2814 break; 3137 break;
2815 case 5: /* raise window */ 3138 case 5: /* raise window */
2816 XRaiseWindow (display->display, TermWin.parent[0]); 3139 XRaiseWindow (dpy, parent[0]);
2817 break; 3140 break;
2818 case 6: /* lower window */ 3141 case 6: /* lower window */
2819 XLowerWindow (display->display, TermWin.parent[0]); 3142 XLowerWindow (dpy, parent[0]);
2820 break; 3143 break;
2821 case 7: /* refresh window */ 3144 case 7: /* refresh window */
2822 scr_touch (true); 3145 scr_touch (true);
2823 break; 3146 break;
2824 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3148 set_widthheight ((unsigned int) (args[2] * fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3149 (unsigned int) (args[1] * fheight));
2827 break; 3150 break;
3151
3152 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3153 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3154 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3155 set_widthheight ((unsigned int)width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3156 (unsigned int) (args[1] * fheight));
2832 break; 3157 break;
3158
2833 /* 3159 /*
2834 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
2835 */ 3161 */
2836 case 11: /* report window state */ 3162 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3165 break;
2840 case 13: /* report window position */ 3166 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3172 break;
2847 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3176 break;
3177 case 18: /* report text area size (chars) */
3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3179 break;
2851 case 18: /* report window size (chars) */ 3180 case 19: /* report window size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2853 break; 3182 break;
2854#if 0 /* XXX: currently disabled due to security concerns */
2855 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3184 {
3185 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3186 XGetIconName (dpy, parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3188 XFree (s);
3189 }
2858 break; 3190 break;
2859 case 21: /* report window title */ 3191 case 21: /* report window title */
3192 {
3193 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3194 XFetchName (dpy, parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s);
3197 }
2862 break; 3198 break;
2863#endif
2864
2865 } 3199 }
2866} 3200}
2867#endif 3201#endif
2868 3202
2869/*----------------------------------------------------------------------*/ 3203/*----------------------------------------------------------------------*/
2870/* 3204/*
2871 * get input up until STRING TERMINATOR (or BEL) 3205 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3206 * ends_how is terminator used. returned input must be free()'d
2873 */ 3207 */
2874unsigned char * 3208char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3209rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3210{
2877 int seen_esc = 0; /* seen escape? */ 3211 unicode_t ch;
3212 bool seen_esc = false;
2878 unsigned int n = 0; 3213 unsigned int n = 0;
2879 unsigned char *s; 3214 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3215
2882 for (; (ch = cmd_getc ());) 3216 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3217 {
2884 if (ch == C0_BEL 3218 if (seen_esc)
2885 || ch == CHAR_ST 3219 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3220 if (ch == 0x5c) /* 7bit ST */
2887 break; 3221 break;
3222 else
3223 return NULL;
3224 }
2888 if (ch == C0_ESC) 3225 else if (ch == C0_ESC)
2889 { 3226 {
2890 seen_esc = 1; 3227 seen_esc = true;
2891 continue; 3228 continue;
2892 } 3229 }
3230 else if (ch == C0_BEL || ch == CHAR_ST)
3231 break;
2893 else if (ch == '\t') 3232 else if (ch == C0_SYN)
2894 ch = ' '; /* translate '\t' to space */ 3233 ch = cmd_get8 ();
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3234 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3235 return NULL; /* other control character - exit */
2897 if (n < sizeof (string) - 1) 3236
3237 seen_esc = false;
3238
3239 if (n >= STRING_MAX - 1)
3240 // stop at some sane length
3241 return NULL;
3242
2898 string[n++] = ch; 3243 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3244 }
3245
2901 string[n++] = '\0'; 3246 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3247
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3248 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3249
2906 return s; 3250 return rxvt_wcstombs (string);
2907} 3251}
2908 3252
2909/*----------------------------------------------------------------------*/ 3253/*----------------------------------------------------------------------*/
2910/* 3254/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3256 */
2913void 3257void
2914rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
2915{ 3259{
2916 unsigned char eh, *s; 3260 char *s;
3261 unicode_t eh;
3262
2917 /* 3263 /*
2918 * Not handled yet 3264 * Not handled yet
2919 */ 3265 */
2920 s = get_to_st (&eh); 3266 s = get_to_st (eh);
2921 if (s) 3267 if (s)
2922 free (s); 3268 free (s);
3269
2923 return; 3270 return;
2924} 3271}
2925 3272
2926/*----------------------------------------------------------------------*/ 3273/*----------------------------------------------------------------------*/
2927/* 3274/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3275 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3276 */
2930void 3277void
2931rxvt_term::process_osc_seq () 3278rxvt_term::process_osc_seq ()
2932{ 3279{
2933 unsigned char ch, eh, *s; 3280 unicode_t ch, eh;
2934 int arg; 3281 int arg;
2935 3282
2936 ch = cmd_getc (); 3283 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3284 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3285 arg = arg * 10 + (ch - '0');
2939 3286
2940 if (ch == ';') 3287 if (ch == ';')
2941 { 3288 {
2942 s = get_to_st (&eh); 3289 char *s = get_to_st (eh);
3290
2943 if (s) 3291 if (s)
2944 { 3292 {
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); 3293 process_xterm_seq (arg, s, eh);
2957 free (s); 3294 free (s);
2958 } 3295 }
2959 } 3296 }
2960} 3297}
3298
3299void
3300rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3301{
3302 if (str[0] == '?' && !str[1])
3303 {
3304 rgba c;
3305 pix_colors_focused[color].get (c);
3306
3307#if XFT
3308 if (c.a != rgba::MAX_CC)
3309 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3310 else
3311#endif
3312 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3313 }
3314 else
3315 set_window_color (color, str);
3316}
3317
2961/* 3318/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3319 * 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 */ 3320 */
2983void 3321void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3322rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2985{ 3323{
2986 int changed = 0; 3324 int color;
2987 int color;
2988 char *buf, *name; 3325 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1];
3327 int saveop = op;
3328
3329 dLocal (Display *, dpy);
2989 3330
2990 assert (str != NULL); 3331 assert (str != NULL);
3332
3333 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3334 return;
3335
2991 switch (op) 3336 switch (op)
2992 { 3337 {
2993 case XTerm_name: 3338 case XTerm_name:
2994 set_title (str); 3339 set_title (str);
2995 /* FALLTHROUGH */ 3340 /* FALLTHROUGH */
2996 case XTerm_iconName: 3341 case XTerm_iconName:
2997 set_iconName (str); 3342 set_icon_name (str);
2998 break; 3343 break;
2999 case XTerm_title: 3344 case XTerm_title:
3000 set_title (str); 3345 set_title (str);
3001 break; 3346 break;
3347 case XTerm_property:
3348 if (str[0] == '?')
3349 {
3350 Atom prop = display->atom (str + 1);
3351 Atom actual_type;
3352 int actual_format;
3353 unsigned long nitems;
3354 unsigned long bytes_after;
3355 unsigned char *value = 0;
3356 const char *str = "";
3357
3358 if (prop
3359 && XGetWindowProperty (dpy, parent[0],
3360 prop, 0, 1<<16, 0, AnyPropertyType,
3361 &actual_type, &actual_format,
3362 &nitems, &bytes_after, &value) == Success
3363 && actual_type != None
3364 && actual_format == 8)
3365 str = (const char *)(value);
3366
3367 tt_printf ("\033]%d;%s%c", op, str, resp);
3368
3369 XFree (value);
3370 }
3371 else
3372 {
3373 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3374
3375 if (eq)
3376 {
3377 *eq = 0;
3378 set_utf8_property (display->atom (str), eq + 1);
3379 }
3380 else
3381 XDeleteProperty (dpy, parent[0],
3382 display->atom (str));
3383 }
3384 break;
3385
3002 case XTerm_Color: 3386 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3387 for (buf = (char *)str; buf && *buf;)
3004 { 3388 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3389 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3390 break;
3391
3007 *name++ = '\0'; 3392 *name++ = '\0';
3008 color = atoi (buf); 3393 color = atoi (buf) + minCOLOR;
3009 if (color < 0 || color >= TOTAL_COLORS) 3394
3395 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3010 break; 3396 break;
3397
3011 if ((buf = STRCHR (name, ';')) != NULL) 3398 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3399 *buf++ = '\0';
3013 set_window_color (color + minCOLOR, name); 3400
3401 process_color_seq (op, color, name, resp);
3014 } 3402 }
3403 break;
3404 case XTerm_Color00:
3405 process_color_seq (op, Color_fg, str, resp);
3406 break;
3407 case XTerm_Color01:
3408 process_color_seq (op, Color_bg, str, resp);
3015 break; 3409 break;
3016#ifndef NO_CURSORCOLOR 3410#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3411 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3412 process_color_seq (op, Color_cursor, str, resp);
3019 break; 3413 break;
3020#endif 3414#endif
3021 case XTerm_Color_pointer: 3415 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3416 process_color_seq (op, Color_pointer_fg, str, resp);
3417 break;
3418 case XTerm_Color_pointer_bg:
3419 process_color_seq (op, Color_pointer_bg, str, resp);
3023 break; 3420 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#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: 3422 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3423 process_color_seq (op, Color_RV, str, resp);
3033 break; 3424 break;
3034#endif 3425 case Rxvt_Color_BD:
3035 3426 case URxvt_Color_BD:
3036 case XTerm_Menu: 3427 process_color_seq (op, Color_BD, str, resp);
3037 /*
3038 * rxvt_menubar_dispatch () violates the constness of the string,
3039 * so DON'T do it here
3040 */
3041 break; 3428 break;
3042 case XTerm_Pixmap: 3429 case Rxvt_Color_UL:
3043 if (*str != ';') 3430 case URxvt_Color_UL:
3044 { 3431 process_color_seq (op, Color_UL, str, resp);
3432 break;
3433 case URxvt_Color_IT:
3434 process_color_seq (op, Color_IT, str, resp);
3435 break;
3436#endif
3437#if ENABLE_TRANSPARENCY && TINTING
3438 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp);
3440
3441 check_our_parents ();
3442
3443 if (am_transparent)
3444 want_full_refresh = want_refresh = 1;
3445
3446 break;
3447#endif
3448
3045#if XPM_BACKGROUND 3449#if XPM_BACKGROUND
3450 case Rxvt_Pixmap:
3451 {
3452 if (*str != ';')
3453 {
3046 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3048#endif
3049 scr_touch (true); 3456 scr_touch (true);
3050 } 3457 }
3458
3459 int changed = 0;
3460
3051 while ((str = STRCHR (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3052 { 3462 {
3053 str++; 3463 str++;
3054#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3055 changed += scale_pixmap (str);
3056#endif
3057
3058 } 3465 }
3466
3059 if (changed) 3467 if (changed)
3060 { 3468 {
3061#ifdef XPM_BACKGROUND
3062 resize_pixmap (); 3469 resize_pixmap ();
3063#endif
3064 scr_touch (true); 3470 scr_touch (true);
3065 } 3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3476 }
3066 break; 3477 break;
3478#endif
3067 3479
3068 case XTerm_restoreFG: 3480 case Rxvt_restoreFG:
3069 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3070 break; 3482 break;
3071 case XTerm_restoreBG: 3483 case Rxvt_restoreBG:
3072 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3073 break; 3485 break;
3486
3074 case XTerm_logfile: 3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3075 break; 3489 break;
3076 case XTerm_font: 3490
3077 change_font (str);
3078 break;
3079 case XTerm_locale:
3080 if (str[0] == '?' && !str[1])
3081 tt_printf ("%-.250s\n", locale);
3082 else
3083 {
3084 set_locale (str);
3085 im_cb ();
3086 }
3087 break;
3088#if 0 3491#if 0
3089 case XTerm_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3090 { 3493 {
3091 int fd; 3494 int fd;
3092 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3495 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3093 { 3496 {
3094 scr_dump (fd); 3497 scr_dump (fd);
3095 close (fd); 3498 close (fd);
3096 } 3499 }
3097 } 3500 }
3098 break; 3501 break;
3099#endif 3502#endif
3503 case XTerm_font:
3504 op = URxvt_font;
3505 case URxvt_font:
3506#if ENABLE_STYLES
3507 case URxvt_boldFont:
3508 case URxvt_italicFont:
3509 case URxvt_boldItalicFont:
3510#endif
3511 if (query)
3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3514 ? fontset[op - URxvt_font]->fontdesc : "",
3515 resp);
3516 else
3517 {
3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
3100 3519
3520 res = strdup (str);
3521 allocated.push_back ((void *)res);
3522 set_fonts ();
3523 }
3524 break;
3525
3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
3535 case URxvt_locale:
3536 if (query)
3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3538 else
3539 {
3540 set_locale (str);
3541 pty->set_utf8_mode (enc_utf8);
3542 init_xlocale ();
3543 }
3544 break;
3545
3546 case URxvt_view_up:
3547 case URxvt_view_down:
3548 {
3549 int lines = atoi (str);
3550
3551 if (lines)
3552 scr_page (op == URxvt_view_up ? UP : DN, lines);
3553 else
3554 scr_erase_savelines ();
3555 }
3556
3557 break;
3558#endif
3559
3560#if ENABLE_PERL
3561 case URxvt_perl:
3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3563 ; // no responses yet
3564 break;
3565#endif
3101 } 3566 }
3102} 3567}
3103/*----------------------------------------------------------------------*/ 3568/*----------------------------------------------------------------------*/
3104 3569
3105/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3570/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3113 * so no need for fancy checking 3578 * so no need for fancy checking
3114 */ 3579 */
3115int 3580int
3116rxvt_term::privcases (int mode, unsigned long bit) 3581rxvt_term::privcases (int mode, unsigned long bit)
3117{ 3582{
3118 int state; 3583 int state;
3119 3584
3120 if (mode == 's') 3585 if (mode == 's')
3121 { 3586 {
3122 SavedModes |= (PrivateModes & bit); 3587 SavedModes |= (priv_modes & bit);
3123 return -1; 3588 return -1;
3124 } 3589 }
3125 else 3590 else
3126 { 3591 {
3127 if (mode == 'r') 3592 if (mode == 'r')
3128 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3129 else 3594 else
3130 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3595 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3131 PrivMode (state, bit); 3596 PrivMode (state, bit);
3132 } 3597 }
3598
3133 return state; 3599 return state;
3134} 3600}
3135 3601
3136/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3137void 3603void
3138rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3139{ 3605{
3140 unsigned int i, j; 3606 unsigned int i, j;
3141 int state; 3607 int state;
3608
3142 static const struct 3609 static const struct
3143 { 3610 {
3144 const int argval; 3611 const int argval;
3145 const unsigned long bit; 3612 const unsigned long bit;
3146 } 3613 }
3614
3147 argtopriv[] = { 3615 argtopriv[] = {
3148 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
3149 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
3150 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
3151 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
3152 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
3153 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
3154 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
3623 // 8, bi-directional support mode
3155 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
3156#ifdef menuBar_esc 3625 // 18, 19 printing-related
3157 { menuBar_esc, PrivMode_menuBar }, 3626 { 25, PrivMode_VisibleCursor },
3158#endif
3159#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3160 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3161#endif 3629#endif
3162 { 25, PrivMode_VisibleCursor },
3163 { 35, PrivMode_ShiftKeys }, 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3164 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3632 // 41 xterm more fixes NYI
3633 // 45 margin bell NYI
3634 // 46 start logging
3165 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3166 { 66, PrivMode_aplKP }, 3636 { 66, PrivMode_aplKP },
3167#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3168 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
3169#endif 3639#endif
3170 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3642 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3643 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3171 { 1010, PrivMode_TtyOutputInh }, 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3172 { 1011, PrivMode_Keypress }, 3645 { 1011, PrivMode_Keypress }, // rxvt extension
3646 // 1035 enable modifiers for alt, numlock NYI
3647 // 1036 send ESC for meta keys NYI
3648 // 1037 send DEL for keypad delete NYI
3173 { 1047, PrivMode_Screen }, 3649 { 1047, PrivMode_Screen },
3650 // 1048 save and restore cursor
3174 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3651 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3652 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3175 }; 3653 };
3176 3654
3177 if (nargs == 0) 3655 if (nargs == 0)
3178 return; 3656 return;
3179 3657
… …
3194 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3195 break; 3673 break;
3196 } 3674 }
3197 3675
3198 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
3199 if (state == -1)
3200 switch (arg[i]) 3677 switch (arg[i])
3201 { 3678 {
3679#if ENABLE_STYLES
3680 case 1021:
3681 set_option (Opt_intensityStyles, mode);
3682
3683 scr_touch (true);
3684 break;
3685#endif
3202 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
3687 case 1049:
3688 if (option (Opt_secondaryScreen))
3203 if (mode == 0) 3689 if (mode == 0)
3204 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
3205 else if (mode == 1) 3691 else if (mode == 1)
3206 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
3207 /* FALLTHROUGH */
3208 default:
3209 continue; /* for (;i;) */
3210 }
3211
3212 /* extra handling for values with valid 0 or 1 state */
3213 switch (arg[i])
3214 {
3215 /* case 1: - application cursor keys */
3216 case 2: /* VT52 mode */
3217 /* oddball mode. should be set regardless of set/reset
3218 * parameter. Return from VT52 mode with an ESC < from
3219 * within VT52 mode
3220 */
3221 PrivMode (1, PrivMode_vt52);
3222 break; 3693 break;
3694 }
3695
3696 if (state >= 0)
3697 /* extra handling for values with valid 0 or 1 state */
3698 switch (arg[i])
3699 {
3700 /* case 1: - application cursor keys */
3701 case 2: /* VT52 mode */
3702 /* oddball mode. should be set regardless of set/reset
3703 * parameter. Return from VT52 mode with an ESC < from
3704 * within VT52 mode
3705 */
3706 PrivMode (1, PrivMode_vt52);
3707 break;
3223 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
3224 if (PrivateModes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
3225 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
3226 (unsigned int)TermWin.height);
3227 break; 3711 break;
3228 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
3229 if (state)
3230 Options &= ~Opt_jumpScroll;
3231 else
3232 Options |= Opt_jumpScroll; 3713 set_option (Opt_jumpScroll, !state);
3233 break; 3714 break;
3234 case 5: /* reverse video */ 3715 case 5: /* reverse video */
3235 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
3236 break; 3717 break;
3237 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
3238 scr_relative_origin (state); 3719 scr_relative_origin (state);
3239 break; 3720 break;
3240 case 7: /* autowrap */ 3721 case 7: /* autowrap */
3241 scr_autowrap (state); 3722 scr_autowrap (state);
3242 break; 3723 break;
3243 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
3244 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
3245 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
3246 PrivateModes &= ~ (PrivMode_MouseX11); 3727 priv_modes &= ~PrivMode_MouseX11;
3247 break; 3728 break;
3248#ifdef menuBar_esc
3249 case menuBar_esc:
3250#ifdef MENUBAR
3251 map_menuBar (state);
3252#endif
3253 break;
3254#endif
3255#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
3256 case scrollBar_esc: 3730 case scrollBar_esc:
3257 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
3258 { 3732 {
3259 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
3260 scr_touch (true); 3734 scr_touch (true);
3261 } 3735 }
3262 break; 3736 break;
3263#endif 3737#endif
3264 case 25: /* visible/invisible cursor */ 3738 case 25: /* visible/invisible cursor */
3265 scr_cursor_visible (state); 3739 scr_cursor_visible (state);
3266 break; 3740 break;
3267 /* case 35: - shift keys */ 3741 /* case 35: - shift keys */
3268 /* case 40: - 80 <--> 132 mode */ 3742 /* case 40: - 80 <--> 132 mode */
3269 case 47: /* secondary screen */ 3743 case 47: /* secondary screen */
3270 scr_change_screen (state); 3744 scr_change_screen (state);
3271 break; 3745 break;
3272 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
3273 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
3274 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
3275 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX10); 3750 priv_modes &= ~PrivMode_MouseX10;
3277 break; 3751 break;
3278#if 0 3752#if 0
3279 case 1001: 3753 case 1001:
3280 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
3281#endif 3755#endif
3282 case 1010: /* scroll to bottom on TTY output inhibit */ 3756 case 1010: /* scroll to bottom on TTY output inhibit */
3283 if (state)
3284 Options &= ~Opt_scrollTtyOutput;
3285 else
3286 Options |= Opt_scrollTtyOutput; 3757 set_option (Opt_scrollTtyOutput, !state);
3287 break; 3758 break;
3288 case 1011: /* scroll to bottom on key press */ 3759 case 1011: /* scroll to bottom on key press */
3289 if (state)
3290 Options |= Opt_scrollTtyKeypress; 3760 set_option (Opt_scrollTtyKeypress, state);
3291 else
3292 Options &= ~Opt_scrollTtyKeypress;
3293 break; 3761 break;
3294 case 1047: /* secondary screen w/ clearing */ 3762 case 1047: /* secondary screen w/ clearing last */
3295 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3763 if (option (Opt_secondaryScreen))
3296 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
3297 scr_erase_screen (2); 3765 scr_erase_screen (2);
3298 scr_change_screen (state); 3766 scr_change_screen (state);
3299 /* FALLTHROUGH */
3300 default:
3301 break; 3767 break;
3768 case 1049: /* secondary screen w/ clearing first */
3769 scr_change_screen (state);
3770 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY)
3772 scr_erase_screen (2);
3773 break;
3774 default:
3775 break;
3302 } 3776 }
3303 } 3777 }
3304} 3778}
3305/*}}} */ 3779/*}}} */
3306 3780
3307/*{{{ process sgr sequences */ 3781/*{{{ process sgr sequences */
3308void 3782void
3309rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3783rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3310{ 3784{
3311 unsigned int i; 3785 unsigned int i;
3312 short rendset; 3786 short rendset;
3313 int rendstyle; 3787 int rendstyle;
3314 3788
3315 if (nargs == 0) 3789 if (nargs == 0)
3316 { 3790 {
3317 scr_rendition (0, ~RS_None); 3791 scr_rendition (0, ~RS_None);
3318 return; 3792 return;
3319 } 3793 }
3794
3320 for (i = 0; i < nargs; i++) 3795 for (i = 0; i < nargs; i++)
3321 { 3796 {
3322 rendset = -1; 3797 rendset = -1;
3323 switch (arg[i]) 3798 switch (arg[i])
3324 { 3799 {
… …
3326 rendset = 0, rendstyle = ~RS_None; 3801 rendset = 0, rendstyle = ~RS_None;
3327 break; 3802 break;
3328 case 1: 3803 case 1:
3329 rendset = 1, rendstyle = RS_Bold; 3804 rendset = 1, rendstyle = RS_Bold;
3330 break; 3805 break;
3806 //case 2: // low intensity
3807 case 3:
3808 rendset = 1, rendstyle = RS_Italic;
3809 break;
3331 case 4: 3810 case 4:
3332 rendset = 1, rendstyle = RS_Uline; 3811 rendset = 1, rendstyle = RS_Uline;
3333 break; 3812 break;
3334 case 5: 3813 case 5: // slowly blinking
3814 case 6: // rapidly blinking
3335 rendset = 1, rendstyle = RS_Blink; 3815 rendset = 1, rendstyle = RS_Blink;
3336 break; 3816 break;
3817 //case 6: // scoansi light background
3337 case 7: 3818 case 7:
3338 rendset = 1, rendstyle = RS_RVid; 3819 rendset = 1, rendstyle = RS_RVid;
3339 break; 3820 break;
3340 case 22: 3821 case 8:
3822 // invisible. NYI
3823 break;
3824 //case 9: // crossed out
3825 //case 10: // scoansi acs off, primary font
3826 //case 11: // scoansi acs on, first alt font
3827 //case 12: // scoansi acs on, |0x80, second alt font
3828 //...
3829 //case 19: // ninth alt font
3830 //case 20: // gothic
3831 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3341 rendset = 0, rendstyle = RS_Bold; 3832 rendset = 0, rendstyle = RS_Bold;
3833 break;
3834 case 22: // normal intensity
3835 rendset = 0, rendstyle = RS_Bold;
3836 break;
3837 case 23: // disable italic
3838 rendset = 0, rendstyle = RS_Italic;
3342 break; 3839 break;
3343 case 24: 3840 case 24:
3344 rendset = 0, rendstyle = RS_Uline; 3841 rendset = 0, rendstyle = RS_Uline;
3345 break; 3842 break;
3346 case 25: 3843 case 25:
3347 rendset = 0, rendstyle = RS_Blink; 3844 rendset = 0, rendstyle = RS_Blink;
3348 break; 3845 break;
3846 case 26: // variable spacing (iso 8613)
3847 rendset = 0, rendstyle = RS_Blink;
3848 break;
3349 case 27: 3849 case 27:
3350 rendset = 0, rendstyle = RS_RVid; 3850 rendset = 0, rendstyle = RS_RVid;
3351 break; 3851 break;
3852 //case 28: // visible. NYI
3853 //case 29: // not crossed-out
3352 } 3854 }
3855
3353 if (rendset != -1) 3856 if (rendset != -1)
3354 { 3857 {
3355 scr_rendition (rendset, rendstyle); 3858 scr_rendition (rendset, rendstyle);
3356 continue; /* for (;i;) */ 3859 continue; /* for (;i;) */
3357 } 3860 }
… …
3364 case 33: 3867 case 33:
3365 case 34: 3868 case 34:
3366 case 35: 3869 case 35:
3367 case 36: 3870 case 36:
3368 case 37: 3871 case 37:
3369 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3872 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3370 Color_fg);
3371 break; 3873 break;
3372#ifdef TTY_256COLOR 3874 case 38: // set fg color, ISO 8613-6
3373 case 38:
3374 if (nargs > i + 2 && arg[i + 1] == 5) 3875 if (nargs > i + 2 && arg[i + 1] == 5)
3375 { 3876 {
3376 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3877 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3377 Color_fg);
3378 i += 2; 3878 i += 2;
3379 } 3879 }
3380 break; 3880 break;
3381#endif
3382 case 39: /* default fg */ 3881 case 39: /* default fg */
3383 scr_color (Color_fg, Color_fg); 3882 scr_color (Color_fg, Color_fg);
3384 break; 3883 break;
3385 3884
3386 case 40: 3885 case 40:
… …
3389 case 43: 3888 case 43:
3390 case 44: 3889 case 44:
3391 case 45: 3890 case 45:
3392 case 46: 3891 case 46:
3393 case 47: 3892 case 47:
3394 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3893 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3395 Color_bg);
3396 break; 3894 break;
3397#ifdef TTY_256COLOR 3895 case 48: // set bg color, ISO 8613-6
3398 case 48:
3399 if (nargs > i + 2 && arg[i + 1] == 5) 3896 if (nargs > i + 2 && arg[i + 1] == 5)
3400 { 3897 {
3401 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3898 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3402 Color_bg);
3403 i += 2; 3899 i += 2;
3404 } 3900 }
3405 break; 3901 break;
3406#endif
3407 case 49: /* default bg */ 3902 case 49: /* default bg */
3408 scr_color (Color_bg, Color_bg); 3903 scr_color (Color_bg, Color_bg);
3409 break; 3904 break;
3410 3905
3411#ifndef NO_BRIGHTCOLOR 3906 //case 50: // not variable spacing
3907
3908#if !ENABLE_MINIMAL
3412 case 90: 3909 case 90:
3413 case 91: /* set bright fg color */ 3910 case 91: /* set bright fg color */
3414 case 92: 3911 case 92:
3415 case 93: 3912 case 93:
3416 case 94: 3913 case 94:
3417 case 95: 3914 case 95:
3418 case 96: 3915 case 96:
3419 case 97: 3916 case 97:
3420 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3421 Color_fg);
3422 break; 3918 break;
3423 case 100: 3919 case 100:
3424 case 101: /* set bright bg color */ 3920 case 101: /* set bright bg color */
3425 case 102: 3921 case 102:
3426 case 103: 3922 case 103:
3427 case 104: 3923 case 104:
3428 case 105: 3924 case 105:
3429 case 106: 3925 case 106:
3430 case 107: 3926 case 107:
3431 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3927 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3432 Color_bg);
3433 break; 3928 break;
3434#endif 3929#endif
3435
3436 } 3930 }
3437 } 3931 }
3438} 3932}
3439/*}}} */ 3933/*}}} */
3440 3934
3441/*{{{ process Rob Nation's own graphics mode sequences */ 3935/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3442void 3936void
3443rxvt_term::process_graphics () 3937rxvt_term::process_graphics ()
3444{ 3938{
3445 unsigned char ch, cmd = cmd_getc (); 3939 unicode_t ch, cmd = cmd_getc ();
3446 3940
3447 if (cmd == 'Q') 3941 if (cmd == 'Q')
3448 { /* query graphics */ 3942 { /* query graphics */
3449 tt_printf ("\033G0\n"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
3450 return; 3944 return;
3451 } 3945 }
3452 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
3453 do 3947 do
3454 ch = cmd_getc (); 3948 ch = cmd_getc ();
… …
3464 */ 3958 */
3465void 3959void
3466rxvt_term::tt_printf (const char *fmt,...) 3960rxvt_term::tt_printf (const char *fmt,...)
3467{ 3961{
3468 va_list arg_ptr; 3962 va_list arg_ptr;
3469 unsigned char buf[256]; 3963 char buf[256];
3470 3964
3471 va_start (arg_ptr, fmt); 3965 va_start (arg_ptr, fmt);
3472 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3966 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3473 va_end (arg_ptr); 3967 va_end (arg_ptr);
3474 tt_write (buf, STRLEN (buf)); 3968 tt_write (buf, strlen (buf));
3475} 3969}
3476 3970
3477/* ---------------------------------------------------------------------- */ 3971/* ---------------------------------------------------------------------- */
3478/* Write data to the pty as typed by the user, pasted with the mouse, 3972/* Write data to the pty as typed by the user, pasted with the mouse,
3479 * or generated by us in response to a query ESC sequence. 3973 * or generated by us in response to a query ESC sequence.
3480 */ 3974 */
3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976
3481void 3977void
3482rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3978rxvt_term::tt_write (const char *data, unsigned int len)
3483{ 3979{
3484 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3981 return;
3485 3982
3486 if (len) 3983 if (pty->pty < 0)
3984 return;
3985
3986 if (v_buflen == 0)
3987 {
3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3989
3990 if ((unsigned int)written == len)
3991 return;
3992
3993 data += written;
3994 len -= written;
3487 { 3995 }
3996
3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3998
3999 memcpy (v_buffer + v_buflen, data, len);
4000 v_buflen += len;
4001
4002 pty_ev.set (EVENT_READ | EVENT_WRITE);
4003}
4004
4005void rxvt_term::pty_write ()
4006{
4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4008
4009 if (written > 0)
4010 {
4011 v_buflen -= written;
4012
3488 if (v_buflen == 0) 4013 if (v_buflen == 0)
3489 { 4014 {
3490 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3491
3492 if ((unsigned int)written == len)
3493 return;
3494
3495 data += written;
3496 len -= written;
3497 }
3498
3499
3500 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3501
3502 memcpy (v_buffer + v_buflen, data, len);
3503 v_buflen += len;
3504 }
3505
3506 for (;;)
3507 {
3508 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3509
3510 if (written > 0)
3511 {
3512 v_buflen -= written;
3513
3514 if (v_buflen == 0)
3515 {
3516 free (v_buffer); 4015 free (v_buffer);
3517 v_buffer = 0; 4016 v_buffer = 0;
3518 v_buflen = 0; 4017 v_buflen = 0;
3519 4018
3520 pty_ev.set (EVENT_READ); 4019 pty_ev.set (EVENT_READ);
3521 return;
3522 }
3523
3524 memmove (v_buffer, v_buffer + written, v_buflen);
3525 }
3526 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3527 // original code just ignores this...
3528 destroy ();
3529 else
3530 {
3531 pty_ev.set (EVENT_READ | EVENT_WRITE);
3532 return; 4020 return;
3533 } 4021 }
4022
4023 memmove (v_buffer, v_buffer + written, v_buflen);
3534 } 4024 }
4025 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4026 pty_ev.set (EVENT_READ);
3535} 4027}
3536 4028
3537/*----------------------- end-of-file (C source) -----------------------*/ 4029/*----------------------- end-of-file (C source) -----------------------*/
3538 4030

Diff Legend

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