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

Diff Legend

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