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.45 by pcg, Sat Feb 21 20:33:39 2004 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

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

Diff Legend

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