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

Diff Legend

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