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.171 by root, Wed Dec 1 02:12:18 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 1225
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
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,
… …
1183 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1184 &data); 1338 &data);
1185 XChangeProperty (display->display, display->root, 1339 XChangeProperty (display->display, display->root,
1186 XA_CUT_BUFFER0, XA_STRING, 1340 XA_CUT_BUFFER0, XA_STRING,
1187 8, PropModeReplace, 1341 8, PropModeReplace,
1188 data, STRLEN (data)); 1342 data, strlen (data));
1343 XFree (data);
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1344 selection_paste (display->root, XA_CUT_BUFFER0, True);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1191 } 1346 }
1192#endif /* OFFIX_DND */ 1347#endif /* OFFIX_DND */
1193 break; 1348 break;
1194 1349
1195 case MappingNotify: 1350 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1351 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1352 break;
1198 1353
1199 /* 1354 /*
1200 * XXX: this is not the _current_ arrangement 1355 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1356 * Here's my conclusion:
… …
1226 { 1381 {
1227 TermWin.focus = 1; 1382 TermWin.focus = 1;
1228 want_refresh = 1; 1383 want_refresh = 1;
1229#ifdef USE_XIM 1384#ifdef USE_XIM
1230 if (Input_Context != NULL) 1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1231 XSetICFocus (Input_Context); 1388 XSetICFocus (Input_Context);
1389 }
1232#endif 1390#endif
1233#ifdef CURSOR_BLINK 1391#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink) 1392 if (options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1236#endif 1401#endif
1237 1402
1238 } 1403 }
1239 break; 1404 break;
1240 1405
1241 case FocusOut: 1406 case FocusOut:
1242 if (TermWin.focus) 1407 if (TermWin.focus)
1243 { 1408 {
1244 TermWin.focus = 0; 1409 TermWin.focus = 0;
1245 want_refresh = 1; 1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1246#ifdef USE_XIM 1418#ifdef USE_XIM
1247 if (Input_Context != NULL) 1419 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context); 1420 XUnsetICFocus (Input_Context);
1249#endif 1421#endif
1250#ifdef CURSOR_BLINK 1422#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink) 1423 if (options & Opt_cursorBlink)
1252 cursor_blink_ev.stop (); 1424 cursor_blink_ev.stop ();
1253 hidden_cursor = 0; 1425 hidden_cursor = 0;
1254#endif 1426#endif
1255 1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1256 } 1434 }
1257 break; 1435 break;
1258 1436
1259 case ConfigureNotify: 1437 case ConfigureNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1438 if (ev.xconfigure.window == TermWin.parent[0])
… …
1269 } 1447 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271 1449
1272 if (szHint.width != width || szHint.height != height) 1450 if (szHint.width != width || szHint.height != height)
1273 { 1451 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1452 seen_resize = 1;
1275 resize_all_windows (width, height, 1); 1453 resize_all_windows (width, height, 1);
1276 } 1454 }
1277#ifdef DEBUG_SIZE 1455
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent) 1457 if (options & Opt_transparent)
1285 { 1458 {
1286 check_our_parents (); 1459 check_our_parents ();
1287 if (am_transparent) 1460 if (am_transparent)
1288 want_full_refresh = 1; 1461 want_refresh = want_full_refresh = 1;
1289 } 1462 }
1290#endif 1463#endif
1291
1292 } 1464 }
1293 break; 1465 break;
1294 1466
1467 case PropertyNotify:
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break;
1473
1295 case SelectionClear: 1474 case SelectionClear:
1296 display->set_selection_owner (0); 1475 selection_clear ();
1297 break; 1476 break;
1298 1477
1299 case SelectionNotify: 1478 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1480 selection_paste (ev.xselection.requestor,
… …
1328 1507
1329 case GraphicsExpose: 1508 case GraphicsExpose:
1330 case Expose: 1509 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1510 if (ev.xany.window == TermWin.vt)
1332 { 1511 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1512 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1516
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1522
1341 // ev.xexpose.width, TermWin.height, False); 1523 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1524 }
1345 else 1525 else
1346 { 1526 {
1347 XEvent unused_event; 1527 XEvent unused_event;
1348 1528
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1350 Expose, 1530 ;
1351 &unused_event)) ;
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1353 GraphicsExpose, 1532 ;
1354 &unused_event)) ; 1533
1355 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1356 { 1535 {
1357 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1358 scrollbar_show (0); 1537 scrollbar_show (0);
1359 } 1538 }
1360#ifdef MENUBAR 1539#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1541 menubar_expose ();
1363#endif 1542#endif
1543
1544#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window);
1547#endif
1364 } 1548 }
1365 break; 1549 break;
1366 1550
1367 case MotionNotify: 1551 case MotionNotify:
1368#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
… …
1374 { 1558 {
1375 menubar_control (ev.xbutton); 1559 menubar_control (ev.xbutton);
1376 break; 1560 break;
1377 } 1561 }
1378#endif 1562#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1564 break;
1381 1565
1382 if (ev.xany.window == TermWin.vt) 1566 if (ev.xany.window == TermWin.vt)
1383 { 1567 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1568 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1569 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1387 ; 1571 ;
1388 1572
1389 XQueryPointer (display->display, TermWin.vt, 1573 XQueryPointer (display->display, TermWin.vt,
1390 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1576 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1577 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1579 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1580 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1581 {
1398#endif 1582#endif
1583#if ISO_14755
1584 // 5.4
1585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1586 {
1587 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1588 break;
1589 }
1590#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1591 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1592 ev.xbutton.state & Button3Mask ? 2 : 0);
1593
1401#ifdef SELECTION_SCROLLING 1594#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1595 if (ev.xbutton.y < TermWin.int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1404 { 1597 {
1405 int dist; 1598 int dist;
1406 1599
1407 pending_scroll_selection=1;
1408
1409 /* don't clobber the current delay if we are 1600 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1601 * already in the middle of scrolling.
1411 */ 1602 */
1412 if (scroll_selection_delay<=0) 1603 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1605
1415 /* save the event params so we can highlight 1606 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1607 * the selection in the pending-scroll loop
1417 */ 1608 */
1418 selection_save_x=ev.xbutton.x; 1609 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1610 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1612
1423 /* calc number of lines to scroll */ 1613 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1614 if (ev.xbutton.y < TermWin.int_bwidth)
1425 { 1615 {
1426 scroll_selection_dir = UP; 1616 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1617 dist = TermWin.int_bwidth - ev.xbutton.y;
1428 } 1618 }
1429 else 1619 else
1430 { 1620 {
1431 scroll_selection_dir = DN; 1621 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y -
1433 (TermWin.int_bwidth + TermWin.height); 1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1434 } 1623 }
1624
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1625 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1626 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1;
1437 MIN_IT (scroll_selection_lines, 1628 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1629 SELECTION_SCROLL_MAX_LINES);
1439 } 1630 }
1440 else 1631 else
1441 { 1632 {
1442 /* we are within the text window, so we 1633 /* we are within the text window, so we
1443 * shouldn't be scrolling 1634 * shouldn't be scrolling
1444 */ 1635 */
1445 pending_scroll_selection = 0; 1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop();
1446 } 1638 }
1447#endif 1639#endif
1448#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1449
1450 } 1641 }
1451#endif 1642#endif
1452
1453 } 1643 }
1454 } 1644 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1646 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1458 MotionNotify, &ev)) ; 1648 MotionNotify, &ev))
1649 ;
1650
1459 XQueryPointer (display->display, scrollBar.win, 1651 XQueryPointer (display->display, scrollBar.win,
1460 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1654 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1655 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1657 scrollbar_size ());
1466 scr_refresh (refresh_type); 1658 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1659 refresh_limit = 0;
… …
1469 } 1661 }
1470 break; 1662 break;
1471 } 1663 }
1472} 1664}
1473 1665
1666#if TRANSPARENT
1474void 1667void
1475rxvt_term::rootwin_cb (XEvent &ev) 1668rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1669{
1477 SET_R (this); 1670 SET_R (this);
1478 SET_LOCALE (locale); 1671 SET_LOCALE (locale);
1479 1672
1480 switch (ev.type) 1673 switch (ev.type)
1481 { 1674 {
1482 case PropertyNotify: 1675 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 /* 1676 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1677 * 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. 1678 * use the property to determine the pixmap. We use it later on.
1495 */ 1679 */
1496 if (xa[XA_XROOTPMAPID] == 0) 1680 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498 1682
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1500 return; 1684 return;
1501 }
1502 1685
1503 /* FALLTHROUGH */ 1686 /* FALLTHROUGH */
1504 case ReparentNotify: 1687 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1689 want_refresh = want_full_refresh = 1;
1508 break; 1690 break;
1509#endif
1510 } 1691 }
1511} 1692}
1693#endif
1512 1694
1513void 1695void
1514rxvt_term::button_press (XButtonEvent &ev) 1696rxvt_term::button_press (XButtonEvent &ev)
1515{ 1697{
1516 int reportmode = 0, clickintime; 1698 int reportmode = 0, clickintime;
1517 1699
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate) 1701 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1702 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703
1521 /* 1704 /*
1522 * VT window processing of button press 1705 * VT window processing of button press
1523 */ 1706 */
1524 if (ev.window == TermWin.vt) 1707 if (ev.window == TermWin.vt)
1525 { 1708 {
1709#if ISO_14755
1710 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 {
1713 iso14755_54 (ev.x, ev.y);
1714 return;
1715 }
1716#endif
1717
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1718 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1719
1527 if (reportmode) 1720 if (reportmode)
1528 { 1721 {
1529 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1724 MEvent.state = ev.state;
… …
1560 } 1753 }
1561 else 1754 else
1562 { 1755 {
1563 if (ev.button != MEvent.button) 1756 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1758
1565 switch (ev.button) 1759 switch (ev.button)
1566 { 1760 {
1567 case Button1: 1761 case Button1:
1762 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */
1764#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask);
1766#else
1767 selection.rect = false;
1768#endif
1769
1568 /* allow shift+left click to extend selection */ 1770 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1772 {
1571 if (MEvent.button == Button1 && clickintime) 1773 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1774 selection_rotate (ev.x, ev.y);
1573 else 1775 else
1574 selection_extend (ev.x, ev.y, 1); 1776 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1791 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1792 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1793 selection_rotate (ev.x, ev.y);
1592 else 1794 else
1593 selection_extend (ev.x, ev.y, 1); 1795 selection_extend (ev.x, ev.y, 1);
1796
1594 MEvent.button = Button3; 1797 MEvent.button = Button3;
1595 break; 1798 break;
1596 } 1799 }
1597 } 1800 }
1801
1598 MEvent.time = ev.time; 1802 MEvent.time = ev.time;
1599 return; 1803 return;
1600 } 1804 }
1601 1805
1602 /* 1806 /*
… …
1668 upordown = 1; /* down */ 1872 upordown = 1; /* down */
1669 } 1873 }
1670 if (upordown) 1874 if (upordown)
1671 { 1875 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1876#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1877 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1878#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1879 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1880 {
1677 if (upordown < 0) 1881 if (upordown < 0)
1678 scrollBar.setUp (); 1882 scrollBar.setUp ();
… …
1694 break; 1898 break;
1695 case R_SB_ALIGN_BOTTOM: 1899 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 1900 csrO = scrollBar.bot - scrollBar.top;
1697 break; 1901 break;
1698 } 1902 }
1903
1699 if (scrollBar.style == R_SB_XTERM 1904 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 1905 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 1906 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 1907 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 1908
1704 scrollBar.setMotion (); 1909 scrollBar.setMotion ();
1705 break; 1910 break;
1706 1911
1707 case Button1: 1912 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1913 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1732 scr_page ((ev.button == Button1 ? DN : UP), 1937 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 1938 (TermWin.nrow
1734 * scrollbar_position (ev.y) 1939 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 1940 / scrollbar_size ()));
1736 } 1941 }
1942
1737 break; 1943 break;
1738 } 1944 }
1739 } 1945 }
1740 return; 1946 return;
1741 } 1947 }
… …
1753{ 1959{
1754 int reportmode = 0; 1960 int reportmode = 0;
1755 1961
1756 csrO = 0; /* reset csr Offset */ 1962 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 1963 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1964 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 1965
1760 if (scrollbar_isUpDn ()) 1966 if (scrollbar_isUpDn ())
1761 { 1967 {
1762 scrollBar.setIdle (); 1968 scrollBar.setIdle ();
1763 scrollbar_show (0); 1969 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1970#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 1971 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1972#endif
1767
1768 } 1973 }
1974
1769#ifdef SELECTION_SCROLLING 1975#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 1976 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop();
1771#endif 1978#endif
1979
1772 if (ev.window == TermWin.vt) 1980 if (ev.window == TermWin.vt)
1773 { 1981 {
1982#if ISO_14755
1983 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return;
1986#endif
1774 if (reportmode) 1987 if (reportmode)
1775 { 1988 {
1776 /* mouse report from vt window */ 1989 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 1990 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 1991 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2005 MEvent.button = AnyButton;
1793 mouse_report (ev); 2006 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2007#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2008 return;
1796 } 2009 }
2010
1797 /* 2011 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2012 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2013 * when overriding mouse reporting
1800 */ 2014 */
1801 if (PrivateModes & PrivMode_mouse_report 2015 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2016 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2017 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2018 selection_extend (ev.x, ev.y, 0);
1805 2019
1806 switch (ev.button) 2020 switch (ev.button)
… …
1817 case Button5: 2031 case Button5:
1818 { 2032 {
1819 int i; 2033 int i;
1820 page_dirn v; 2034 page_dirn v;
1821 2035
1822 v = (ev.button == Button4) ? UP : DN; 2036 v = ev.button == Button4 ? UP : DN;
2037
1823 if (ev.state & ShiftMask) 2038 if (ev.state & ShiftMask)
1824 i = 1; 2039 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2040 else if (options & Opt_mouseWheelScrollPage)
1826 i = TermWin.nrow - 1; 2041 i = TermWin.nrow - 1;
1827 else 2042 else
1828 i = 5; 2043 i = 5;
2044
1829# ifdef MOUSE_SLIP_WHEELING 2045# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2046 if (ev.state & ControlMask)
1831 { 2047 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2048 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2051
2052 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054
2055 slip_wheel_ev.start ();
1834 } 2056 }
2057 else
2058 {
1835# endif 2059# endif
1836# ifdef JUMP_MOUSE_WHEEL 2060# 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); 2061 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2062 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1); 2063 scrollbar_show (1);
2064# else
2065 while (i--)
2066 {
2067 scr_page (v, 1);
2068 scr_refresh (SMOOTH_REFRESH);
2069 scrollbar_show (1);
2070 }
2071# endif
2072# ifdef MOUSE_SLIP_WHEELING
1846 } 2073 }
1847# endif 2074#endif
1848
1849 } 2075 }
1850 break; 2076 break;
1851#endif 2077#endif
1852
1853 } 2078 }
1854 } 2079 }
1855#ifdef MENUBAR 2080#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2081 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2082 menubar_control (ev);
1858#endif 2083#endif
1859} 2084}
1860 2085
1861
1862#ifdef TRANSPARENT 2086#ifdef TRANSPARENT
2087#if TINTING
2088/* taken from aterm-0.4.2 */
2089
2090typedef uint32_t RUINT32T;
2091
2092void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2093{
2094 int sh_r, sh_g, sh_b;
2095 RUINT32T mask_r, mask_g, mask_b;
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i;
2100
2101 Visual* visual = display->visual;
2102
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104
2105 /* for convenience */
2106 mask_r = visual->red_mask;
2107 mask_g = visual->green_mask;
2108 mask_b = visual->blue_mask;
2109
2110 /* boring lookup table pre-initialization */
2111 switch (srcImage->bits_per_pixel) {
2112 case 15:
2113 if ((mask_r != 0x7c00) ||
2114 (mask_g != 0x03e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+32;
2121 sh_r = 10;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 16:
2126 if ((mask_r != 0xf800) ||
2127 (mask_g != 0x07e0) ||
2128 (mask_b != 0x001f))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2131 lookup_r = lookup;
2132 lookup_g = lookup+32;
2133 lookup_b = lookup+32+64;
2134 sh_r = 11;
2135 sh_g = 5;
2136 sh_b = 0;
2137 break;
2138 case 24:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 case 32:
2152 if ((mask_r != 0xff0000) ||
2153 (mask_g != 0x00ff00) ||
2154 (mask_b != 0x0000ff))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2157 lookup_r = lookup;
2158 lookup_g = lookup+256;
2159 lookup_b = lookup+256+256;
2160 sh_r = 16;
2161 sh_g = 8;
2162 sh_b = 0;
2163 break;
2164 default:
2165 return; /* we do not support this color depth */
2166 }
2167
2168 /* prepare limits for color transformation (each channel is handled separately) */
2169 if (shade < 0) {
2170 shade = -shade;
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = 65535-rm;
2175 lower_lim_g = 65535-gm;
2176 lower_lim_b = 65535-bm;
2177
2178 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2179 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2180 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2181
2182 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2183 } else {
2184 if (shade < 0) shade = 0;
2185 if (shade > 100) shade = 100;
2186
2187 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2188
2189 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2190 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2191 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2192 }
2193
2194 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2195 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2196 {
2197 unsigned int tmp;
2198
2199 tmp = lower_lim_r;
2200 lower_lim_r = lower_lim_b;
2201 lower_lim_b = tmp;
2202
2203 tmp = upper_lim_r;
2204 upper_lim_r = upper_lim_b;
2205 upper_lim_b = tmp;
2206 }
2207
2208 /* fill our lookup tables */
2209 for (i = 0; i <= mask_r>>sh_r; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2213 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2214 lookup_r[i] = (tmp/65535)<<sh_r;
2215 }
2216 for (i = 0; i <= mask_g>>sh_g; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2220 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2221 lookup_g[i] = (tmp/65535)<<sh_g;
2222 }
2223 for (i = 0; i <= mask_b>>sh_b; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2227 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2228 lookup_b[i] = (tmp/65535)<<sh_b;
2229 }
2230
2231 /* apply table to input image (replacing colors by newly calculated ones) */
2232 switch (srcImage->bits_per_pixel)
2233 {
2234 case 15:
2235 {
2236 unsigned short *p1, *pf, *p, *pl;
2237 p1 = (unsigned short *) srcImage->data;
2238 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2239 while (p1 < pf)
2240 {
2241 p = p1;
2242 pl = p1 + srcImage->width;
2243 for (; p < pl; p++)
2244 {
2245 *p = lookup_r[(*p & 0x7c00)>>10] |
2246 lookup_g[(*p & 0x03e0)>> 5] |
2247 lookup_b[(*p & 0x001f)];
2248 }
2249 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2250 }
2251 break;
2252 }
2253 case 16:
2254 {
2255 unsigned short *p1, *pf, *p, *pl;
2256 p1 = (unsigned short *) srcImage->data;
2257 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2258 while (p1 < pf)
2259 {
2260 p = p1;
2261 pl = p1 + srcImage->width;
2262 for (; p < pl; p++)
2263 {
2264 *p = lookup_r[(*p & 0xf800)>>11] |
2265 lookup_g[(*p & 0x07e0)>> 5] |
2266 lookup_b[(*p & 0x001f)];
2267 }
2268 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2269 }
2270 break;
2271 }
2272 case 24:
2273 {
2274 unsigned char *p1, *pf, *p, *pl;
2275 p1 = (unsigned char *) srcImage->data;
2276 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2277 while (p1 < pf)
2278 {
2279 p = p1;
2280 pl = p1 + srcImage->width * 3;
2281 for (; p < pl; p += 3)
2282 {
2283 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2284 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2285 p[2] = lookup_r[(p[2] & 0x0000ff)];
2286 }
2287 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2288 }
2289 break;
2290 }
2291 case 32:
2292 {
2293 RUINT32T *p1, *pf, *p, *pl;
2294 p1 = (RUINT32T *) srcImage->data;
2295 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2296
2297 while (p1 < pf)
2298 {
2299 p = p1;
2300 pl = p1 + srcImage->width;
2301 for (; p < pl; p++)
2302 {
2303 *p = lookup_r[(*p & 0xff0000)>>16] |
2304 lookup_g[(*p & 0x00ff00)>> 8] |
2305 lookup_b[(*p & 0x0000ff)] |
2306 (*p & ~0xffffff);
2307 }
2308 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2309 }
2310 break;
2311 }
2312 }
2313
2314 free (lookup);
2315}
2316#endif
2317
1863/* 2318/*
1864 * Check our parents are still who we think they are. 2319 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2320 * Do transparency updates if required
1866 */ 2321 */
1867int 2322int
1868rxvt_term::check_our_parents () 2323rxvt_term::check_our_parents ()
1869{ 2324{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2325 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2326 unsigned long nitems, bytes_after;
1872 Atom atype; 2327 Atom atype;
1873 unsigned char *prop = NULL; 2328 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2329 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2330 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2331 XWindowAttributes wattr, wrootattr;
1877 2332
1878 pchanged = 0; 2333 pchanged = 0;
1879 2334
1880 if (! (Options & Opt_transparent)) 2335 if (!(options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2336 return pchanged; /* Don't try any more */
1882 2337
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2338 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2339 rootdepth = wrootattr.depth;
1885 2340
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2342
1887 if (rootdepth != wattr.depth) 2343 if (rootdepth != wattr.depth)
1888 { 2344 {
1889 if (am_transparent) 2345 if (am_transparent)
1890 { 2346 {
1891 pchanged = 1; 2347 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2349 am_transparent = am_pixmap_trans = 0;
1895 } 2350 }
2351
1896 return pchanged; /* Don't try any more */ 2352 return pchanged; /* Don't try any more */
1897 } 2353 }
1898 2354
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2355 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2356 XSync (display->display, False);
… …
1902 /* 2358 /*
1903 * Make the frame window set by the window manager have 2359 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2360 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2361 * windows for each client, so we have to take care about that.
1906 */ 2362 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2363 i = (xa[XA_XROOTPMAPID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2366 &nitems, &bytes_after, &prop) == Success);
2367
1911 if (!i || prop == NULL) 2368 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success);
2373
2374 if (!i || prop == NULL
2375#if TINTING
2376 || !rs[Rs_color + Color_tint]
2377#endif
2378 )
1912 have_pixmap = 0; 2379 have_pixmap = 0;
1913 else 2380 else
1914 { 2381 {
1915 have_pixmap = 1; 2382 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2383 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2384 XFree (prop);
1918 } 2385 }
2386
1919 if (have_pixmap) 2387 if (have_pixmap)
1920 { 2388 {
1921 /* 2389 /*
1922 * Copy display->root pixmap transparency 2390 * Copy display->root pixmap transparency
1923 */ 2391 */
… …
1927 XImage *image; 2395 XImage *image;
1928 GC gc; 2396 GC gc;
1929 XGCValues gcvalue; 2397 XGCValues gcvalue;
1930 2398
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2400 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2401 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2402 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2403 nx = ny = 0;
1936 2404
1937 if (sx < 0) 2405 if (sx < 0)
… …
1949 } 2417 }
1950 2418
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1953 allowedxerror = -1; 2421 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2423
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2425 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2426 allowedxerror = 0;
2427
1959 if (image == NULL) 2428 if (image == NULL)
1960 { 2429 {
1961 if (am_transparent && am_pixmap_trans) 2430 if (am_transparent && am_pixmap_trans)
1962 { 2431 {
1963 pchanged = 1; 2432 pchanged = 1;
… …
1965 { 2434 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2436 TermWin.pixmap = None;
1968 } 2437 }
1969 } 2438 }
2439
1970 am_pixmap_trans = 0; 2440 am_pixmap_trans = 0;
1971 } 2441 }
1972 else 2442 else
1973 { 2443 {
1974 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2445 XFreePixmap (display->display, TermWin.pixmap);
2446
2447#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint))
2449 {
2450 unsigned short rm, gm, bm;
2451 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2452
2453 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2454
2455 ShadeXImage (display, image, shade, rm, gm, bm);
2456 }
2457#endif
2458
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2460 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2463 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2464 XFreeGC (display->display, gc);
1985 XDestroyImage (image); 2465 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1987 TermWin.pixmap); 2467 XClearWindow (display->display, TermWin.parent[0]);
2468
1988 if (!am_transparent || !am_pixmap_trans) 2469 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2470 pchanged = 1;
2471
1990 am_transparent = am_pixmap_trans = 1; 2472 am_transparent = am_pixmap_trans = 1;
1991 } 2473 }
1992 } 2474 }
1993 2475
1994 if (!am_pixmap_trans) 2476 if (!am_pixmap_trans)
1995 { 2477 {
1996 unsigned int n; 2478 unsigned int n;
1997 /* 2479 /*
1998 * InheritPixmap transparency 2480 * InheritPixmap transparency
1999 */ 2481 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2483 {
2004 oldp = TermWin.parent[i]; 2484 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2485 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2486 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2487 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2488
2009 if (TermWin.parent[i] == display->root) 2489 if (TermWin.parent[i] == display->root)
2010 { 2490 {
2011 if (oldp != None) 2491 if (oldp != None)
2012 pchanged = 1; 2492 pchanged = 1;
2493
2013 break; 2494 break;
2014 } 2495 }
2496
2015 if (oldp != TermWin.parent[i]) 2497 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2498 pchanged = 1;
2017 } 2499 }
2018 2500
2019 n = 0; 2501 n = 0;
… …
2021 if (pchanged) 2503 if (pchanged)
2022 { 2504 {
2023 for (; n < (unsigned int)i; n++) 2505 for (; n < (unsigned int)i; n++)
2024 { 2506 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2507 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) 2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2509 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2030 break; 2511 break;
2031 } 2512 }
2032 } 2513 }
2033 } 2514 }
2034 2515
2035 if (n > (int) (sizeof (TermWin.parent) 2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2517 {
2038 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt, 2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2520 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2521 /* XXX: also turn off Opt_transparent? */
2045 } 2522 }
2046 else 2523 else
2047 { 2524 {
2525#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2526 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2527 * 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); 2528 sleep (1);
2058# endif 2529#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2530 for (n = 0; n < (unsigned int)i; n++)
2531 {
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2533 XClearWindow (display->display, TermWin.parent[n]);
2534 }
2535
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2537 am_transparent = 1;
2066 } 2538 }
2067 2539
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2541 TermWin.parent[i] = None;
2070 } 2542 }
2543
2544 if (scrollBar.win)
2545 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle ();
2548 scrollbar_show (0);
2549 }
2550
2071 return pchanged; 2551 return pchanged;
2072} 2552}
2073#endif 2553#endif
2074 2554
2075/*}}} */ 2555/*}}} */
2556
2557bool
2558rxvt_term::cmd_parse ()
2559{
2560 bool flag = false;
2561 unicode_t ch = NOCHAR;
2562 unsigned char *seq_begin; // remember start of esc-sequence here
2563
2564 for (;;)
2565 {
2566 if (ch == NOCHAR)
2567 {
2568 seq_begin = cmdbuf_ptr;
2569 ch = next_char ();
2570 }
2571
2572 if (ch == NOCHAR) // TODO: improve
2573 break;
2574
2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2576 {
2577 if (!seen_input)
2578 {
2579 seen_input = 1;
2580 // many badly-written programs (e.g. jed) contain a race condition:
2581 // they first read the screensize and then install a SIGWINCH handler.
2582 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized.
2587 if (seen_resize)
2588 kill (-cmd_pid, SIGWINCH);
2589 }
2590
2591 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ];
2593 bool refreshnow = false;
2594 int nlines = 0;
2595 unicode_t *str = buf;
2596
2597 for (;;)
2598 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break;
2601
2602 *str++ = ch;
2603
2604 if (ch == C0_LF)
2605 {
2606 nlines++;
2607 refresh_count++;
2608
2609 if (!(options & Opt_jumpScroll)
2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2611 {
2612 refreshnow = true;
2613 ch = NOCHAR;
2614 break;
2615 }
2616
2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2618 if (nlines >= TermWin.nrow - 1)
2619 {
2620 scr_add_lines (buf, nlines, str - buf);
2621 nlines = 0;
2622 str = buf;
2623 }
2624 }
2625
2626 if (str >= buf + UBUFSIZ)
2627 {
2628 ch = NOCHAR;
2629 break;
2630 }
2631
2632 seq_begin = cmdbuf_ptr;
2633 ch = next_char ();
2634 }
2635
2636 scr_add_lines (buf, nlines, str - buf);
2637
2638 /*
2639 * If there have been a lot of new lines, then update the screen
2640 * What the heck I'll cheat and only refresh less than every page-full.
2641 * the number of pages between refreshes is refresh_limit, which
2642 * is incremented here because we must be doing flat-out scrolling.
2643 */
2644 if (refreshnow)
2645 {
2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2647 refresh_limit++;
2648 else
2649 {
2650 flag = true;
2651 scr_refresh (refresh_type);
2652 }
2653 }
2654
2655 }
2656 else
2657 {
2658 try
2659 {
2660 process_nonprinting (ch);
2661 }
2662 catch (const class out_of_input &o)
2663 {
2664 // we ran out of input, retry later
2665 cmdbuf_ptr = seq_begin;
2666 break;
2667 }
2668
2669 ch = NOCHAR;
2670 }
2671 }
2672
2673 return flag;
2674}
2675
2676// read the next octet
2677unicode_t
2678rxvt_term::next_octet ()
2679{
2680 return cmdbuf_ptr < cmdbuf_endp
2681 ? *cmdbuf_ptr++
2682 : NOCHAR;
2683}
2684
2685// read the next character
2686unicode_t
2687rxvt_term::next_char ()
2688{
2689 while (cmdbuf_ptr < cmdbuf_endp)
2690 {
2691 // assume 7-bit to be ascii ALWAYS
2692 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2693 return *cmdbuf_ptr++;
2694
2695 wchar_t wc;
2696 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2697
2698 if (len == (size_t)-2)
2699 {
2700 // the mbstate stores incomplete sequences. didn't know this :/
2701 cmdbuf_ptr = cmdbuf_endp;
2702 break;
2703 }
2704
2705 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707
2708 // assume wchar == unicode
2709 cmdbuf_ptr += len;
2710 return wc;
2711 }
2712
2713 return NOCHAR;
2714}
2715
2716/* rxvt_cmd_getc () - Return next input character */
2717/*
2718 * Return the next input character after first passing any keyboard input
2719 * to the command.
2720 */
2721unicode_t
2722rxvt_term::cmd_getc ()
2723{
2724 unicode_t c = next_char ();
2725
2726 if (c == NOCHAR)
2727 throw out_of_input;
2728
2729 return c;
2730}
2731
2732unicode_t
2733rxvt_term::cmd_get8 ()
2734{
2735 unicode_t c = next_octet ();
2736
2737 if (c == NOCHAR)
2738 throw out_of_input;
2739
2740 return c;
2741}
2076 2742
2077/*{{{ print pipe */ 2743/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2744/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2745#ifdef PRINTPIPE
2080FILE * 2746FILE *
2081rxvt_term::popen_printer () 2747rxvt_term::popen_printer ()
2082{ 2748{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2749 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2750
2085 if (stream == NULL) 2751 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2752 rxvt_warn ("can't open printer pipe, not printing.\n");
2753
2087 return stream; 2754 return stream;
2088} 2755}
2089 2756
2090int 2757int
2091rxvt_term::pclose_printer (FILE *stream) 2758rxvt_term::pclose_printer (FILE *stream)
2092{ 2759{
2093 fflush (stream); 2760 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); 2761 return pclose (stream);
2100# endif
2101} 2762}
2102 2763
2103/* 2764/*
2104 * simulate attached vt100 printer 2765 * simulate attached vt100 printer
2105 */ 2766 */
2106void 2767void
2107rxvt_term::process_print_pipe () 2768rxvt_term::process_print_pipe ()
2108{ 2769{
2109 int done; 2770 int done;
2110 FILE *fd; 2771 FILE *fd;
2111 2772
2112 if ((fd = popen_printer ()) == NULL) 2773 if ((fd = popen_printer ()) == NULL)
2113 return; 2774 return;
2114 2775
2115 /* 2776 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2777 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2778 * is received.
2118 */ 2779 */
2119 for (done = 0; !done;) 2780 for (done = 0; !done;)
2120 { 2781 {
2121 unsigned char buf[8]; 2782 unsigned char buf[8];
2122 unsigned char ch; 2783 unicode_t ch;
2123 unsigned int i, len; 2784 unsigned int i, len;
2124 2785
2125 if ((ch = cmd_getc ()) != C0_ESC) 2786 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2787 {
2127 if (putc (ch, fd) == EOF) 2788 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2789 break; /* done = 1 */
… …
2143 { 2804 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2805 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2806 break; /* done = 1 */
2146 } 2807 }
2147 } 2808 }
2809
2148 for (i = 0; i < len; i++) 2810 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2811 if (putc (buf[i], fd) == EOF)
2150 { 2812 {
2151 done = 1; 2813 done = 1;
2152 break; 2814 break;
2153 } 2815 }
2154 } 2816 }
2155 } 2817 }
2818
2156 pclose_printer (fd); 2819 pclose_printer (fd);
2157} 2820}
2158#endif /* PRINTPIPE */ 2821#endif /* PRINTPIPE */
2159/*}}} */ 2822/*}}} */
2160 2823
2161/* *INDENT-OFF* */ 2824/* *INDENT-OFF* */
2162enum { 2825enum {
2163 C1_40 = 0x40, 2826 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2827 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, 2828 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, 2829 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 2830 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2831};
2169/* *INDENT-ON* */ 2832/* *INDENT-ON* */
2170 2833
2171/*{{{ process non-printing single characters */ 2834/*{{{ process non-printing single characters */
2172void 2835void
2173rxvt_term::process_nonprinting (unsigned char ch) 2836rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2837{
2175 switch (ch) 2838 switch (ch)
2176 { 2839 {
2840 case C0_ESC:
2841 process_escape_seq ();
2842 break;
2177 case C0_ENQ: /* terminal Status */ 2843 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2844 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2847 else
2183 tt_write ((unsigned char *)VT100_ANS, 2848 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2849 (unsigned int)strlen (VT100_ANS));
2185 break; 2850 break;
2186 case C0_BEL: /* bell */ 2851 case C0_BEL: /* bell */
2187 scr_bell (); 2852 scr_bell ();
2188 break; 2853 break;
2189 case C0_BS: /* backspace */ 2854 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2869 scr_charset_choose (1);
2205 break; 2870 break;
2206 case C0_SI: /* shift in - acs */ 2871 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2872 scr_charset_choose (0);
2208 break; 2873 break;
2874
2875#ifdef EIGHT_BIT_CONTROLS
2876 // 8-bit controls
2877 case 0x90: /* DCS */
2878 process_dcs_seq ();
2879 break;
2880 case 0x9b: /* CSI */
2881 process_csi_seq ();
2882 break;
2883 case 0x9d: /* CSI */
2884 process_osc_seq ();
2885 break;
2886#endif
2209 } 2887 }
2210} 2888}
2211/*}}} */ 2889/*}}} */
2212 2890
2213 2891
2214/*{{{ process VT52 escape sequences */ 2892/*{{{ process VT52 escape sequences */
2215void 2893void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2894rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2895{
2218 int row, col; 2896 int row, col;
2219 2897
2220 switch (ch) 2898 switch (ch)
2221 { 2899 {
… …
2273 2951
2274/*{{{ process escape sequences */ 2952/*{{{ process escape sequences */
2275void 2953void
2276rxvt_term::process_escape_seq () 2954rxvt_term::process_escape_seq ()
2277{ 2955{
2278 unsigned char ch = cmd_getc (); 2956 unicode_t ch = cmd_getc ();
2279 2957
2280 if (PrivateModes & PrivMode_vt52) 2958 if (priv_modes & PrivMode_vt52)
2281 { 2959 {
2282 process_escape_vt52 (ch); 2960 process_escape_vt52 (ch);
2283 return; 2961 return;
2284 } 2962 }
2285 2963
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 2978 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 2979 break;
2302 case '+': 2980 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 2981 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 2982 break;
2305#ifndef NO_FRILLS 2983#if ENABLE_FRILLS
2306 case '6': 2984 case '6':
2307 scr_backindex (); 2985 scr_backindex ();
2308 break; 2986 break;
2309#endif 2987#endif
2310 case '7': 2988 case '7':
2311 scr_cursor (SAVE); 2989 scr_cursor (SAVE);
2312 break; 2990 break;
2313 case '8': 2991 case '8':
2314 scr_cursor (RESTORE); 2992 scr_cursor (RESTORE);
2315 break; 2993 break;
2316#ifndef NO_FRILLS 2994#if ENABLE_FRILLS
2317 case '9': 2995 case '9':
2318 scr_forwardindex (); 2996 scr_forwardindex ();
2319 break; 2997 break;
2320#endif 2998#endif
2321 case '=': 2999 case '=':
… …
2331 break; 3009 break;
2332 3010
2333 /* 8.3.87: NEXT LINE */ 3011 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3012 case C1_NEL: /* ESC E */
2335 { 3013 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3014 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3015 scr_add_lines (nlcr, 1, 2);
2338 } 3016 }
2339 break; 3017 break;
2340 3018
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3019 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 3030 case C1_RI: /* ESC M */
2353 scr_index (DN); 3031 scr_index (DN);
2354 break; 3032 break;
2355 3033
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3034 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3035 /*case C1_SS2: scr_single_shift (2); break; */
2358 3036
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3037 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3038 /*case C1_SS3: scr_single_shift (3); break; */
2361 3039
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3040 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3041 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3042 process_dcs_seq ();
2365 break; 3043 break;
… …
2380 process_osc_seq (); 3058 process_osc_seq ();
2381 break; 3059 break;
2382 3060
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3061 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3062 case 'c':
3063 mbstate.reset ();
2385 scr_poweron (); 3064 scr_poweron ();
2386 scrollbar_show (1); 3065 scrollbar_show (1);
2387 break; 3066 break;
2388 3067
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3068 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3080
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3081/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3082/* *INDENT-OFF* */
2404enum { 3083enum {
2405 CSI_ICH = 0x40, 3084 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3085 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 , 3086 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, 3087 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, 3088 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, 3089 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, 3090 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, */ 3105 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, [, \, ], ^, _, */ 3106 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, */ 3107 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, */ 3108 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, */ 3109 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, {, |, }, ~, */ 3110 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3111 };
2433/* *INDENT-ON* */ 3112/* *INDENT-ON* */
2434 3113
2435void 3114void
2436rxvt_term::process_csi_seq () 3115rxvt_term::process_csi_seq ()
2437{ 3116{
2438 unsigned char ch, priv, i; 3117 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3118 unsigned int nargs, p;
2440 int n, ndef; 3119 int n, ndef;
2441 int arg[ESC_ARGS]; 3120 int arg[ESC_ARGS];
2442 3121
2443 for (nargs = ESC_ARGS; nargs > 0;) 3122 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3123 arg[--nargs] = 0;
2445 3124
2446 priv = 0; 3125 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3127 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3128 { /* '<' '=' '>' '?' */
2450 priv = ch; 3129 priv = ch;
2451 ch = cmd_getc (); 3130 ch = cmd_getc ();
2452 } 3131 }
3132
2453 /* read any numerical arguments */ 3133 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3134 for (n = -1; ch < CSI_ICH; )
2455 { 3135 {
2456 if (isdigit (ch)) 3136 if (isdigit (ch))
2457 { 3137 {
… …
2464 { 3144 {
2465 if (nargs < ESC_ARGS) 3145 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3146 arg[nargs++] = n;
2467 n = -1; 3147 n = -1;
2468 } 3148 }
2469 else if (ch == '\b') 3149 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); 3150 process_nonprinting (ch);
2481 } 3151
2482 ch = cmd_getc (); 3152 ch = cmd_getc ();
2483 } 3153 }
2484 3154
2485 if (ch > CSI_7F) 3155 if (ch > CSI_7F)
2486 return; 3156 return;
… …
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2629 break; 3299 break;
2630 3300
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3302 tt_write ((const unsigned char *)VT100_ANS,
2633 (unsigned int) (sizeof (VT100_ANS) - 1)); 3303 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3304 break;
2635 3305
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3307 process_sgr_mode (nargs, arg);
2638 break; 3308 break;
… …
2644 tt_printf ("\033[0n"); 3314 tt_printf ("\033[0n");
2645 break; 3315 break;
2646 case 6: /* CPR requested */ 3316 case 6: /* CPR requested */
2647 scr_report_position (); 3317 scr_report_position ();
2648 break; 3318 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3319 case 7: /* unofficial extension */
3320 if (options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3321 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3322 break;
2653#endif
2654 case 8: /* unofficial extension */ 3323 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3325 break;
2657 } 3326 }
2658 break; 3327 break;
2659 3328
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3329 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3362 break;
2694 3363
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3364 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3365 if (arg[0] == 4)
2697 scr_insert_mode (0); 3366 scr_insert_mode (0);
3367 else if (arg[0] == 20)
3368 priv_modes &= ~PrivMode_LFNL;
2698 break; 3369 break;
2699 3370
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3371 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3372 if (arg[0] == 4)
2702 scr_insert_mode (1); 3373 scr_insert_mode (1);
3374 else if (arg[0] == 20)
3375 priv_modes |= PrivMode_LFNL;
2703 break; 3376 break;
2704 3377
2705 /* 3378 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3379 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3380 */
… …
2719 break; 3392 break;
2720 case CSI_75: 3393 case CSI_75:
2721 scr_cursor (RESTORE); 3394 scr_cursor (RESTORE);
2722 break; 3395 break;
2723 3396
2724#ifndef NO_FRILLS 3397#if ENABLE_FRILLS
2725 case CSI_74: 3398 case CSI_74:
2726 process_window_ops (arg, nargs); 3399 process_window_ops (arg, nargs);
2727 break; 3400 break;
2728#endif 3401#endif
2729 3402
2730 case CSI_78: /* DECREQTPARM */ 3403 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3404 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3405 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3406 break;
2734 3407
2735 default: 3408 default:
2736 break; 3409 break;
2737 } 3410 }
2738} 3411}
2739/*}}} */ 3412/*}}} */
2740 3413
2741#ifndef NO_FRILLS 3414#if ENABLE_FRILLS
2742/* ARGSUSED */ 3415/* ARGSUSED */
2743void 3416void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3417rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3418{
2746 int x, y; 3419 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3420 XWindowAttributes wattr;
2751 Window wdummy; 3421 Window wdummy;
2752 3422
2753 if (nargs == 0) 3423 if (nargs == 0)
2754 return; 3424 return;
3425
2755 switch (args[0]) 3426 switch (args[0])
2756 { 3427 {
2757 /* 3428 /*
2758 * commands 3429 * commands
2759 */ 3430 */
2760 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (display->display, TermWin.parent[0]);
2762 break; 3433 break;
2763 case 2: /* iconify window */ 3434 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (display->display, TermWin.parent[0],
… …
2781 break; 3452 break;
2782 case 8: /* set size (chars) */ 3453 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3454 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3455 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3456 break;
3457
3458 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3459 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3460 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3461 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3462 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3463 break;
3464
3465
2791 /* 3466 /*
2792 * reports - some output format copied from XTerm 3467 * reports - some output format copied from XTerm
2793 */ 3468 */
2794 case 11: /* report window state */ 3469 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3472 break;
2798 case 13: /* report window position */ 3473 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3476 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3477 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3478 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3479 break;
2805 case 14: /* report window size (pixels) */ 3480 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3483 break;
2809 case 18: /* report window size (chars) */ 3484 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3486 break;
2812#if 0 /* XXX: currently disabled due to security concerns */ 3487 case 19: /* report window size (chars) */
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489 break;
2813 case 20: /* report icon label */ 3490 case 20: /* report icon label */
3491 {
3492 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3493 XGetIconName (display->display, TermWin.parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s);
3496 }
2816 break; 3497 break;
2817 case 21: /* report window title */ 3498 case 21: /* report window title */
3499 {
3500 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3501 XFetchName (display->display, TermWin.parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s);
3504 }
2820 break; 3505 break;
2821#endif
2822
2823 } 3506 }
2824} 3507}
2825#endif 3508#endif
2826 3509
2827/*----------------------------------------------------------------------*/ 3510/*----------------------------------------------------------------------*/
2828/* 3511/*
2829 * get input up until STRING TERMINATOR (or BEL) 3512 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3513 * ends_how is terminator used. returned input must be free()'d
2831 */ 3514 */
2832unsigned char * 3515unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3516rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3517{
2835 int seen_esc = 0; /* seen escape? */ 3518 unicode_t seen_esc = 0, ch;
2836 unsigned int n = 0; 3519 unsigned int n = 0;
2837 unsigned char *s; 3520 unsigned char *s;
2838 unsigned char ch, string[STRING_MAX]; 3521 unsigned char string[STRING_MAX];
2839 3522
2840 for (; (ch = cmd_getc ());) 3523 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3524 {
2842 if (ch == C0_BEL 3525 if (seen_esc)
2843 || ch == CHAR_ST 3526 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3527 if (ch == 0x5c) /* 7bit ST */
2845 break; 3528 break;
3529 else
3530 return NULL;
3531 }
2846 if (ch == C0_ESC) 3532 else if (ch == C0_ESC)
2847 { 3533 {
2848 seen_esc = 1; 3534 seen_esc = 1;
2849 continue; 3535 continue;
2850 } 3536 }
2851 else if (ch == '\t') 3537 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3538 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3539 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3540 return NULL; /* other control character - exit */
3541
3542 seen_esc = 0;
3543
2855 if (n < sizeof (string) - 1) 3544 if (n >= sizeof (string) - 1)
3545 // stop at some sane length
3546 return NULL;
3547
3548 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 ();
3550 else
2856 string[n++] = ch; 3551 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3552 }
3553
2859 string[n++] = '\0'; 3554 string[n++] = '\0';
3555
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2861 return NULL; 3557 return NULL;
3558
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3560 strncpy (s, string, n);
2864 return s; 3561 return s;
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 = XInternAtom (display->display, str + 1, True);
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 XChangeProperty (display->display, TermWin.parent[0],
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 }
3705 else
3706 XDeleteProperty (display->display, TermWin.parent[0],
3707 display->atom (str));
3708 }
3709 break;
3710
2961 case XTerm_Color: 3711 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3712 for (buf = (char *)str; buf && *buf;)
2963 { 3713 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3714 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3715 break;
3716
2966 *name++ = '\0'; 3717 *name++ = '\0';
2967 color = atoi (buf); 3718 color = atoi (buf);
3719
2968 if (color < 0 || color >= TOTAL_COLORS) 3720 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3721 break;
3722
2970 if ((buf = STRCHR (name, ';')) != NULL) 3723 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3724 *buf++ = '\0';
3725
3726 if (name[0] == '?' && !name[1])
3727 {
3728 unsigned short r, g, b;
3729 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3730 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3731 }
3732 else
2972 set_window_color (color + minCOLOR, name); 3733 set_window_color (color + minCOLOR, name);
2973 } 3734 }
3735 break;
3736 case XTerm_Color00:
3737 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3738 break;
3739 case XTerm_Color01:
3740 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2974 break; 3741 break;
2975#ifndef NO_CURSORCOLOR 3742#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3743 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3744 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3745 break;
2979#endif 3746#endif
2980 case XTerm_Color_pointer: 3747 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3748 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3749 break;
3750 case XTerm_Color_pointer_bg:
3751 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3752 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3753#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3754 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
2986 break; 3759 break;
2987 case XTerm_Color_UL: 3760 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3762 break;
2990 case XTerm_Color_RV: 3763 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3765 break;
2993#endif 3766#endif
2994 3767#if TRANSPARENT && TINTING
2995 case XTerm_Menu: 3768 case XTerm_Color_tint:
2996 /* 3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3770 check_our_parents ();
2998 * so DON'T do it here 3771 if (am_transparent)
2999 */ 3772 want_full_refresh = want_refresh = 1;
3000 break; 3773 break;
3774#endif
3775
3001 case XTerm_Pixmap: 3776 case XTerm_Pixmap:
3002 if (*str != ';') 3777 if (*str != ';')
3003 { 3778 {
3004#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3780 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3781 set_bgPixmap (str); /* change pixmap */
3007#endif 3782#endif
3008 scr_touch (true); 3783 scr_touch (true);
3009 } 3784 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3785 while ((str = strchr (str, ';')) != NULL)
3011 { 3786 {
3012 str++; 3787 str++;
3013#if XPM_BACKGROUND 3788#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3789 changed += scale_pixmap (str);
3015#endif 3790#endif
… …
3028 set_window_color (Color_fg, str); 3803 set_window_color (Color_fg, str);
3029 break; 3804 break;
3030 case XTerm_restoreBG: 3805 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3806 set_window_color (Color_bg, str);
3032 break; 3807 break;
3808
3033 case XTerm_logfile: 3809 case XTerm_logfile:
3810 // TODO, when secure mode?
3034 break; 3811 break;
3812
3035 case XTerm_font: 3813 case XTerm_font:
3036 change_font (str); 3814 op = URxvt_font;
3815 case URxvt_font:
3816#if ENABLE_STYLES
3817 case URxvt_boldFont:
3818 case URxvt_italicFont:
3819 case URxvt_boldItalicFont:
3820#endif
3821 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3825 resp);
3826 else
3827 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829
3830 res = strdup (str);
3831 allocated.push_back ((void *)res);
3832 set_fonts ();
3833 }
3037 break; 3834 break;
3038#ifndef NO_FRILLS 3835
3836#if ENABLE_FRILLS
3039 case XTerm_locale: 3837 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3838 if (query)
3041 tt_printf ("%-.250s\n", locale); 3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3042 else 3840 else
3043 { 3841 {
3044 set_locale (str); 3842 set_locale (str);
3045# ifdef USE_XIM 3843# ifdef USE_XIM
3046 im_cb (); 3844 im_cb ();
3047# endif 3845# endif
3048 } 3846 }
3049 break; 3847 break;
3848#endif
3849
3850#ifdef MENUBAR
3050 case XTerm_findfont: 3851 case XTerm_Menu:
3051 { 3852 if (options & Opt_insecure)
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3853 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; 3854 break;
3056#endif 3855#endif
3057#if 0 3856#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3857 case XTerm_dumpscreen: /* no error notices */
3059 { 3858 {
3060 int fd; 3859 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3861 {
3063 scr_dump (fd); 3862 scr_dump (fd);
3064 close (fd); 3863 close (fd);
3065 } 3864 }
3066 } 3865 }
3067 break; 3866 break;
3068#endif 3867#endif
3069
3070 } 3868 }
3071} 3869}
3072/*----------------------------------------------------------------------*/ 3870/*----------------------------------------------------------------------*/
3073 3871
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3872/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3880 * so no need for fancy checking
3083 */ 3881 */
3084int 3882int
3085rxvt_term::privcases (int mode, unsigned long bit) 3883rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3884{
3087 int state; 3885 int state;
3088 3886
3089 if (mode == 's') 3887 if (mode == 's')
3090 { 3888 {
3091 SavedModes |= (PrivateModes & bit); 3889 SavedModes |= (priv_modes & bit);
3092 return -1; 3890 return -1;
3093 } 3891 }
3094 else 3892 else
3095 { 3893 {
3096 if (mode == 'r') 3894 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3895 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3896 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3897 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3898 PrivMode (state, bit);
3101 } 3899 }
3900
3102 return state; 3901 return state;
3103} 3902}
3104 3903
3105/* we're not using priv _yet_ */ 3904/* we're not using priv _yet_ */
3106void 3905void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3906rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 3907{
3109 unsigned int i, j; 3908 unsigned int i, j;
3110 int state; 3909 int state;
3910
3111 static const struct 3911 static const struct
3112 { 3912 {
3113 const int argval; 3913 const int argval;
3114 const unsigned long bit; 3914 const unsigned long bit;
3115 } 3915 }
3916
3116 argtopriv[] = { 3917 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3918 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3919 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3920 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3921 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3922 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3923 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3924 { 7, PrivMode_Autowrap },
3925 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3926 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3927#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 3928 { menuBar_esc, PrivMode_menuBar },
3127#endif 3929#endif
3930 // 18, 19 printing-related
3931 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 3932#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3933 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3934#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 3935 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 3936 { 40, PrivMode_132OK },
3937 // 41 xterm more fixes NYI
3938 // 45 margin bell NYI
3939 // 46 start logging
3134 { 47, PrivMode_Screen }, 3940 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 3941 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 3942#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 3943 { 67, PrivMode_BackSpace },
3138#endif 3944#endif
3139 { 1000, PrivMode_MouseX11 }, 3945 { 1000, PrivMode_MouseX11 },
3946 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3947 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3948 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 3949 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 3950 { 1011, PrivMode_Keypress }, // rxvt extension
3951 // 1035 enable modifiers for alt, numlock NYI
3952 // 1036 send ESC for meta keys NYI
3953 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 3954 { 1047, PrivMode_Screen },
3955 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3956 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3957 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 3958 };
3145 3959
3146 if (nargs == 0) 3960 if (nargs == 0)
3147 return; 3961 return;
3148 3962
… …
3163 state = privcases (mode, argtopriv[j].bit); 3977 state = privcases (mode, argtopriv[j].bit);
3164 break; 3978 break;
3165 } 3979 }
3166 3980
3167 /* extra handling for values with state unkept */ 3981 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 3982 switch (arg[i])
3170 { 3983 {
3171 case 1048: /* alternative cursor save */ 3984 case 1048: /* alternative cursor save */
3985 case 1049:
3986 if (options & Opt_secondaryScreen)
3172 if (mode == 0) 3987 if (mode == 0)
3173 scr_cursor (RESTORE); 3988 scr_cursor (RESTORE);
3174 else if (mode == 1) 3989 else if (mode == 1)
3175 scr_cursor (SAVE); 3990 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; 3991 break;
3992 }
3993
3994 if (state >= 0)
3995 /* extra handling for values with valid 0 or 1 state */
3996 switch (arg[i])
3997 {
3998 /* case 1: - application cursor keys */
3999 case 2: /* VT52 mode */
4000 /* oddball mode. should be set regardless of set/reset
4001 * parameter. Return from VT52 mode with an ESC < from
4002 * within VT52 mode
4003 */
4004 PrivMode (1, PrivMode_vt52);
4005 break;
3192 case 3: /* 80/132 */ 4006 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4007 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3195 break; 4009 break;
3196 case 4: /* smooth scrolling */ 4010 case 4: /* smooth scrolling */
3197 if (state) 4011 if (state)
3198 Options &= ~Opt_jumpScroll; 4012 options &= ~Opt_jumpScroll;
3199 else 4013 else
3200 Options |= Opt_jumpScroll; 4014 options |= Opt_jumpScroll;
3201 break; 4015 break;
3202 case 5: /* reverse video */ 4016 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4017 scr_rvideo_mode (state);
3204 break; 4018 break;
3205 case 6: /* relative/absolute origins */ 4019 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4020 scr_relative_origin (state);
3207 break; 4021 break;
3208 case 7: /* autowrap */ 4022 case 7: /* autowrap */
3209 scr_autowrap (state); 4023 scr_autowrap (state);
3210 break; 4024 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4025 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4026 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4027 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4028 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4029 break;
3216#ifdef menuBar_esc 4030#ifdef menuBar_esc
3217 case menuBar_esc: 4031 case menuBar_esc:
3218#ifdef MENUBAR 4032#ifdef MENUBAR
3219 map_menuBar (state); 4033 map_menuBar (state);
3220#endif 4034#endif
3221 break; 4035 break;
3222#endif 4036#endif
3223#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3224 case scrollBar_esc: 4038 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4039 if (scrollbar_mapping (state))
3226 { 4040 {
3227 resize_all_windows (0, 0, 0); 4041 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4042 scr_touch (true);
3229 } 4043 }
3230 break; 4044 break;
3231#endif 4045#endif
3232 case 25: /* visible/invisible cursor */ 4046 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4047 scr_cursor_visible (state);
3234 break; 4048 break;
3235 /* case 35: - shift keys */ 4049 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4050 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4051 case 47: /* secondary screen */
3238 scr_change_screen (state); 4052 scr_change_screen (state);
3239 break; 4053 break;
3240 /* case 66: - application key pad */ 4054 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4055 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4056 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4057 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4058 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4059 break;
3246#if 0 4060#if 0
3247 case 1001: 4061 case 1001:
3248 break; /* X11 mouse highlighting */ 4062 break; /* X11 mouse highlighting */
3249#endif 4063#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4064 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 4065 if (state)
3252 Options &= ~Opt_scrollTtyOutput; 4066 options &= ~Opt_scrollTtyOutput;
3253 else 4067 else
3254 Options |= Opt_scrollTtyOutput; 4068 options |= Opt_scrollTtyOutput;
3255 break; 4069 break;
3256 case 1011: /* scroll to bottom on key press */ 4070 case 1011: /* scroll to bottom on key press */
3257 if (state) 4071 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4072 options |= Opt_scrollTtyKeypress;
3259 else 4073 else
3260 Options &= ~Opt_scrollTtyKeypress; 4074 options &= ~Opt_scrollTtyKeypress;
3261 break; 4075 break;
3262 case 1047: /* secondary screen w/ clearing */ 4076 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4077 if (options & Opt_secondaryScreen)
3264 if (current_screen != PRIMARY) 4078 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4079 scr_erase_screen (2);
3266 scr_change_screen (state); 4080 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4081 break;
4082 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen)
4085 if (current_screen != PRIMARY)
4086 scr_erase_screen (2);
4087 break;
4088 default:
4089 break;
3270 } 4090 }
3271 } 4091 }
3272} 4092}
3273/*}}} */ 4093/*}}} */
3274 4094
3275/*{{{ process sgr sequences */ 4095/*{{{ process sgr sequences */
3276void 4096void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4097rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4098{
3279 unsigned int i; 4099 unsigned int i;
3280 short rendset; 4100 short rendset;
3281 int rendstyle; 4101 int rendstyle;
3282 4102
3283 if (nargs == 0) 4103 if (nargs == 0)
3284 { 4104 {
3285 scr_rendition (0, ~RS_None); 4105 scr_rendition (0, ~RS_None);
3286 return; 4106 return;
3287 } 4107 }
4108
3288 for (i = 0; i < nargs; i++) 4109 for (i = 0; i < nargs; i++)
3289 { 4110 {
3290 rendset = -1; 4111 rendset = -1;
3291 switch (arg[i]) 4112 switch (arg[i])
3292 { 4113 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4115 rendset = 0, rendstyle = ~RS_None;
3295 break; 4116 break;
3296 case 1: 4117 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4118 rendset = 1, rendstyle = RS_Bold;
3298 break; 4119 break;
4120 //case 2: // low intensity
4121 case 3:
4122 rendset = 1, rendstyle = RS_Italic;
4123 break;
3299 case 4: 4124 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4125 rendset = 1, rendstyle = RS_Uline;
3301 break; 4126 break;
3302 case 5: 4127 case 5: // slowly blinking
4128 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4129 rendset = 1, rendstyle = RS_Blink;
3304 break; 4130 break;
4131 //case 6: // scoansi light background
3305 case 7: 4132 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4133 rendset = 1, rendstyle = RS_RVid;
3307 break; 4134 break;
3308 case 22: 4135 case 8:
4136 // invisible. NYI
4137 break;
4138 //case 9: // crossed out
4139 //case 10: // scoansi acs off, primary font
4140 //case 11: // scoansi acs on, first alt font
4141 //case 12: // scoansi acs on, |0x80, second alt font
4142 //...
4143 //case 19: // ninth alt font
4144 //case 20: // gothic
4145 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
4147 break;
4148 case 22: // normal intensity
4149 rendset = 0, rendstyle = RS_Bold;
4150 break;
4151 case 23: // disable italic
4152 rendset = 0, rendstyle = RS_Italic;
3310 break; 4153 break;
3311 case 24: 4154 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4155 rendset = 0, rendstyle = RS_Uline;
3313 break; 4156 break;
3314 case 25: 4157 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3316 break; 4159 break;
4160 case 26: // variable spacing (iso 8613)
4161 rendset = 0, rendstyle = RS_Blink;
4162 break;
3317 case 27: 4163 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4164 rendset = 0, rendstyle = RS_RVid;
3319 break; 4165 break;
4166 //case 28: // visible. NYI
4167 //case 29: // not crossed-out
3320 } 4168 }
4169
3321 if (rendset != -1) 4170 if (rendset != -1)
3322 { 4171 {
3323 scr_rendition (rendset, rendstyle); 4172 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4173 continue; /* for (;i;) */
3325 } 4174 }
… …
3332 case 33: 4181 case 33:
3333 case 34: 4182 case 34:
3334 case 35: 4183 case 35:
3335 case 36: 4184 case 36:
3336 case 37: 4185 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4186 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4187 break;
3340#ifdef TTY_256COLOR 4188 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4189 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4190 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4191 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4192 i += 2;
3347 } 4193 }
3348 break; 4194 break;
3349#endif
3350 case 39: /* default fg */ 4195 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4196 scr_color (Color_fg, Color_fg);
3352 break; 4197 break;
3353 4198
3354 case 40: 4199 case 40:
… …
3357 case 43: 4202 case 43:
3358 case 44: 4203 case 44:
3359 case 45: 4204 case 45:
3360 case 46: 4205 case 46:
3361 case 47: 4206 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4207 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4208 break;
3365#ifdef TTY_256COLOR 4209 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4210 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4211 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4212 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4213 i += 2;
3372 } 4214 }
3373 break; 4215 break;
3374#endif
3375 case 49: /* default bg */ 4216 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4217 scr_color (Color_bg, Color_bg);
3377 break; 4218 break;
4219
4220 //case 50: // not variable spacing
3378 4221
3379#ifndef NO_BRIGHTCOLOR 4222#ifndef NO_BRIGHTCOLOR
3380 case 90: 4223 case 90:
3381 case 91: /* set bright fg color */ 4224 case 91: /* set bright fg color */
3382 case 92: 4225 case 92:
3383 case 93: 4226 case 93:
3384 case 94: 4227 case 94:
3385 case 95: 4228 case 95:
3386 case 96: 4229 case 96:
3387 case 97: 4230 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4231 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4232 break;
3391 case 100: 4233 case 100:
3392 case 101: /* set bright bg color */ 4234 case 101: /* set bright bg color */
3393 case 102: 4235 case 102:
3394 case 103: 4236 case 103:
3395 case 104: 4237 case 104:
3396 case 105: 4238 case 105:
3397 case 106: 4239 case 106:
3398 case 107: 4240 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4242 break;
3402#endif 4243#endif
3403 4244
3404 } 4245 }
3405 } 4246 }
3406} 4247}
3407/*}}} */ 4248/*}}} */
3408 4249
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4250/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4251void
3411rxvt_term::process_graphics () 4252rxvt_term::process_graphics ()
3412{ 4253{
3413 unsigned char ch, cmd = cmd_getc (); 4254 unicode_t ch, cmd = cmd_getc ();
3414 4255
3415 if (cmd == 'Q') 4256 if (cmd == 'Q')
3416 { /* query graphics */ 4257 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4258 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4259 return;
3419 } 4260 }
3420 /* swallow other graphics sequences until terminating ':' */ 4261 /* swallow other graphics sequences until terminating ':' */
3421 do 4262 do
3422 ch = cmd_getc (); 4263 ch = cmd_getc ();
… …
3437 unsigned char buf[256]; 4278 unsigned char buf[256];
3438 4279
3439 va_start (arg_ptr, fmt); 4280 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4282 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4283 tt_write (buf, strlen (buf));
3443} 4284}
3444 4285
3445/* ---------------------------------------------------------------------- */ 4286/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4287/* 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. 4288 * or generated by us in response to a query ESC sequence.
3448 */ 4289 */
3449void 4290void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3451{ 4292{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3453 4294
3454 if (len) 4295 if (len)
3455 { 4296 {
3456 if (v_buflen == 0) 4297 if (v_buflen == 0)
3457 { 4298 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3459 4300
3460 if ((unsigned int)written == len) 4301 if ((unsigned int)written == len)
3461 return; 4302 return;
3462 4303
3463 data += written; 4304 data += written;
… …
3471 v_buflen += len; 4312 v_buflen += len;
3472 } 4313 }
3473 4314
3474 for (;;) 4315 for (;;)
3475 { 4316 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3477 4318
3478 if (written > 0) 4319 if (written > 0)
3479 { 4320 {
3480 v_buflen -= written; 4321 v_buflen -= written;
3481 4322

Diff Legend

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