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

Diff Legend

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