ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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