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.59 by pcg, Wed Feb 25 15:39:48 2004 UTC vs.
Revision 1.336 by root, Sat Jun 30 18:10:41 2007 UTC

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

Diff Legend

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