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

Diff Legend

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