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

Diff Legend

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