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

Diff Legend

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