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

Diff Legend

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