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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC

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

Diff Legend

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