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

Diff Legend

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