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

Diff Legend

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