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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC

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

Diff Legend

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