ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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