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

Diff Legend

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