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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

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

Diff Legend

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