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

Diff Legend

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