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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 61
62#if ENABLE_FRILLS || ISO_14755
63
64#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1)
66#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
67#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
68#define ISO_14755_MASK 0x0fffffffUL
69
70#if ISO_14755
71static unsigned short iso14755_symtab[] = {
72 // keysym, unicode
73 XK_Left, 0x2190,
74 XK_KP_Left, 0x2190,
75 XK_Up, 0x2191,
76 XK_KP_Up, 0x2191,
77 XK_Right, 0x2192,
78 XK_KP_Right, 0x2192,
79 XK_Down, 0x2193,
80 XK_KP_Down, 0x2193,
81 XK_Linefeed, 0x21b4,
82 XK_Return, 0x21b5,
83 XK_KP_Enter, 0x21b5,
84
85 XK_Prior, 0x21de,
86 XK_Next, 0x21df,
87 XK_Tab, 0x21e5,
88 XK_ISO_Left_Tab, 0x21e6,
89 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7,
91
92 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0,
100 XK_Home, 0x21f1,
101 XK_End, 0x21f2,
102
103 XK_Execute, 0x2318,
104 XK_Begin, 0x2320,
105 XK_Delete, 0x2326,
106 XK_Clear, 0x2327,
107 XK_BackSpace, 0x232b,
108 XK_Insert, 0x2380,
109 XK_Control_L, 0x2388,
110 XK_Control_R, 0x2388,
111 XK_Pause, 0x2389,
112 XK_Break, 0x238a,
113 XK_Escape, 0x238b,
114 XK_Undo, 0x238c,
115 XK_Print, 0x2399,
116
117 XK_space, 0x2423,
118 XK_KP_Space, 0x2422,
119 0,
120};
121
122void
123rxvt_term::iso14755_54 (int x, int y)
124{
125 x = Pixel2Col (x);
126 y = Pixel2Row (y);
127
128 if (x < 0 || x >= TermWin.ncol
129 || y < 0 || y >= TermWin.nrow)
130 return;
131
132 for (;;)
133 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
135
136 if (t != NOCHAR || !x)
137 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]);
139 iso14755buf = ISO_14755_54;
140 break;
141 }
142
143 x--;
144 }
145
146}
147#endif
148
149#if ENABLE_OVERLAY
150void
151rxvt_term::iso14755_51 (wchar_t ch)
152{
153 wchar_t *chr, *alloc;
154 int len;
155
156#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch))
158 {
159 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr);
162 }
163 else
164#endif
165 {
166 alloc = 0;
167 chr = &ch;
168 len = 1;
169 }
170
171 scr_overlay_new (0, -1, 8 + 5, len);
172
173 for (int y = 0; y < len; y++)
174 {
175 char buf[9];
176
177 ch = *chr++;
178
179 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '=');
182#if !UNICODE3
183 if (ch >= 0x10000)
184 ch = 0xfffd;
185#endif
186 scr_overlay_set (11, y, ch);
187 scr_overlay_set (12, y, NOCHAR);
188 }
189
190#if ENABLE_COMBINING
191 if (alloc)
192 delete [] alloc;
193#endif
194}
195#endif
196
197void
198rxvt_term::commit_iso14755 ()
199{
200 wchar_t ch[2];
201
202 ch[0] = iso14755buf & ISO_14755_MASK;
203 ch[1] = 0;
204
205 if (iso14755buf & ISO_14755_51)
206 {
207 char mb[16];
208 int len;
209
210 // allow verbatim 0-bytes and control-bytes to be entered
211 if (ch[0] >= 0x20)
212 len = wcstombs (mb, ch, 16);
213 else
214 {
215 mb[0] = ch[0];
216 len = 1;
217 }
218
219 if (len > 0)
220 tt_write ((unsigned char *)mb, len);
221 else
222 scr_bell ();
223 }
224
225 iso14755buf = 0;
226}
227
228int
229rxvt_term::hex_keyval (XKeyEvent &ev)
230{
231 // check wether this event corresponds to a hex digit
232 // if the modifiers had not been pressed.
233 for (int index = 0; index < 8; index++)
234 {
235 KeySym k = XLookupKeysym (&ev, index);
236
237 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
238 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
239 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
240 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
241 }
242
243 return -1;
244}
245#endif
246
62/*{{{ Convert the keypress event into a string */ 247/*{{{ Convert the keypress event into a string */
63void 248void
64rxvt_term::lookup_key (XKeyEvent &ev) 249rxvt_term::lookup_key (XKeyEvent &ev)
65{ 250{
66 int ctrl, meta, shft, len; 251 int ctrl, meta, shft, len;
… …
151 { 336 {
152 if (TermWin.saveLines) 337 if (TermWin.saveLines)
153 { 338 {
154#ifdef UNSHIFTED_SCROLLKEYS 339#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 340 if (!ctrl && !meta)
156 {
157#else 341#else
158 if (IS_SCROLL_MOD) 342 if (IS_SCROLL_MOD)
343#endif
159 { 344 {
160#endif
161 int lnsppg; 345 int lnsppg;
162 346
163#ifdef PAGING_CONTEXT_LINES 347#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 349#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 398 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 399 {
216 keysym += (XK_F11 - XK_F1); 400 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 401 shft = 0; /* turn off Shift */
218 } 402 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 403 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 404 {
221 switch (keysym) 405 switch (keysym)
222 { 406 {
223 /* normal XTerm key bindings */ 407 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 408 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 409 selection_request (ev.time, 0, 0);
226 return; 410 return;
411#if TODO // TODO
227 /* rxvt extras */ 412 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 413 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 414 change_font (FONT_UP);
230 return; 415 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 417 change_font (FONT_DN);
233 return; 418 return;
419#endif
234 } 420 }
235 } 421 }
236 } 422 }
423
424#if ENABLE_FRILLS || ISO_14755
425 // ISO 14755 support
426 if (shft && ctrl)
427 {
428 int hv;
429
430 if (iso14755buf & ISO_14755_51
431 && (keysym == XK_space || keysym == XK_KP_Space
432 || keysym == XK_Return || keysym == XK_KP_Enter))
433 {
434 commit_iso14755 ();
435 iso14755buf = ISO_14755_51;
436# if ISO_14755
437 iso14755_51 (0);
438# endif
439 return;
440 }
441 else if ((hv = hex_keyval (ev)) >= 0)
442 {
443 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
444 | hv | ISO_14755_51;
445# if ISO_14755
446 iso14755_51 (iso14755buf & ISO_14755_MASK);
447# endif
448 return;
449 }
450 else
451 {
452# if ENABLE_OVERLAY
453 scr_overlay_off ();
454# endif
455 iso14755buf = 0;
456 }
457 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED))
461 {
462 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif
467 }
468#endif
469
237#ifdef PRINTPIPE 470#ifdef PRINTPIPE
238 if (keysym == XK_Print) 471 if (keysym == XK_Print)
239 { 472 {
240 scr_printscreen (ctrl | shft); 473 scr_printscreen (ctrl | shft);
241 return; 474 return;
… …
273 newlen = 1; 506 newlen = 1;
274 switch (keysym) 507 switch (keysym)
275 { 508 {
276#ifndef NO_BACKSPACE_KEY 509#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 510 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 511 if (priv_modes & PrivMode_HaveBackSpace)
279 { 512 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 514 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 515 kbuf[1] = '\0';
283 } 516 }
284 else 517 else
285 STRCPY (kbuf, key_backspace); 518 strcpy (kbuf, key_backspace);
286 break; 519 break;
287#endif 520#endif
288#ifndef NO_DELETE_KEY 521#ifndef NO_DELETE_KEY
289 case XK_Delete: 522 case XK_Delete:
290 STRCPY (kbuf, key_delete); 523 strcpy (kbuf, key_delete);
291 break; 524 break;
292#endif 525#endif
293 case XK_Tab: 526 case XK_Tab:
294 if (shft) 527 if (shft)
295 STRCPY (kbuf, "\033[Z"); 528 strcpy (kbuf, "\033[Z");
296 else 529 else
297 { 530 {
298#ifdef CTRL_TAB_MAKES_META 531#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 532 if (ctrl)
300 meta = 1; 533 meta = 1;
… …
306 newlen = 0; 539 newlen = 0;
307 } 540 }
308 break; 541 break;
309 542
310#ifdef XK_KP_Left 543#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 544 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 545 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 546 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 547 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 549 {
317 STRCPY (kbuf, "\033OZ"); 550 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 552 break;
320 } 553 }
321 else 554 else
322 /* translate to std. cursor key */ 555 /* translate to std. cursor key */
… …
325#endif 558#endif
326 case XK_Up: /* "\033[A" */ 559 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 560 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 561 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 562 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 564 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 565 /* do Shift first */
333 if (shft) 566 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 568 else if (ctrl)
336 { 569 {
337 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 571 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 572 }
340 else if (PrivateModes & PrivMode_aplCUR) 573 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 574 kbuf[1] = 'O';
342 break; 575 break;
343 576
344#ifndef UNSHIFTED_SCROLLKEYS 577#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 578# ifdef XK_KP_Prior
346 case XK_KP_Prior: 579 case XK_KP_Prior:
347 /* allow shift to override */ 580 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 582 {
350 STRCPY (kbuf, "\033Oy"); 583 strcpy (kbuf, "\033Oy");
351 break; 584 break;
352 } 585 }
353 /* FALLTHROUGH */ 586 /* FALLTHROUGH */
354# endif 587# endif
355 case XK_Prior: 588 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 589 strcpy (kbuf, "\033[5~");
357 break; 590 break;
358# ifdef XK_KP_Next 591# ifdef XK_KP_Next
359 case XK_KP_Next: 592 case XK_KP_Next:
360 /* allow shift to override */ 593 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 595 {
363 STRCPY (kbuf, "\033Os"); 596 strcpy (kbuf, "\033Os");
364 break; 597 break;
365 } 598 }
366 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
367# endif 600# endif
368 case XK_Next: 601 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 602 strcpy (kbuf, "\033[6~");
370 break; 603 break;
371#endif 604#endif
372 case XK_KP_Enter: 605 case XK_KP_Enter:
373 /* allow shift to override */ 606 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 608 {
376 STRCPY (kbuf, "\033OM"); 609 strcpy (kbuf, "\033OM");
610 break;
611 }
612
613 /* FALLTHROUGH */
614
615 case XK_Return:
616 if (priv_modes & PrivMode_LFNL)
617 {
618 kbuf[0] = '\015';
619 kbuf[1] = '\012';
620 kbuf[2] = '\0';
377 } 621 }
378 else 622 else
379 { 623 {
380 kbuf[0] = '\r'; 624 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 625 kbuf[1] = '\0';
382 } 626 }
383 break; 627 break;
384 628
385#ifdef XK_KP_Begin 629#ifdef XK_KP_Begin
386 case XK_KP_Begin: 630 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 631 strcpy (kbuf, "\033Ou");
388 break; 632 break;
389 633
390 case XK_KP_Insert: 634 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 635 strcpy (kbuf, "\033Op");
392 break; 636 break;
393 637
394 case XK_KP_Delete: 638 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 639 strcpy (kbuf, "\033On");
396 break; 640 break;
397#endif 641#endif
398 case XK_KP_F1: /* "\033OP" */ 642 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 643 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 644 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 645 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 646 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 647 kbuf[2] += (keysym - XK_KP_F1);
404 break; 648 break;
405 649
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 650 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 651 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 662 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 663 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 664 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 665 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 666 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 668 {
425 STRCPY (kbuf, "\033Oj"); 669 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 670 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 671 }
428 else 672 else
429 { 673 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 675 kbuf[1] = '\0';
432 } 676 }
433 break; 677 break;
434 678
435 case XK_Find: 679 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 680 strcpy (kbuf, "\033[1~");
437 break; 681 break;
438 case XK_Insert: 682 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 683 strcpy (kbuf, "\033[2~");
440 break; 684 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 685#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 686 case DXK_Remove:
443 /* FALLTHROUGH */ 687 /* FALLTHROUGH */
444#endif 688#endif
445 case XK_Execute: 689 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 690 strcpy (kbuf, "\033[3~");
447 break; 691 break;
448 case XK_Select: 692 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 693 strcpy (kbuf, "\033[4~");
450 break; 694 break;
451#ifdef XK_KP_End 695#ifdef XK_KP_End
452 case XK_KP_End: 696 case XK_KP_End:
453 /* allow shift to override */ 697 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 699 {
456 STRCPY (kbuf, "\033Oq"); 700 strcpy (kbuf, "\033Oq");
457 break; 701 break;
458 } 702 }
459 /* FALLTHROUGH */ 703 /* FALLTHROUGH */
460#endif 704#endif
461 case XK_End: 705 case XK_End:
462 STRCPY (kbuf, KS_END); 706 strcpy (kbuf, KS_END);
463 break; 707 break;
464#ifdef XK_KP_Home 708#ifdef XK_KP_Home
465 case XK_KP_Home: 709 case XK_KP_Home:
466 /* allow shift to override */ 710 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 712 {
469 STRCPY (kbuf, "\033Ow"); 713 strcpy (kbuf, "\033Ow");
470 break; 714 break;
471 } 715 }
472 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
473#endif 717#endif
474 case XK_Home: 718 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 719 strcpy (kbuf, KS_HOME);
476 break; 720 break;
477 721
478#define FKEY(n, fkey) \ 722#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 724
… …
533 default: 777 default:
534 newlen = 0; 778 newlen = 0;
535 break; 779 break;
536 } 780 }
537 if (newlen) 781 if (newlen)
538 len = STRLEN (kbuf); 782 len = strlen (kbuf);
539 } 783 }
540 784
541 /* 785 /*
542 * Pass meta for all function keys, if 'meta' option set 786 * Pass meta for all function keys, if 'meta' option set
543 */ 787 */
… …
571 } 815 }
572 816
573 if (len <= 0) 817 if (len <= 0)
574 return; /* not mapped */ 818 return; /* not mapped */
575 819
576 if (Options & Opt_scrollTtyKeypress) 820 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 821 if (TermWin.view_start)
578 { 822 {
579 TermWin.view_start = 0; 823 TermWin.view_start = 0;
580 want_refresh = 1; 824 want_refresh = 1;
581 } 825 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 874 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 876
633 if (n > 0 && s < count) 877 if (n > 0 && s < count)
634 { 878 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 879 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 880 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 881 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 882 cmdbuf_endp -= n;
639 s += n; 883 s += n;
640 } 884 }
… …
661 if (want_full_refresh) 905 if (want_full_refresh)
662 { 906 {
663 want_full_refresh = 0; 907 want_full_refresh = 0;
664 scr_clear (); 908 scr_clear ();
665 scr_touch (false); 909 scr_touch (false);
666 want_refresh = 1;
667 } 910 }
668#endif 911#endif
669 912
670 if (want_refresh) 913 if (want_refresh)
671 { 914 {
672 scr_refresh (refresh_type); 915 scr_refresh (refresh_type);
673 scrollbar_show (1); 916 scrollbar_show (1);
674#ifdef USE_XIM 917#ifdef USE_XIM
675 IMSendSpot (); 918 IMSendSpot ();
676#endif 919#endif
677
678 } 920 }
679 921
680 display->flush (); 922 display->flush ();
923
924 flush_ev.stop ();
681} 925}
682 926
683void 927void
684rxvt_term::check_cb (check_watcher &w) 928rxvt_term::check_cb (check_watcher &w)
685{ 929{
686 SET_R (this); 930 SET_R (this);
687 SET_LOCALE (locale); 931 SET_LOCALE (locale);
688 932
933 display->flush ();
934
935 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01);
937}
938
939void
940rxvt_term::flush_cb (time_watcher &w)
941{
942 SET_R (this);
943 SET_LOCALE (locale);
944
945 refresh_limit = 1;
946 refresh_count = 0;
689 flush (); 947 flush ();
690} 948}
691 949
692#ifdef CURSOR_BLINK 950#ifdef CURSOR_BLINK
693void 951void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 969 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 970 }
713} 971}
714#endif 972#endif
715 973
974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
975void
976rxvt_term::cont_scroll_cb (time_watcher &w)
977{
978 if ((scrollbar_isUp() || scrollbar_isDn()) &&
979 scr_page (scrollbar_isUp() ? UP : DN, 1))
980 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
984 }
985}
986#endif
987
988#ifdef SELECTION_SCROLLING
989void
990rxvt_term::sel_scroll_cb (time_watcher &w)
991{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
998 }
999}
1000#endif
1001
1002#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1003void
1004rxvt_term::slip_wheel_cb (time_watcher &w)
1005{
1006 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed))
1009 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 }
1014}
1015#endif
1016
716bool 1017bool
717rxvt_term::pty_fill () 1018rxvt_term::pty_fill ()
718{ 1019{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021
1022 if (CBUFSIZ == n)
1023 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0;
1026 }
720 1027
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1028 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1029 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1030 cmdbuf_endp = cmdbuf_ptr + n;
724 1031
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1033
727 if (n > 0) 1034 if (n > 0)
728 { 1035 {
729 cmdbuf_endp += n; 1036 cmdbuf_endp += n;
730 return true; 1037 return true;
… …
742 SET_LOCALE (locale); 1049 SET_LOCALE (locale);
743 1050
744 if (revents & EVENT_WRITE) 1051 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1052 tt_write (0, 0);
746 else if (revents & EVENT_READ) 1053 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 1054 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ()) 1055 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759
760 if (cmd_parse ()) 1056 if (cmd_parse ())
761 break; 1057 break;
762 } 1058}
763 } 1059
1060void
1061rxvt_term::pointer_unblank ()
1062{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1064 recolour_cursor ();
1065
1066#ifdef POINTER_BLANK
1067 hidden_pointer = 0;
1068
1069 if (options & Opt_pointerBlank)
1070 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif
764} 1072}
765 1073
766#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
767void 1075void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1076rxvt_term::pointer_blank ()
781{ 1077{
782 if (! (Options & Opt_pointerBlank)) 1078 if (! (options & Opt_pointerBlank))
783 return; 1079 return;
784 1080
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1081 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1082 XFlush (display->display);
787 1083
… …
807 x = ev.x; 1103 x = ev.x;
808 y = ev.y; 1104 y = ev.y;
809 pixel_position (&x, &y); 1105 pixel_position (&x, &y);
810 1106
811 if (MEvent.button == AnyButton) 1107 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1108 button_number = 3;
814 }
815 else 1109 else
816 { 1110 {
817 button_number = MEvent.button - Button1; 1111 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1112 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1113 if (button_number >= 3)
820 button_number += (64 - 3); 1114 button_number += (64 - 3);
821 } 1115 }
822 1116
823 if (PrivateModes & PrivMode_MouseX10) 1117 if (priv_modes & PrivMode_MouseX10)
824 { 1118 {
825 /* 1119 /*
826 * do not report ButtonRelease 1120 * do not report ButtonRelease
827 * no state info allowed 1121 * no state info allowed
828 */ 1122 */
… …
886{ 1180{
887 SET_R (this); 1181 SET_R (this);
888 SET_LOCALE (locale); 1182 SET_LOCALE (locale);
889 1183
890#if defined(CURSOR_BLINK) 1184#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1186 {
893 if (hidden_cursor) 1187 if (hidden_cursor)
894 { 1188 {
895 hidden_cursor = 0; 1189 hidden_cursor = 0;
896 want_refresh = 1; 1190 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1194 }
901#endif 1195#endif
902 1196
903#if defined(POINTER_BLANK) 1197#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1199 {
906 if (ev.type == MotionNotify 1200 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1201 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1202 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1203 if (hidden_pointer)
… …
921 1215
922 Window unused_root, unused_child; 1216 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1217 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1218 unsigned int unused_mask;
925 1219
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974
975 switch (ev.type) 1220 switch (ev.type)
976 { 1221 {
977 case KeyPress: 1222 case KeyPress:
1223#if ISO_14755
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
978 lookup_key (ev.xkey); 1226 lookup_key (ev.xkey);
1227
1228 break;
1229
1230 case KeyRelease:
1231 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
979 break; 1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
980 1291
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1293 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1296 mouse_slip_wheel_speed = 0;
986 else 1297#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1298 break;
995 } 1299 }
996#endif
997 1300
998 case ButtonPress: 1301 case ButtonPress:
999 button_press (ev.xbutton); 1302 button_press (ev.xbutton);
1000 break; 1303 break;
1001 1304
… …
1013 && (ev.xclient.data.l[0] == DndFile 1316 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1317 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1318 || ev.xclient.data.l[0] == DndLink))
1016 { 1319 {
1017 /* Get Dnd data */ 1320 /* Get Dnd data */
1018 Atom ActualType; 1321 Atom ActualType;
1019 int ActualFormat; 1322 int ActualFormat;
1020 unsigned char *data; 1323 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1324 unsigned long Size, RemainingBytes;
1022 1325
1023 XGetWindowProperty (display->display, display->root, 1326 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1327 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1328 0L, 1000000L,
1026 False, AnyPropertyType, 1329 False, AnyPropertyType,
… …
1028 &Size, &RemainingBytes, 1331 &Size, &RemainingBytes,
1029 &data); 1332 &data);
1030 XChangeProperty (display->display, display->root, 1333 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1334 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1335 8, PropModeReplace,
1033 data, STRLEN (data)); 1336 data, strlen (data));
1337 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1340 }
1037#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1038 break; 1342 break;
1039 1343
1040 case MappingNotify: 1344 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1346 break;
1043 1347
1044 /* 1348 /*
1045 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1071 { 1375 {
1072 TermWin.focus = 1; 1376 TermWin.focus = 1;
1073 want_refresh = 1; 1377 want_refresh = 1;
1074#ifdef USE_XIM 1378#ifdef USE_XIM
1075 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1077#endif 1384#endif
1078#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1081#endif 1397#endif
1082 1398
1083 } 1399 }
1084 break; 1400 break;
1085 1401
… …
1091#ifdef USE_XIM 1407#ifdef USE_XIM
1092 if (Input_Context != NULL) 1408 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1409 XUnsetICFocus (Input_Context);
1094#endif 1410#endif
1095#ifdef CURSOR_BLINK 1411#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1412 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1413 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1099#endif 1424#endif
1100 1425
1101 } 1426 }
1102 break; 1427 break;
1103 1428
… …
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1439 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1441
1117 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1); 1443 resize_all_windows (width, height, 1);
1121 } 1444
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1130 { 1447 {
1131 check_our_parents (); 1448 check_our_parents ();
1132 if (am_transparent) 1449 if (am_transparent)
1133 want_full_refresh = 1; 1450 want_refresh = want_full_refresh = 1;
1134 } 1451 }
1135#endif 1452#endif
1136 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1137 break; 1461 break;
1138 1462
1139 case SelectionClear: 1463 case SelectionClear:
1140 selection_clear (); 1464 selection_clear ();
1141 break; 1465 break;
… …
1172 1496
1173 case GraphicsExpose: 1497 case GraphicsExpose:
1174 case Expose: 1498 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1176 { 1500 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1505
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1511
1185 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1513 }
1189 else 1514 else
1190 { 1515 {
1191 XEvent unused_event; 1516 XEvent unused_event;
1192 1517
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1519 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1521 ;
1198 &unused_event)) ; 1522
1199 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1200 { 1524 {
1201 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1202 scrollbar_show (0); 1526 scrollbar_show (0);
1203 } 1527 }
1204#ifdef MENUBAR 1528#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1530 menubar_expose ();
1207#endif 1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1208 } 1537 }
1209 break; 1538 break;
1210 1539
1211 case MotionNotify: 1540 case MotionNotify:
1212#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1218 { 1547 {
1219 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1220 break; 1549 break;
1221 } 1550 }
1222#endif 1551#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1224 break; 1553 break;
1225 1554
1226 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1227 { 1556 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1558 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1560 ;
1232 1561
1233 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1565 & (ev.xbutton.x), & (ev.xbutton.y),
1237 &unused_mask); 1566 &unused_mask);
1238#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1570 {
1242#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1245#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1585 {
1249 int dist; 1586 int dist;
1250 1587
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1255 */ 1590 */
1256 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1593
1259 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1261 */ 1596 */
1262 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1600
1267 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y<TermWin.int_bwidth)
1269 { 1603 {
1270 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1606 }
1273 else 1607 else
1274 { 1608 {
1275 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1611 }
1612
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1281 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1283 } 1618 }
1284 else 1619 else
1285 { 1620 {
1286 /* we are within the text window, so we 1621 /* we are within the text window, so we
1287 * shouldn't be scrolling 1622 * shouldn't be scrolling
1288 */ 1623 */
1289 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1290 } 1626 }
1291#endif 1627#endif
1292#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1293
1294 } 1629 }
1295#endif 1630#endif
1296
1297 } 1631 }
1298 } 1632 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1634 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1636 MotionNotify, &ev)) ;
1303 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1640 & (ev.xbutton.x), & (ev.xbutton.y),
1307 &unused_mask); 1641 &unused_mask);
… …
1313 } 1647 }
1314 break; 1648 break;
1315 } 1649 }
1316} 1650}
1317 1651
1652#if TRANSPARENT
1318void 1653void
1319rxvt_term::rootwin_cb (XEvent &ev) 1654rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1655{
1321 SET_R (this); 1656 SET_R (this);
1322 SET_LOCALE (locale); 1657 SET_LOCALE (locale);
1323 1658
1324 switch (ev.type) 1659 switch (ev.type)
1325 { 1660 {
1326 case PropertyNotify: 1661 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1662 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1663 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1664 * use the property to determine the pixmap. We use it later on.
1339 */ 1665 */
1340 if (xa[XA_XROOTPMAPID] == 0) 1666 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342 1668
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1344 return; 1670 return;
1345 }
1346 1671
1347 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1348 case ReparentNotify: 1673 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1351 break; 1676 break;
1352#endif
1353 } 1677 }
1354} 1678}
1679#endif
1355 1680
1356void 1681void
1357rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1358{ 1683{
1359 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1360 1685
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1687 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1364 /* 1690 /*
1365 * VT window processing of button press 1691 * VT window processing of button press
1366 */ 1692 */
1367 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1368 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1370 if (reportmode) 1705 if (reportmode)
1371 { 1706 {
1372 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
… …
1407 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1408 switch (ev.button) 1743 switch (ev.button)
1409 { 1744 {
1410 case Button1: 1745 case Button1:
1411 /* allow shift+left click to extend selection */ 1746 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1748 {
1414 if (MEvent.button == Button1 && clickintime) 1749 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1750 selection_rotate (ev.x, ev.y);
1416 else 1751 else
1417 selection_extend (ev.x, ev.y, 1); 1752 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1767 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1768 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1769 selection_rotate (ev.x, ev.y);
1435 else 1770 else
1436 selection_extend (ev.x, ev.y, 1); 1771 selection_extend (ev.x, ev.y, 1);
1772
1437 MEvent.button = Button3; 1773 MEvent.button = Button3;
1438 break; 1774 break;
1439 } 1775 }
1440 } 1776 }
1777
1441 MEvent.time = ev.time; 1778 MEvent.time = ev.time;
1442 return; 1779 return;
1443 } 1780 }
1444 1781
1445 /* 1782 /*
… …
1511 upordown = 1; /* down */ 1848 upordown = 1; /* down */
1512 } 1849 }
1513 if (upordown) 1850 if (upordown)
1514 { 1851 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1852#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1853 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1854#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1855 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1856 {
1520 if (upordown < 0) 1857 if (upordown < 0)
1521 scrollBar.setUp (); 1858 scrollBar.setUp ();
… …
1537 break; 1874 break;
1538 case R_SB_ALIGN_BOTTOM: 1875 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1876 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1877 break;
1541 } 1878 }
1879
1542 if (scrollBar.style == R_SB_XTERM 1880 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1881 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1882 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1884
1547 scrollBar.setMotion (); 1885 scrollBar.setMotion ();
1548 break; 1886 break;
1549 1887
1550 case Button1: 1888 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1889 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1913 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1914 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1915 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1916 / scrollbar_size ()));
1579 } 1917 }
1918
1580 break; 1919 break;
1581 } 1920 }
1582 } 1921 }
1583 return; 1922 return;
1584 } 1923 }
… …
1596{ 1935{
1597 int reportmode = 0; 1936 int reportmode = 0;
1598 1937
1599 csrO = 0; /* reset csr Offset */ 1938 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1939 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1940 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1941
1603 if (scrollbar_isUpDn ()) 1942 if (scrollbar_isUpDn ())
1604 { 1943 {
1605 scrollBar.setIdle (); 1944 scrollBar.setIdle ();
1606 scrollbar_show (0); 1945 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1947 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1948#endif
1610
1611 } 1949 }
1950
1612#ifdef SELECTION_SCROLLING 1951#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1952 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop();
1614#endif 1954#endif
1955
1615 if (ev.window == TermWin.vt) 1956 if (ev.window == TermWin.vt)
1616 { 1957 {
1958#if ISO_14755
1959 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return;
1962#endif
1617 if (reportmode) 1963 if (reportmode)
1618 { 1964 {
1619 /* mouse report from vt window */ 1965 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1966 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1967 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 1981 MEvent.button = AnyButton;
1636 mouse_report (ev); 1982 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 1983#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 1984 return;
1639 } 1985 }
1986
1640 /* 1987 /*
1641 * dumb hack to compensate for the failure of click-and-drag 1988 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 1989 * when overriding mouse reporting
1643 */ 1990 */
1644 if (PrivateModes & PrivMode_mouse_report 1991 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 1992 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 1993 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 1994 selection_extend (ev.x, ev.y, 0);
1648 1995
1649 switch (ev.button) 1996 switch (ev.button)
… …
1660 case Button5: 2007 case Button5:
1661 { 2008 {
1662 int i; 2009 int i;
1663 page_dirn v; 2010 page_dirn v;
1664 2011
1665 v = (ev.button == Button4) ? UP : DN; 2012 v = ev.button == Button4 ? UP : DN;
2013
1666 if (ev.state & ShiftMask) 2014 if (ev.state & ShiftMask)
1667 i = 1; 2015 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2016 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2017 i = TermWin.nrow - 1;
1670 else 2018 else
1671 i = 5; 2019 i = 5;
2020
1672# ifdef MOUSE_SLIP_WHEELING 2021# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2022 if (ev.state & ControlMask)
1674 { 2023 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2024 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2027
2028 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030
2031 slip_wheel_ev.start ();
1677 } 2032 }
2033 else
2034 {
1678# endif 2035# endif
1679# ifdef JUMP_MOUSE_WHEEL 2036# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2037 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2038 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2039 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING
1689 } 2049 }
1690# endif 2050#endif
1691
1692 } 2051 }
1693 break; 2052 break;
1694#endif 2053#endif
1695
1696 } 2054 }
1697 } 2055 }
1698#ifdef MENUBAR 2056#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2057 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2058 menubar_control (ev);
1701#endif 2059#endif
1702} 2060}
1703 2061
1704#ifdef TRANSPARENT 2062#ifdef TRANSPARENT
1705#if TINTING 2063#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2064/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2065
1709static void 2066typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2067
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2069{
1717 /* No saturation */ 2070 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2071 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i;
1721 2076
1722 b = ((uint16_t *) ptr)[x]; 2077 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2078
1724 g = (b & 0x3e0) * gm; 2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2080
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2081 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2082 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2083 mask_g = visual->green_mask;
1729 } 2084 mask_b = visual->blue_mask;
1730 ptr += bpl; 2085
1731 } 2086 /* boring lookup table pre-initialization */
2087 switch (srcImage->bits_per_pixel) {
2088 case 15:
2089 if ((mask_r != 0x7c00) ||
2090 (mask_g != 0x03e0) ||
2091 (mask_b != 0x001f))
2092 return;
2093 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2094 lookup_r = lookup;
2095 lookup_g = lookup+32;
2096 lookup_b = lookup+32+32;
2097 sh_r = 10;
2098 sh_g = 5;
2099 sh_b = 0;
2100 break;
2101 case 16:
2102 if ((mask_r != 0xf800) ||
2103 (mask_g != 0x07e0) ||
2104 (mask_b != 0x001f))
2105 return;
2106 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2107 lookup_r = lookup;
2108 lookup_g = lookup+32;
2109 lookup_b = lookup+32+64;
2110 sh_r = 11;
2111 sh_g = 5;
2112 sh_b = 0;
2113 break;
2114 case 24:
2115 if ((mask_r != 0xff0000) ||
2116 (mask_g != 0x00ff00) ||
2117 (mask_b != 0x0000ff))
2118 return;
2119 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2120 lookup_r = lookup;
2121 lookup_g = lookup+256;
2122 lookup_b = lookup+256+256;
2123 sh_r = 16;
2124 sh_g = 8;
2125 sh_b = 0;
2126 break;
2127 case 32:
2128 if ((mask_r != 0xff0000) ||
2129 (mask_g != 0x00ff00) ||
2130 (mask_b != 0x0000ff))
2131 return;
2132 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2133 lookup_r = lookup;
2134 lookup_g = lookup+256;
2135 lookup_b = lookup+256+256;
2136 sh_r = 16;
2137 sh_g = 8;
2138 sh_b = 0;
2139 break;
2140 default:
2141 return; /* we do not support this color depth */
2142 }
2143
2144 /* prepare limits for color transformation (each channel is handled separately) */
2145 if (shade < 0) {
2146 shade = -shade;
2147 if (shade < 0) shade = 0;
2148 if (shade > 100) shade = 100;
2149
2150 lower_lim_r = 65535-rm;
2151 lower_lim_g = 65535-gm;
2152 lower_lim_b = 65535-bm;
2153
2154 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2155 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2156 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2157
2158 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2159 } else {
1733 for (y = h; --y >= 0;) { 2160 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2161 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2162
1737 b = ((uint16_t *) ptr)[x]; 2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2164
1739 g = (b & 0x3e0) * gm; 2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2168 }
1743 b |= (!(b >> 5) - 1); 2169
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2172 {
1747 } 2173 unsigned int tmp;
1748 ptr += bpl; 2174
2175 tmp = lower_lim_r;
2176 lower_lim_r = lower_lim_b;
2177 lower_lim_b = tmp;
2178
2179 tmp = upper_lim_r;
2180 upper_lim_r = upper_lim_b;
2181 upper_lim_b = tmp;
2182 }
2183
2184 /* fill our lookup tables */
2185 for (i = 0; i <= mask_r>>sh_r; i++)
2186 {
2187 RUINT32T tmp;
2188 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2189 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2190 lookup_r[i] = (tmp/65535)<<sh_r;
2191 }
2192 for (i = 0; i <= mask_g>>sh_g; i++)
2193 {
2194 RUINT32T tmp;
2195 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2196 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2197 lookup_g[i] = (tmp/65535)<<sh_g;
2198 }
2199 for (i = 0; i <= mask_b>>sh_b; i++)
2200 {
2201 RUINT32T tmp;
2202 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2203 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2204 lookup_b[i] = (tmp/65535)<<sh_b;
2205 }
2206
2207 /* apply table to input image (replacing colors by newly calculated ones) */
2208 switch (srcImage->bits_per_pixel)
2209 {
2210 case 15:
2211 {
2212 unsigned short *p1, *pf, *p, *pl;
2213 p1 = (unsigned short *) srcImage->data;
2214 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2215 while (p1 < pf)
2216 {
2217 p = p1;
2218 pl = p1 + srcImage->width;
2219 for (; p < pl; p++)
1749 } 2220 {
2221 *p = lookup_r[(*p & 0x7c00)>>10] |
2222 lookup_g[(*p & 0x03e0)>> 5] |
2223 lookup_b[(*p & 0x001f)];
2224 }
2225 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2226 }
1751} 2227 break;
1752 2228 }
1753/* RGB 16 */ 2229 case 16:
1754static void 2230 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2231 unsigned short *p1, *pf, *p, *pl;
1756{ 2232 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2234 while (p1 < pf)
1759 2235 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2236 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2237 pl = p1 + srcImage->width;
1762 /* No saturation */ 2238 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2239 {
1777 } else { 2240 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2241 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2242 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2243 }
1793 ptr += bpl; 2244 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2245 }
2246 break;
2247 }
2248 case 24:
2249 {
2250 unsigned char *p1, *pf, *p, *pl;
2251 p1 = (unsigned char *) srcImage->data;
2252 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2253 while (p1 < pf)
2254 {
2255 p = p1;
2256 pl = p1 + srcImage->width * 3;
2257 for (; p < pl; p += 3)
1794 } 2258 {
2259 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2260 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2261 p[2] = lookup_r[(p[2] & 0x0000ff)];
2262 }
2263 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2264 }
1796} 2265 break;
2266 }
2267 case 32:
2268 {
2269 RUINT32T *p1, *pf, *p, *pl;
2270 p1 = (RUINT32T *) srcImage->data;
2271 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2272
1798/* RGB 24 */ 2273 while (p1 < pf)
1799static void 2274 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2275 p = p1;
1801{ 2276 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2277 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2278 {
1830 } else { 2279 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2280 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2281 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2282 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2283 }
1861 ptr += bpl; 2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2285 }
2286 break;
2287 }
1863 } 2288 }
1864}
1865 2289
1866/* RGB 32 */ 2290 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2291}
1937
1938#endif 2292#endif
1939 2293
1940/* 2294/*
1941 * Check our parents are still who we think they are. 2295 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2296 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2306 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2307 XWindowAttributes wattr, wrootattr;
1954 2308
1955 pchanged = 0; 2309 pchanged = 0;
1956 2310
1957 if (!(Options & Opt_transparent)) 2311 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2312 return pchanged; /* Don't try any more */
1959 2313
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2315 rootdepth = wrootattr.depth;
1962 2316
… …
1965 if (rootdepth != wattr.depth) 2319 if (rootdepth != wattr.depth)
1966 { 2320 {
1967 if (am_transparent) 2321 if (am_transparent)
1968 { 2322 {
1969 pchanged = 1; 2323 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2325 am_transparent = am_pixmap_trans = 0;
1972 } 2326 }
1973 2327
1974 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1975 } 2329 }
… …
1991 i = (xa[XA_XSETROOTID] 2345 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2348 &nitems, &bytes_after, &prop) == Success);
1995 2349
1996 if (!i || prop == NULL) 2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
1997 have_pixmap = 0; 2355 have_pixmap = 0;
1998 else 2356 else
1999 { 2357 {
2000 have_pixmap = 1; 2358 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2359 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2360 XFree (prop);
2003 } 2361 }
2004 2362
2005 if (have_pixmap) 2363 if (have_pixmap)
2006 { 2364 {
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2421 XFreePixmap (display->display, TermWin.pixmap);
2064 2422
2065#if TINTING 2423#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2424 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2425 {
2068 unsigned short shade, rm, gm, bm; 2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2428
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2430
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2431 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2432 }
2083#endif 2433#endif
2084 2434
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2436 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2439 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2440 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2441 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2443 XClearWindow (display->display, TermWin.parent[0]);
2094 2444
2095 if (!am_transparent || !am_pixmap_trans) 2445 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2446 pchanged = 1;
2097 2447
2098 am_transparent = am_pixmap_trans = 1; 2448 am_transparent = am_pixmap_trans = 1;
… …
2103 { 2453 {
2104 unsigned int n; 2454 unsigned int n;
2105 /* 2455 /*
2106 * InheritPixmap transparency 2456 * InheritPixmap transparency
2107 */ 2457 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2459 {
2111 oldp = TermWin.parent[i]; 2460 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2462 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2463 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2464
2117 if (TermWin.parent[i] == display->root) 2465 if (TermWin.parent[i] == display->root)
2118 { 2466 {
2119 if (oldp != None) 2467 if (oldp != None)
2120 pchanged = 1; 2468 pchanged = 1;
… …
2131 if (pchanged) 2479 if (pchanged)
2132 { 2480 {
2133 for (; n < (unsigned int)i; n++) 2481 for (; n < (unsigned int)i; n++)
2134 { 2482 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2485 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2487 break;
2141 } 2488 }
2142 } 2489 }
2143 } 2490 }
2144 2491
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2493 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2496 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2497 /* XXX: also turn off Opt_transparent? */
2152 } 2498 }
2153 else 2499 else
2154 { 2500 {
2155#if WAIT_FOR_WM 2501#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2502 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2503 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2504 sleep (1);
2159#endif 2505#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2163 2511
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2513 am_transparent = 1;
2166 } 2514 }
2167 2515
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2517 TermWin.parent[i] = None;
2518 }
2519
2520 // this is experimental
2521 if (scrollBar.win)
2522 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle ();
2526 scrollbar_show (0);
2170 } 2527 }
2171 2528
2172 return pchanged; 2529 return pchanged;
2173} 2530}
2174#endif 2531#endif
… …
2191 } 2548 }
2192 2549
2193 if (ch == NOCHAR) // TODO: improve 2550 if (ch == NOCHAR) // TODO: improve
2194 break; 2551 break;
2195 2552
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 {
2555 if (!seen_input)
2197 { 2556 {
2557 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong.
2562 kill (-cmd_pid, SIGWINCH);
2563 }
2564
2198 /* Read a text string from the input buffer */ 2565 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2566 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2567 bool refreshnow = false;
2201 int nlines = 0; 2568 int nlines = 0;
2202 unicode_t *str = buf; 2569 unicode_t *str = buf;
2203 2570
2204 *str++ = ch;
2205
2206 for (;;) 2571 for (;;)
2207 { 2572 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2574 break;
2213 2575
2214 *str++ = ch; 2576 *str++ = ch;
2215 2577
2216 if (ch == '\n') 2578 if (ch == C0_LF)
2217 { 2579 {
2218 nlines++; 2580 nlines++;
2219 refresh_count++; 2581 refresh_count++;
2220 2582
2221 if (! (Options & Opt_jumpScroll) 2583 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2585 {
2224 refreshnow = true; 2586 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2587 ch = NOCHAR;
2227 break; 2588 break;
2228 } 2589 }
2229 2590
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2592 if (nlines >= TermWin.nrow - 1)
2232 { 2593 {
2233 scr_add_lines (buf, nlines, str - buf); 2594 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2595 nlines = 0;
2235 str = buf; 2596 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2600 if (str >= buf + UBUFSIZ)
2240 { 2601 {
2241 ch = NOCHAR; 2602 ch = NOCHAR;
2242 break; 2603 break;
2243 } 2604 }
2605
2606 seq_begin = cmdbuf_ptr;
2607 ch = next_char ();
2244 } 2608 }
2245 2609
2246 scr_add_lines (buf, nlines, str - buf); 2610 scr_add_lines (buf, nlines, str - buf);
2247 2611
2248 /* 2612 /*
2249 * If there have been a lot of new lines, then update the screen 2613 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2614 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2615 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2616 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2617 */
2257 if (refreshnow) 2618 if (refreshnow)
2258 { 2619 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2621 refresh_limit++;
2261 2622 else
2623 {
2624 flag = true;
2262 scr_refresh (refresh_type); 2625 scr_refresh (refresh_type);
2626 }
2263 } 2627 }
2264 2628
2265 } 2629 }
2266 else 2630 else
2267 { 2631 {
… …
2281 } 2645 }
2282 2646
2283 return flag; 2647 return flag;
2284} 2648}
2285 2649
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2286// read the next character 2659// read the next character
2287unicode_t 2660unicode_t
2288rxvt_term::next_char () 2661rxvt_term::next_char ()
2289{ 2662{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2663 while (cmdbuf_ptr < cmdbuf_endp)
… …
2321 */ 2694 */
2322unicode_t 2695unicode_t
2323rxvt_term::cmd_getc () 2696rxvt_term::cmd_getc ()
2324{ 2697{
2325 unicode_t c = next_char (); 2698 unicode_t c = next_char ();
2699
2700 if (c == NOCHAR)
2701 throw out_of_input;
2702
2703 return c;
2704}
2705
2706unicode_t
2707rxvt_term::cmd_get8 ()
2708{
2709 unicode_t c = next_octet ();
2326 2710
2327 if (c == NOCHAR) 2711 if (c == NOCHAR)
2328 throw out_of_input; 2712 throw out_of_input;
2329 2713
2330 return c; 2714 return c;
… …
2431 process_escape_seq (); 2815 process_escape_seq ();
2432 break; 2816 break;
2433 case C0_ENQ: /* terminal Status */ 2817 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2818 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2821 else
2438 tt_write ((unsigned char *)VT100_ANS, 2822 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2823 (unsigned int)strlen (VT100_ANS));
2440 break; 2824 break;
2441 case C0_BEL: /* bell */ 2825 case C0_BEL: /* bell */
2442 scr_bell (); 2826 scr_bell ();
2443 break; 2827 break;
2444 case C0_BS: /* backspace */ 2828 case C0_BS: /* backspace */
… …
2460 break; 2844 break;
2461 case C0_SI: /* shift in - acs */ 2845 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2846 scr_charset_choose (0);
2463 break; 2847 break;
2464 2848
2849#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2850 // 8-bit controls
2466 case 0x90: /* DCS */ 2851 case 0x90: /* DCS */
2467 process_dcs_seq (); 2852 process_dcs_seq ();
2468 break; 2853 break;
2469 case 0x9b: /* CSI */ 2854 case 0x9b: /* CSI */
2470 process_csi_seq (); 2855 process_csi_seq ();
2471 break; 2856 break;
2472 case 0x9d: /* CSI */ 2857 case 0x9d: /* CSI */
2473 process_osc_seq (); 2858 process_osc_seq ();
2474 break; 2859 break;
2860#endif
2475 } 2861 }
2476} 2862}
2477/*}}} */ 2863/*}}} */
2478 2864
2479 2865
… …
2541void 2927void
2542rxvt_term::process_escape_seq () 2928rxvt_term::process_escape_seq ()
2543{ 2929{
2544 unicode_t ch = cmd_getc (); 2930 unicode_t ch = cmd_getc ();
2545 2931
2546 if (PrivateModes & PrivMode_vt52) 2932 if (priv_modes & PrivMode_vt52)
2547 { 2933 {
2548 process_escape_vt52 (ch); 2934 process_escape_vt52 (ch);
2549 return; 2935 return;
2550 } 2936 }
2551 2937
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2952 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2953 break;
2568 case '+': 2954 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2955 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2956 break;
2571#ifndef NO_FRILLS 2957#if ENABLE_FRILLS
2572 case '6': 2958 case '6':
2573 scr_backindex (); 2959 scr_backindex ();
2574 break; 2960 break;
2575#endif 2961#endif
2576 case '7': 2962 case '7':
2577 scr_cursor (SAVE); 2963 scr_cursor (SAVE);
2578 break; 2964 break;
2579 case '8': 2965 case '8':
2580 scr_cursor (RESTORE); 2966 scr_cursor (RESTORE);
2581 break; 2967 break;
2582#ifndef NO_FRILLS 2968#if ENABLE_FRILLS
2583 case '9': 2969 case '9':
2584 scr_forwardindex (); 2970 scr_forwardindex ();
2585 break; 2971 break;
2586#endif 2972#endif
2587 case '=': 2973 case '=':
… …
2597 break; 2983 break;
2598 2984
2599 /* 8.3.87: NEXT LINE */ 2985 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 2986 case C1_NEL: /* ESC E */
2601 { 2987 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 2988 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 2989 scr_add_lines (nlcr, 1, 2);
2604 } 2990 }
2605 break; 2991 break;
2606 2992
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 2993 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3054
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3055/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3056/* *INDENT-OFF* */
2671enum { 3057enum {
2672 CSI_ICH = 0x40, 3058 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3059 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3060 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3061 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3062 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3063 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3064 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3273 break;
2888 3274
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3276 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3277 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3278 break;
2893 3279
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3281 process_sgr_mode (nargs, arg);
2896 break; 3282 break;
… …
2903 break; 3289 break;
2904 case 6: /* CPR requested */ 3290 case 6: /* CPR requested */
2905 scr_report_position (); 3291 scr_report_position ();
2906 break; 3292 break;
2907 case 7: /* unofficial extension */ 3293 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3294 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3295 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3296 break;
2911 case 8: /* unofficial extension */ 3297 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3299 break;
2914 } 3300 }
… …
2950 break; 3336 break;
2951 3337
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3338 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3339 if (arg[0] == 4)
2954 scr_insert_mode (0); 3340 scr_insert_mode (0);
3341 else if (arg[0] == 20)
3342 priv_modes &= ~PrivMode_LFNL;
2955 break; 3343 break;
2956 3344
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3345 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3346 if (arg[0] == 4)
2959 scr_insert_mode (1); 3347 scr_insert_mode (1);
3348 else if (arg[0] == 20)
3349 priv_modes |= PrivMode_LFNL;
2960 break; 3350 break;
2961 3351
2962 /* 3352 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3353 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3354 */
… …
2976 break; 3366 break;
2977 case CSI_75: 3367 case CSI_75:
2978 scr_cursor (RESTORE); 3368 scr_cursor (RESTORE);
2979 break; 3369 break;
2980 3370
2981#ifndef NO_FRILLS 3371#if ENABLE_FRILLS
2982 case CSI_74: 3372 case CSI_74:
2983 process_window_ops (arg, nargs); 3373 process_window_ops (arg, nargs);
2984 break; 3374 break;
2985#endif 3375#endif
2986 3376
… …
2993 break; 3383 break;
2994 } 3384 }
2995} 3385}
2996/*}}} */ 3386/*}}} */
2997 3387
2998#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2999/* ARGSUSED */ 3389/* ARGSUSED */
3000void 3390void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3391rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3392{
3003 int x, y; 3393 int x, y;
… …
3070 break; 3460 break;
3071 case 19: /* report window size (chars) */ 3461 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3463 break;
3074 case 20: /* report icon label */ 3464 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3465 {
3077 char *s; 3466 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3467 XGetIconName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s);
3080 } 3470 }
3081 break; 3471 break;
3082 case 21: /* report window title */ 3472 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3473 {
3085 char *s; 3474 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3475 XFetchName (display->display, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s);
3088 } 3478 }
3089 break; 3479 break;
3090 } 3480 }
3091} 3481}
3092#endif 3482#endif
3093 3483
3094/*----------------------------------------------------------------------*/ 3484/*----------------------------------------------------------------------*/
3095/* 3485/*
3096 * get input up until STRING TERMINATOR (or BEL) 3486 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3487 * ends_how is terminator used. returned input must be free()'d
3098 */ 3488 */
3099unsigned char * 3489unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3490rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3491{
3102 int seen_esc = 0; /* seen escape? */ 3492 unicode_t prev = 0, ch;
3103 unsigned int n = 0; 3493 unsigned int n = 0;
3104 unsigned char *s; 3494 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3495 unsigned char string[STRING_MAX];
3107 3496
3108 while ((ch = cmd_getc ())) 3497 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3498 {
3110 if (ch == C0_BEL || ch == CHAR_ST) 3499 if (prev == C0_ESC)
3111 break; 3500 {
3112
3113 if (seen_esc)
3114 if (ch == 0x5c) /* 7bit ST */ 3501 if (ch == 0x5c) /* 7bit ST */
3115 break; 3502 break;
3116 else 3503 else
3117 return NULL; 3504 return NULL;
3118
3119 if (ch == C0_ESC)
3120 { 3505 }
3121 seen_esc = 1; 3506 else if (ch == C0_BEL || ch == CHAR_ST)
3122 continue; 3507 break;
3123 } 3508 else if (ch < 0x20)
3124 else if (ch == '\t')
3125 ch = ' '; /* translate '\t' to space */
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
3127 return NULL; /* other control character - exit */ 3509 return NULL; /* other control character - exit */
3128 3510
3129 if (n >= sizeof (string) - 1) 3511 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3512 // stop at some sane length
3131 return NULL; 3513 return NULL;
3132 3514
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
3133 string[n++] = ch; 3521 string[n++] = prev = ch;
3134 seen_esc = 0;
3135 } 3522 }
3136 3523
3137 string[n++] = '\0'; 3524 string[n++] = '\0';
3138 3525
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL; 3527 return NULL;
3141 3528
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3529 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3530 strncpy (s, string, n);
3144 return s; 3531 return s;
3145} 3532}
3146 3533
3147/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
3148/* 3535/*
… …
3193void 3580void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3582{
3196 if (str[0] == '?' && !str[1]) 3583 if (str[0] == '?' && !str[1])
3197 { 3584 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3585 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3586 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3588 }
3205 else 3589 else
3206 set_window_color (color, str); 3590 set_window_color (color, str);
3207} 3591}
3208 3592
… …
3294 break; 3678 break;
3295 3679
3296 case XTerm_Color: 3680 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3681 for (buf = (char *)str; buf && *buf;)
3298 { 3682 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3683 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3684 break;
3301 3685
3302 *name++ = '\0'; 3686 *name++ = '\0';
3303 color = atoi (buf); 3687 color = atoi (buf);
3304 3688
3305 if (color < 0 || color >= TOTAL_COLORS) 3689 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3690 break;
3307 3691
3308 if ((buf = STRCHR (name, ';')) != NULL) 3692 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3693 *buf++ = '\0';
3310 3694
3311 if (name[0] == '?' && !name[1]) 3695 if (name[0] == '?' && !name[1])
3312 { 3696 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3697 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3700 }
3320 else 3701 else
3321 set_window_color (color + minCOLOR, name); 3702 set_window_color (color + minCOLOR, name);
3322 } 3703 }
3323 break; 3704 break;
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3738 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3739 set_bgPixmap (str); /* change pixmap */
3359#endif 3740#endif
3360 scr_touch (true); 3741 scr_touch (true);
3361 } 3742 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3743 while ((str = strchr (str, ';')) != NULL)
3363 { 3744 {
3364 str++; 3745 str++;
3365#if XPM_BACKGROUND 3746#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3747 changed += scale_pixmap (str);
3367#endif 3748#endif
… …
3387 // TODO, when secure mode? 3768 // TODO, when secure mode?
3388 break; 3769 break;
3389 3770
3390 case XTerm_font: 3771 case XTerm_font:
3391 if (query) 3772 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3395 TermWin.fontset->fontdesc 3775 ? TermWin.fontset->fontdesc : "",
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp); 3776 resp);
3399 }
3400 else 3777 else
3401 change_font (str); 3778 change_font (str);
3402 break; 3779 break;
3403 3780
3404#ifndef NO_FRILLS 3781#if ENABLE_FRILLS
3405 case XTerm_locale: 3782 case XTerm_locale:
3406 if (query) 3783 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3785 else
3412 { 3786 {
3413 set_locale (str); 3787 set_locale (str);
3414# ifdef USE_XIM 3788# ifdef USE_XIM
3415 im_cb (); 3789 im_cb ();
3416# endif 3790# endif
3417 } 3791 }
3418 break; 3792 break;
3419 3793
3420 case XTerm_findfont: 3794 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 { 3795 {
3423 int fid = TermWin.fontset->find_font (atoi (str)); 3796 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, 3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp); 3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3426 } 3801 }
3427 break; 3802 break;
3428#endif 3803#endif
3429 3804
3430#ifdef MENUBAR 3805#ifdef MENUBAR
3431 case XTerm_Menu: 3806 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3807 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3809 break;
3435#endif 3810#endif
3436#if 0 3811#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3812 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3839{
3465 int state; 3840 int state;
3466 3841
3467 if (mode == 's') 3842 if (mode == 's')
3468 { 3843 {
3469 SavedModes |= (PrivateModes & bit); 3844 SavedModes |= (priv_modes & bit);
3470 return -1; 3845 return -1;
3471 } 3846 }
3472 else 3847 else
3473 { 3848 {
3474 if (mode == 'r') 3849 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3851 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3852 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3853 PrivMode (state, bit);
3479 } 3854 }
3480 3855
3481 return state; 3856 return state;
3482} 3857}
… …
3500 { 3, PrivMode_132 }, 3875 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3876 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3877 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3878 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3879 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3881 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3882#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3883 { menuBar_esc, PrivMode_menuBar },
3508#endif 3884#endif
3885 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3887#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3888 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3889#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3890 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3891 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3892 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3893 // 45 margin bell NYI
3519 // 46 start logging 3894 // 46 start logging
… …
3560 3935
3561 /* extra handling for values with state unkept */ 3936 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3937 switch (arg[i])
3563 { 3938 {
3564 case 1048: /* alternative cursor save */ 3939 case 1048: /* alternative cursor save */
3565 if (Options & Opt_secondaryScreen) 3940 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3941 if (mode == 0)
3567 scr_cursor (RESTORE); 3942 scr_cursor (RESTORE);
3568 else if (mode == 1) 3943 else if (mode == 1)
3569 scr_cursor (SAVE); 3944 scr_cursor (SAVE);
3570 break; 3945 break;
… …
3581 * within VT52 mode 3956 * within VT52 mode
3582 */ 3957 */
3583 PrivMode (1, PrivMode_vt52); 3958 PrivMode (1, PrivMode_vt52);
3584 break; 3959 break;
3585 case 3: /* 80/132 */ 3960 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 3961 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 3963 break;
3589 case 4: /* smooth scrolling */ 3964 case 4: /* smooth scrolling */
3590 if (state) 3965 if (state)
3591 Options &= ~Opt_jumpScroll; 3966 options &= ~Opt_jumpScroll;
3592 else 3967 else
3593 Options |= Opt_jumpScroll; 3968 options |= Opt_jumpScroll;
3594 break; 3969 break;
3595 case 5: /* reverse video */ 3970 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 3971 scr_rvideo_mode (state);
3597 break; 3972 break;
3598 case 6: /* relative/absolute origins */ 3973 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 3977 scr_autowrap (state);
3603 break; 3978 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 3979 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 3980 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 3981 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 3982 priv_modes &= ~PrivMode_MouseX11;
3608 break; 3983 break;
3609#ifdef menuBar_esc 3984#ifdef menuBar_esc
3610 case menuBar_esc: 3985 case menuBar_esc:
3611#ifdef MENUBAR 3986#ifdef MENUBAR
3612 map_menuBar (state); 3987 map_menuBar (state);
… …
3632 break; 4007 break;
3633 /* case 66: - application key pad */ 4008 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4009 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4010 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4011 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4012 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4013 break;
3639#if 0 4014#if 0
3640 case 1001: 4015 case 1001:
3641 break; /* X11 mouse highlighting */ 4016 break; /* X11 mouse highlighting */
3642#endif 4017#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4018 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4019 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4020 options &= ~Opt_scrollTtyOutput;
3646 else 4021 else
3647 Options |= Opt_scrollTtyOutput; 4022 options |= Opt_scrollTtyOutput;
3648 break; 4023 break;
3649 case 1011: /* scroll to bottom on key press */ 4024 case 1011: /* scroll to bottom on key press */
3650 if (state) 4025 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4026 options |= Opt_scrollTtyKeypress;
3652 else 4027 else
3653 Options &= ~Opt_scrollTtyKeypress; 4028 options &= ~Opt_scrollTtyKeypress;
3654 break; 4029 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4030 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4031 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4032 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4033 scr_erase_screen (2);
3659 scr_change_screen (state); 4034 scr_change_screen (state);
3660 break; 4035 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4036 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4037 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4038 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4039 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4040 scr_erase_screen (2);
3666 break; 4041 break;
3667 default: 4042 default:
3668 break; 4043 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4069 rendset = 0, rendstyle = ~RS_None;
3695 break; 4070 break;
3696 case 1: 4071 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4072 rendset = 1, rendstyle = RS_Bold;
3698 break; 4073 break;
4074 //case 2: // faint or second colour
4075 //case 3: // italic
3699 case 4: 4076 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4077 rendset = 1, rendstyle = RS_Uline;
3701 break; 4078 break;
3702 case 5: 4079 case 5: // slowly blinking
4080 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4081 rendset = 1, rendstyle = RS_Blink;
3704 break; 4082 break;
4083 //case 6: // scoansi light background
3705 case 7: 4084 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4085 rendset = 1, rendstyle = RS_RVid;
3707 break; 4086 break;
3708 case 8: 4087 case 8:
3709 // invisible. NYI 4088 // invisible. NYI
3710 break; 4089 break;
4090 //case 9: // crossed out
4091 //case 10: // scoansi acs off, primary font
4092 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font
4094 //...
4095 //case 19: // ninth alt font
4096 //case 20: // gothic
4097 case 21: // disable bold, faint
4098 rendset = 0, rendstyle = RS_Bold;
4099 break;
3711 case 22: 4100 case 22:
3712 rendset = 0, rendstyle = RS_Bold; 4101 rendset = 0, rendstyle = RS_Bold;
3713 break; 4102 break;
4103 //case 23: disable italic
3714 case 24: 4104 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4105 rendset = 0, rendstyle = RS_Uline;
3716 break; 4106 break;
3717 case 25: 4107 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4108 rendset = 0, rendstyle = RS_Blink;
3719 break; 4109 break;
4110 case 26:
4111 rendset = 0, rendstyle = RS_Blink;
4112 break;
3720 case 27: 4113 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4114 rendset = 0, rendstyle = RS_RVid;
3722 break; 4115 break;
3723 case 28:
3724 // visible. NYI 4116 //case 28: // visible. NYI
3725 break; 4117 //case 29: // not crossed-out
3726 } 4118 }
3727 4119
3728 if (rendset != -1) 4120 if (rendset != -1)
3729 { 4121 {
3730 scr_rendition (rendset, rendstyle); 4122 scr_rendition (rendset, rendstyle);
… …
3807 } 4199 }
3808 } 4200 }
3809} 4201}
3810/*}}} */ 4202/*}}} */
3811 4203
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4204/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4205void
3814rxvt_term::process_graphics () 4206rxvt_term::process_graphics ()
3815{ 4207{
3816 unicode_t ch, cmd = cmd_getc (); 4208 unicode_t ch, cmd = cmd_getc ();
3817 4209
3818 if (cmd == 'Q') 4210 if (cmd == 'Q')
3819 { /* query graphics */ 4211 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4212 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4213 return;
3822 } 4214 }
3823 /* swallow other graphics sequences until terminating ':' */ 4215 /* swallow other graphics sequences until terminating ':' */
3824 do 4216 do
3825 ch = cmd_getc (); 4217 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4232 unsigned char buf[256];
3841 4233
3842 va_start (arg_ptr, fmt); 4234 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4236 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4237 tt_write (buf, strlen (buf));
3846} 4238}
3847 4239
3848/* ---------------------------------------------------------------------- */ 4240/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4241/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4242 * or generated by us in response to a query ESC sequence.
… …
3856 4248
3857 if (len) 4249 if (len)
3858 { 4250 {
3859 if (v_buflen == 0) 4251 if (v_buflen == 0)
3860 { 4252 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3862 4254
3863 if ((unsigned int)written == len) 4255 if ((unsigned int)written == len)
3864 return; 4256 return;
3865 4257
3866 data += written; 4258 data += written;
… …
3874 v_buflen += len; 4266 v_buflen += len;
3875 } 4267 }
3876 4268
3877 for (;;) 4269 for (;;)
3878 { 4270 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880 4272
3881 if (written > 0) 4273 if (written > 0)
3882 { 4274 {
3883 v_buflen -= written; 4275 v_buflen -= written;
3884 4276

Diff Legend

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