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.191 by root, Wed Jan 26 07:08:15 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
53#include <wchar.h> 57#include <cwchar>
58#include <csignal>
54 59
55/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
56 61
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 63
59// exception thrown when the command parser runs out of input data 64// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 65class out_of_input { } out_of_input;
66
67#if ENABLE_FRILLS || ISO_14755
68
69#define ISO_14755_STARTED 0x80000000UL
70#define ISO_14755_51 0x40000000UL // basic (section 5.1)
71#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
72#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
73#define ISO_14755_MASK 0x0fffffffUL
74
75#if ISO_14755
76static unsigned short iso14755_symtab[] = {
77 // keysym, unicode
78 XK_Left, 0x2190,
79 XK_KP_Left, 0x2190,
80 XK_Up, 0x2191,
81 XK_KP_Up, 0x2191,
82 XK_Right, 0x2192,
83 XK_KP_Right, 0x2192,
84 XK_Down, 0x2193,
85 XK_KP_Down, 0x2193,
86 XK_Linefeed, 0x21b4,
87 XK_Return, 0x21b5,
88 XK_KP_Enter, 0x21b5,
89
90 XK_Prior, 0x21de,
91 XK_Next, 0x21df,
92 XK_Tab, 0x21e5,
93 XK_ISO_Left_Tab, 0x21e6,
94 XK_Shift_L, 0x21e7,
95 XK_Shift_R, 0x21e7,
96
97 XK_Shift_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123 XK_KP_Space, 0x2422,
124 0,
125};
126
127void
128rxvt_term::iso14755_54 (int x, int y)
129{
130 x = Pixel2Col (x);
131 y = Pixel2Row (y);
132
133 if (x < 0 || x >= TermWin.ncol
134 || y < 0 || y >= TermWin.nrow)
135 return;
136
137 for (;;)
138 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
140
141 if (t != NOCHAR || !x)
142 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54;
146 break;
147 }
148
149 x--;
150 }
151
152}
153#endif
154
155#if ENABLE_OVERLAY
156void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
158{
159 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2;
162 int len;
163
164#if ENABLE_COMBINING
165 if (IS_COMPOSE (ch))
166 {
167 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr);
170 }
171 else
172#endif
173 {
174 ch2 = ch;
175
176 alloc = 0;
177 chr = &ch2;
178 len = 1;
179 }
180
181 int width = strlen (f->name);
182
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
184
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186
187 for (int y = 0; y < len; y++)
188 {
189 char buf[9];
190
191 ch = *chr++;
192
193 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '=');
196#if !UNICODE3
197 if (ch >= 0x10000)
198 ch = 0xfffd;
199#endif
200 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r);
202 }
203
204 scr_overlay_set (0, len, f->name);
205
206#if ENABLE_COMBINING
207 if (alloc)
208 delete [] alloc;
209#endif
210}
211#endif
212
213void
214rxvt_term::commit_iso14755 ()
215{
216 wchar_t ch[2];
217
218 ch[0] = iso14755buf & ISO_14755_MASK;
219 ch[1] = 0;
220
221 if (iso14755buf & ISO_14755_51)
222 {
223 char mb[16];
224 int len;
225
226 // allow verbatim 0-bytes and control-bytes to be entered
227 if (ch[0] >= 0x20)
228 len = wcstombs (mb, ch, 16);
229 else
230 {
231 mb[0] = ch[0];
232 len = 1;
233 }
234
235 if (len > 0)
236 tt_write ((unsigned char *)mb, len);
237 else
238 scr_bell ();
239 }
240
241 iso14755buf = 0;
242}
243
244int
245rxvt_term::hex_keyval (XKeyEvent &ev)
246{
247 // check wether this event corresponds to a hex digit
248 // if the modifiers had not been pressed.
249 for (int index = 0; index < 8; index++)
250 {
251 KeySym k = XLookupKeysym (&ev, index);
252
253 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
254 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
255 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
256 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
257 }
258
259 return -1;
260}
261#endif
61 262
62/*{{{ Convert the keypress event into a string */ 263/*{{{ Convert the keypress event into a string */
63void 264void
64rxvt_term::lookup_key (XKeyEvent &ev) 265rxvt_term::lookup_key (XKeyEvent &ev)
65{ 266{
… …
147 valid_keysym = keysym != NoSymbol; 348 valid_keysym = keysym != NoSymbol;
148 } 349 }
149 350
150 if (valid_keysym) 351 if (valid_keysym)
151 { 352 {
353#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state))
355 return;
356#endif
357
152 if (TermWin.saveLines) 358 if (TermWin.saveLines)
153 { 359 {
154#ifdef UNSHIFTED_SCROLLKEYS 360#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 361 if (!ctrl && !meta)
156 {
157#else 362#else
158 if (IS_SCROLL_MOD) 363 if (IS_SCROLL_MOD)
364#endif
159 { 365 {
160#endif
161 int lnsppg; 366 int lnsppg;
162 367
163#ifdef PAGING_CONTEXT_LINES 368#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 370#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 419 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 420 {
216 keysym += (XK_F11 - XK_F1); 421 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 422 shft = 0; /* turn off Shift */
218 } 423 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 424 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 425 {
221 switch (keysym) 426 switch (keysym)
222 { 427 {
223 /* normal XTerm key bindings */ 428 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 429 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 430 selection_request (ev.time, 0, 0);
226 return; 431 return;
432#if TODO
227 /* rxvt extras */ 433 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 434 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 435 change_font (FONT_UP);
230 return; 436 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 437 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 438 change_font (FONT_DN);
233 return; 439 return;
440#endif
234 } 441 }
235 } 442 }
236 } 443 }
237#ifdef PRINTPIPE 444
238 if (keysym == XK_Print) 445#if ENABLE_FRILLS || ISO_14755
239 { 446 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 447 if (shft && ctrl)
241 return;
242 } 448 {
243#endif 449 int hv;
244 450
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 451 if (iso14755buf & ISO_14755_51
246 { 452 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 453 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 454 {
250 unsigned int l; 455 commit_iso14755 ();
251 const unsigned char *kbuf0; 456 iso14755buf = ISO_14755_51;
252 457# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 458 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 459# endif
261 ) 460 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 461 }
266 462 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 463 {
464 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
465 | hv | ISO_14755_51;
466# if ISO_14755
467 iso14755_51 (iso14755buf & ISO_14755_MASK);
468# endif
268 return; 469 return;
269 } 470 }
270 else 471 else
472 {
473# if ENABLE_OVERLAY
474 scr_overlay_off ();
271#endif 475# endif
476 iso14755buf = 0;
477 }
478 }
479 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
480 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
481 if (!(iso14755buf & ISO_14755_STARTED))
482 {
483 iso14755buf |= ISO_14755_STARTED;
484# if ENABLE_OVERLAY
485 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
486 scr_overlay_set (0, 0, "ISO 14755 mode");
487# endif
488 }
489#endif
490
491#ifdef PRINTPIPE
492 if (keysym == XK_Print)
493 {
494 scr_printscreen (ctrl | shft);
495 return;
496 }
497#endif
498
499 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
500 {
272 { 501 {
273 newlen = 1; 502 newlen = 1;
274 switch (keysym) 503 switch (keysym)
275 { 504 {
276#ifndef NO_BACKSPACE_KEY 505#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 506 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 507 if (priv_modes & PrivMode_HaveBackSpace)
279 { 508 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 509 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 510 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
283 } 512 }
284 else 513 else
285 STRCPY (kbuf, key_backspace); 514 strcpy (kbuf, key_backspace);
286 break; 515 break;
287#endif 516#endif
288#ifndef NO_DELETE_KEY 517#ifndef NO_DELETE_KEY
289 case XK_Delete: 518 case XK_Delete:
290 STRCPY (kbuf, key_delete); 519 strcpy (kbuf, key_delete);
291 break; 520 break;
292#endif 521#endif
293 case XK_Tab: 522 case XK_Tab:
294 if (shft) 523 if (shft)
295 STRCPY (kbuf, "\033[Z"); 524 strcpy (kbuf, "\033[Z");
296 else 525 else
297 { 526 {
298#ifdef CTRL_TAB_MAKES_META 527#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 528 if (ctrl)
300 meta = 1; 529 meta = 1;
… …
306 newlen = 0; 535 newlen = 0;
307 } 536 }
308 break; 537 break;
309 538
310#ifdef XK_KP_Left 539#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 540 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 541 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 542 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 543 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 544 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 545 {
317 STRCPY (kbuf, "\033OZ"); 546 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 547 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 548 break;
320 } 549 }
321 else 550 else
322 /* translate to std. cursor key */ 551 /* translate to std. cursor key */
… …
325#endif 554#endif
326 case XK_Up: /* "\033[A" */ 555 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 556 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 557 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 558 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 559 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 560 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 561 /* do Shift first */
333 if (shft) 562 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 563 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 564 else if (ctrl)
336 { 565 {
337 kbuf[1] = 'O'; 566 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 568 }
340 else if (PrivateModes & PrivMode_aplCUR) 569 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
342 break; 571 break;
343 572
344#ifndef UNSHIFTED_SCROLLKEYS 573#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 574# ifdef XK_KP_Prior
346 case XK_KP_Prior: 575 case XK_KP_Prior:
347 /* allow shift to override */ 576 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 577 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 578 {
350 STRCPY (kbuf, "\033Oy"); 579 strcpy (kbuf, "\033Oy");
351 break; 580 break;
352 } 581 }
353 /* FALLTHROUGH */ 582 /* FALLTHROUGH */
354# endif 583# endif
355 case XK_Prior: 584 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 585 strcpy (kbuf, "\033[5~");
357 break; 586 break;
358# ifdef XK_KP_Next 587# ifdef XK_KP_Next
359 case XK_KP_Next: 588 case XK_KP_Next:
360 /* allow shift to override */ 589 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 591 {
363 STRCPY (kbuf, "\033Os"); 592 strcpy (kbuf, "\033Os");
364 break; 593 break;
365 } 594 }
366 /* FALLTHROUGH */ 595 /* FALLTHROUGH */
367# endif 596# endif
368 case XK_Next: 597 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 598 strcpy (kbuf, "\033[6~");
370 break; 599 break;
371#endif 600#endif
372 case XK_KP_Enter: 601 case XK_KP_Enter:
373 /* allow shift to override */ 602 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 603 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 604 {
376 STRCPY (kbuf, "\033OM"); 605 strcpy (kbuf, "\033OM");
606 break;
607 }
608
609 /* FALLTHROUGH */
610
611 case XK_Return:
612 if (priv_modes & PrivMode_LFNL)
613 {
614 kbuf[0] = '\015';
615 kbuf[1] = '\012';
616 kbuf[2] = '\0';
377 } 617 }
378 else 618 else
379 { 619 {
380 kbuf[0] = '\r'; 620 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 621 kbuf[1] = '\0';
382 } 622 }
383 break; 623 break;
384 624
385#ifdef XK_KP_Begin 625#ifdef XK_KP_Begin
386 case XK_KP_Begin: 626 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 627 strcpy (kbuf, "\033Ou");
388 break; 628 break;
389 629
390 case XK_KP_Insert: 630 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 631 strcpy (kbuf, "\033Op");
392 break; 632 break;
393 633
394 case XK_KP_Delete: 634 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 635 strcpy (kbuf, "\033On");
396 break; 636 break;
397#endif 637#endif
398 case XK_KP_F1: /* "\033OP" */ 638 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 639 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 640 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 641 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 642 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 643 kbuf[2] += (keysym - XK_KP_F1);
404 break; 644 break;
405 645
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 646 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 647 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 658 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 659 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 660 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 661 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 662 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 664 {
425 STRCPY (kbuf, "\033Oj"); 665 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 666 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 667 }
428 else 668 else
429 { 669 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 670 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 671 kbuf[1] = '\0';
432 } 672 }
433 break; 673 break;
434 674
435 case XK_Find: 675 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 676 strcpy (kbuf, "\033[1~");
437 break; 677 break;
438 case XK_Insert: 678 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 679 strcpy (kbuf, "\033[2~");
440 break; 680 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 681#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 682 case DXK_Remove:
443 /* FALLTHROUGH */ 683 /* FALLTHROUGH */
444#endif 684#endif
445 case XK_Execute: 685 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 686 strcpy (kbuf, "\033[3~");
447 break; 687 break;
448 case XK_Select: 688 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 689 strcpy (kbuf, "\033[4~");
450 break; 690 break;
451#ifdef XK_KP_End 691#ifdef XK_KP_End
452 case XK_KP_End: 692 case XK_KP_End:
453 /* allow shift to override */ 693 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 694 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 695 {
456 STRCPY (kbuf, "\033Oq"); 696 strcpy (kbuf, "\033Oq");
457 break; 697 break;
458 } 698 }
459 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
460#endif 700#endif
461 case XK_End: 701 case XK_End:
462 STRCPY (kbuf, KS_END); 702 strcpy (kbuf, KS_END);
463 break; 703 break;
464#ifdef XK_KP_Home 704#ifdef XK_KP_Home
465 case XK_KP_Home: 705 case XK_KP_Home:
466 /* allow shift to override */ 706 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 707 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 708 {
469 STRCPY (kbuf, "\033Ow"); 709 strcpy (kbuf, "\033Ow");
470 break; 710 break;
471 } 711 }
472 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
473#endif 713#endif
474 case XK_Home: 714 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 715 strcpy (kbuf, KS_HOME);
476 break; 716 break;
477 717
478#define FKEY(n, fkey) \ 718#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 719 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 720
… …
532#undef FKEY 772#undef FKEY
533 default: 773 default:
534 newlen = 0; 774 newlen = 0;
535 break; 775 break;
536 } 776 }
777
537 if (newlen) 778 if (newlen)
538 len = STRLEN (kbuf); 779 len = strlen (kbuf);
539 } 780 }
540 781
541 /* 782 /*
542 * Pass meta for all function keys, if 'meta' option set 783 * Pass meta for all function keys, if 'meta' option set
543 */ 784 */
… …
550 else if (ctrl && keysym == XK_minus) 791 else if (ctrl && keysym == XK_minus)
551 { 792 {
552 len = 1; 793 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 794 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 795 }
796 else if (keysym == XK_ISO_Left_Tab)
797 {
798 strcpy (kbuf, "\033[Z");
799 len = 3;
800 }
555 else 801 else
556 { 802 {
557#ifdef META8_OPTION 803#ifdef META8_OPTION
558 /* set 8-bit on */ 804 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 805 if (meta && (meta_char == 0x80))
… …
571 } 817 }
572 818
573 if (len <= 0) 819 if (len <= 0)
574 return; /* not mapped */ 820 return; /* not mapped */
575 821
576 if (Options & Opt_scrollTtyKeypress) 822 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 823 if (TermWin.view_start)
578 { 824 {
579 TermWin.view_start = 0; 825 TermWin.view_start = 0;
580 want_refresh = 1; 826 want_refresh = 1;
581 } 827 }
… …
617#endif /* DEBUG_CMD */ 863#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 864 tt_write (kbuf, (unsigned int)len);
619} 865}
620/*}}} */ 866/*}}} */
621 867
622#if (MENUBAR_MAX) 868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 870/* attempt to `write' count to the input buffer */
625unsigned int 871unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 872rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 873{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 876 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 878
633 if (n > 0 && s < count) 879 if (n > 0 && s < count)
634 { 880 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 881 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 882 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 883 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 884 cmdbuf_endp -= n;
639 s += n; 885 s += n;
640 } 886 }
… …
650 896
651 cmd_parse (); 897 cmd_parse ();
652 898
653 return 0; 899 return 0;
654} 900}
655#endif /* MENUBAR_MAX */ 901#endif
656 902
657void 903void
658rxvt_term::flush () 904rxvt_term::flush ()
659{ 905{
906 flush_ev.stop ();
907
660#ifdef TRANSPARENT 908#ifdef TRANSPARENT
661 if (want_full_refresh) 909 if (want_full_refresh)
662 { 910 {
663 want_full_refresh = 0; 911 want_full_refresh = 0;
664 scr_clear (); 912 scr_clear ();
665 scr_touch (false); 913 scr_touch (false);
666 want_refresh = 1;
667 } 914 }
668#endif 915#endif
669 916
670 if (want_refresh) 917 if (want_refresh)
671 { 918 {
672 scr_refresh (refresh_type); 919 scr_refresh (refresh_type);
673 scrollbar_show (1); 920 scrollbar_show (1);
674#ifdef USE_XIM 921#ifdef USE_XIM
675 IMSendSpot (); 922 IMSendSpot ();
676#endif 923#endif
677
678 } 924 }
679 925
680 display->flush (); 926 display->flush ();
681} 927}
682 928
… …
684rxvt_term::check_cb (check_watcher &w) 930rxvt_term::check_cb (check_watcher &w)
685{ 931{
686 SET_R (this); 932 SET_R (this);
687 SET_LOCALE (locale); 933 SET_LOCALE (locale);
688 934
935 display->flush ();
936
937 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01);
939}
940
941void
942rxvt_term::flush_cb (time_watcher &w)
943{
944 SET_R (this);
945 SET_LOCALE (locale);
946
947 refresh_limit = 1;
948 refresh_count = 0;
689 flush (); 949 flush ();
690} 950}
691 951
692#ifdef CURSOR_BLINK 952#ifdef CURSOR_BLINK
693void 953void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 971 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 972 }
713} 973}
714#endif 974#endif
715 975
976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
977void
978rxvt_term::cont_scroll_cb (time_watcher &w)
979{
980 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
986 }
987}
988#endif
989
990#ifdef SELECTION_SCROLLING
991void
992rxvt_term::sel_scroll_cb (time_watcher &w)
993{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 }
1001}
1002#endif
1003
1004#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1005void
1006rxvt_term::slip_wheel_cb (time_watcher &w)
1007{
1008 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed))
1011 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0;
1015
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 }
1020}
1021#endif
1022
716bool 1023bool
717rxvt_term::pty_fill () 1024rxvt_term::pty_fill ()
718{ 1025{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027
1028 if (CBUFSIZ == n)
1029 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0;
1032 }
720 1033
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1034 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1035 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1036 cmdbuf_endp = cmdbuf_ptr + n;
724 1037
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1039
727 if (n > 0) 1040 if (n > 0)
728 { 1041 {
729 cmdbuf_endp += n; 1042 cmdbuf_endp += n;
730 return true; 1043 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1052rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1053{
741 SET_R (this); 1054 SET_R (this);
742 SET_LOCALE (locale); 1055 SET_LOCALE (locale);
743 1056
1057 if (revents & EVENT_READ)
1058 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ())
1060 if (cmd_parse ())
1061 break;
1062
744 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1064 pty_write ();
746 else if (revents & EVENT_READ) 1065}
747 {
748 // 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 ())
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 1066
760 if (cmd_parse ()) 1067void
761 break; 1068rxvt_term::pointer_unblank ()
762 } 1069{
763 } 1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1071 recolour_cursor ();
1072
1073#ifdef POINTER_BLANK
1074 hidden_pointer = 0;
1075
1076 if (options & Opt_pointerBlank)
1077 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif
764} 1079}
765 1080
766#ifdef POINTER_BLANK 1081#ifdef POINTER_BLANK
767void 1082void
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 () 1083rxvt_term::pointer_blank ()
781{ 1084{
782 if (! (Options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
783 return; 1086 return;
784 1087
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
786 XFlush (display->display); 1089 XFlush (display->display);
787 1090
788 hidden_pointer = 1; 1091 hidden_pointer = 1;
789} 1092}
790 1093
… …
807 x = ev.x; 1110 x = ev.x;
808 y = ev.y; 1111 y = ev.y;
809 pixel_position (&x, &y); 1112 pixel_position (&x, &y);
810 1113
811 if (MEvent.button == AnyButton) 1114 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1115 button_number = 3;
814 }
815 else 1116 else
816 { 1117 {
817 button_number = MEvent.button - Button1; 1118 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1119 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1120 if (button_number >= 3)
820 button_number += (64 - 3); 1121 button_number += (64 - 3);
821 } 1122 }
822 1123
823 if (PrivateModes & PrivMode_MouseX10) 1124 if (priv_modes & PrivMode_MouseX10)
824 { 1125 {
825 /* 1126 /*
826 * do not report ButtonRelease 1127 * do not report ButtonRelease
827 * no state info allowed 1128 * no state info allowed
828 */ 1129 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1144 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1145 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1146#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1147 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1148#endif
848
849 } 1149 }
850 1150
851#ifdef DEBUG_MOUSEREPORT 1151#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1152 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1153 if (key_state & 16)
854 fputc ('C', stderr); 1154 fputc ('C', stderr);
855 if (key_state & 4) 1155 if (key_state & 4)
856 fputc ('S', stderr); 1156 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1160 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1161 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1162 button_number,
863 x + 1, 1163 x + 1,
864 y + 1); 1164 y + 1);
865#else 1165#endif
1166
866 tt_printf ("\033[M%c%c%c", 1167 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1168 (32 + button_number + key_state),
868 (32 + x + 1), 1169 (32 + x + 1),
869 (32 + y + 1)); 1170 (32 + y + 1));
870#endif
871} 1171}
872 1172
873#ifdef USING_W11LIB 1173#ifdef USING_W11LIB
874void 1174void
875rxvt_W11_process_x_event (XEvent *ev) 1175rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1186{
887 SET_R (this); 1187 SET_R (this);
888 SET_LOCALE (locale); 1188 SET_LOCALE (locale);
889 1189
890#if defined(CURSOR_BLINK) 1190#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1192 {
893 if (hidden_cursor) 1193 if (hidden_cursor)
894 { 1194 {
895 hidden_cursor = 0; 1195 hidden_cursor = 0;
896 want_refresh = 1; 1196 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1200 }
901#endif 1201#endif
902 1202
903#if defined(POINTER_BLANK) 1203#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1205 {
906 if (ev.type == MotionNotify 1206 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1207 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1208 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1209 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1212 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1213 pointer_blank ();
914 } 1214 }
915#endif 1215#endif
916 1216
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1217 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1218 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1219 unsigned int unused_mask;
925
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 1220
975 switch (ev.type) 1221 switch (ev.type)
976 { 1222 {
977 case KeyPress: 1223 case KeyPress:
1224#if ISO_14755
1225 if (!(iso14755buf & ISO_14755_52))
1226#endif
978 lookup_key (ev.xkey); 1227 lookup_key (ev.xkey);
1228
1229 break;
1230
1231 case KeyRelease:
1232 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1234 KeySym ks;
1235
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif
1238
1239#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support
1241 if (iso14755buf)
1242 if (iso14755buf & ISO_14755_52)
1243 {
1244# if ENABLE_OVERLAY
1245 scr_overlay_off ();
1246# endif
1247# if ISO_14755
1248 // iso14755 part 5.2 handling: release time
1249 // first: controls
1250 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f)))
1253 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1255 commit_iso14755 ();
1256 return; // case-break;
1257 }
1258
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks)
1261 {
1262 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 ();
1264 return; // case-break;
1265 }
1266
1267 scr_bell ();
1268# endif
1269 iso14755buf = 0;
979 break; 1270 break;
1271 }
1272 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277 if (iso14755buf & ISO_14755_51)
1278 commit_iso14755 ();
1279#if ISO_14755
1280 else if (iso14755buf & ISO_14755_STARTED)
1281 {
1282 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1283
1284 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1285 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1286 }
1287# endif
1288 else
1289 iso14755buf = 0;
1290 }
1291#endif
980 1292
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1294 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1297 mouse_slip_wheel_speed = 0;
986 else 1298#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; 1299 break;
995 } 1300 }
996#endif
997 1301
998 case ButtonPress: 1302 case ButtonPress:
999 button_press (ev.xbutton); 1303 button_press (ev.xbutton);
1000 break; 1304 break;
1001 1305
… …
1013 && (ev.xclient.data.l[0] == DndFile 1317 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1318 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1319 || ev.xclient.data.l[0] == DndLink))
1016 { 1320 {
1017 /* Get Dnd data */ 1321 /* Get Dnd data */
1018 Atom ActualType; 1322 Atom ActualType;
1019 int ActualFormat; 1323 int ActualFormat;
1020 unsigned char *data; 1324 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1325 unsigned long Size, RemainingBytes;
1022 1326
1023 XGetWindowProperty (display->display, display->root, 1327 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1328 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1329 0L, 1000000L,
1026 False, AnyPropertyType, 1330 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1331 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1332 &Size, &RemainingBytes,
1029 &data); 1333 &data);
1030 XChangeProperty (display->display, display->root, 1334 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1335 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1336 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1338 }
1037#endif /* OFFIX_DND */ 1339#endif /* OFFIX_DND */
1038 break; 1340 break;
1039 1341
1040 case MappingNotify: 1342 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1343 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1344 break;
1043 1345
1044 /* 1346 /*
1045 * XXX: this is not the _current_ arrangement 1347 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1348 * Here's my conclusion:
… …
1071 { 1373 {
1072 TermWin.focus = 1; 1374 TermWin.focus = 1;
1073 want_refresh = 1; 1375 want_refresh = 1;
1074#ifdef USE_XIM 1376#ifdef USE_XIM
1075 if (Input_Context != NULL) 1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1380 XSetICFocus (Input_Context);
1381 }
1077#endif 1382#endif
1078#ifdef CURSOR_BLINK 1383#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1384 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1081#endif 1393#endif
1082 1394
1083 } 1395 }
1084 break; 1396 break;
1085 1397
1086 case FocusOut: 1398 case FocusOut:
1087 if (TermWin.focus) 1399 if (TermWin.focus)
1088 { 1400 {
1089 TermWin.focus = 0; 1401 TermWin.focus = 0;
1090 want_refresh = 1; 1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1091#ifdef USE_XIM 1410#ifdef USE_XIM
1092 if (Input_Context != NULL) 1411 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1412 XUnsetICFocus (Input_Context);
1094#endif 1413#endif
1095#ifdef CURSOR_BLINK 1414#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1415 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1416 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1417 hidden_cursor = 0;
1099#endif 1418#endif
1100 1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1101 } 1426 }
1102 break; 1427 break;
1103 1428
1104 case ConfigureNotify: 1429 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1430 if (ev.xconfigure.window == TermWin.parent[0])
… …
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 { 1443 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1444 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1445 resize_all_windows (width, height, 1);
1121 } 1446 }
1122#ifdef DEBUG_SIZE 1447
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1449 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1450 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1451#endif
1136 } 1452 }
1453 break;
1454
1455 case PropertyNotify:
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1457 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459
1137 break; 1460 break;
1138 1461
1139 case SelectionClear: 1462 case SelectionClear:
1140 selection_clear (); 1463 selection_clear ();
1141 break; 1464 break;
1142 1465
1143 case SelectionNotify: 1466 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1467 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1468 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1469 break;
1148 1470
1149 case SelectionRequest: 1471 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1472 selection_send (ev.xselectionrequest);
1151 break; 1473 break;
… …
1172 1494
1173 case GraphicsExpose: 1495 case GraphicsExpose:
1174 case Expose: 1496 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1497 if (ev.xany.window == TermWin.vt)
1176 { 1498 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1499 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1503
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1507 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1508 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1509
1185 // ev.xexpose.width, TermWin.height, False); 1510 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1511 }
1189 else 1512 else
1190 { 1513 {
1191 XEvent unused_event; 1514 XEvent unused_event;
1192 1515
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1517 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1519 ;
1198 &unused_event)) ; 1520
1199 if (isScrollbarWindow (ev.xany.window)) 1521 if (isScrollbarWindow (ev.xany.window))
1200 { 1522 {
1201 scrollBar.setIdle (); 1523 scrollBar.setIdle ();
1202 scrollbar_show (0); 1524 scrollbar_show (0);
1203 } 1525 }
1204#ifdef MENUBAR 1526#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1528 menubar_expose ();
1207#endif 1529#endif
1530
1531#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window);
1534#endif
1208 } 1535 }
1209 break; 1536 break;
1210 1537
1211 case MotionNotify: 1538 case MotionNotify:
1212#ifdef POINTER_BLANK 1539#ifdef POINTER_BLANK
… …
1218 { 1545 {
1219 menubar_control (ev.xbutton); 1546 menubar_control (ev.xbutton);
1220 break; 1547 break;
1221 } 1548 }
1222#endif 1549#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1551 break;
1225 1552
1226 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == TermWin.vt)
1227 { 1554 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1555 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1556 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1558 ;
1232 1559
1233 XQueryPointer (display->display, TermWin.vt, 1560 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1561 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1562 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1563 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1564 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1565#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1566 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1567 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1568 {
1242#endif 1569#endif
1570#if ISO_14755
1571 // 5.4
1572 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1573 {
1574 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1575 break;
1576 }
1577#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1578 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1579 ev.xbutton.state & Button3Mask ? 2 : 0);
1580
1245#ifdef SELECTION_SCROLLING 1581#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1582 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1584 {
1249 int dist; 1585 int dist;
1250 1586
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1587 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1588 * already in the middle of scrolling.
1255 */ 1589 */
1256 if (scroll_selection_delay<=0) 1590 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1591 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1592
1259 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1261 */ 1595 */
1262 selection_save_x=ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1597 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1599
1267 /* calc number of lines to scroll */ 1600 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1601 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1602 {
1270 scroll_selection_dir = UP; 1603 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1604 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1605 }
1273 else 1606 else
1274 { 1607 {
1275 scroll_selection_dir = DN; 1608 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1610 }
1611
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1612 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1613 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1;
1281 MIN_IT (scroll_selection_lines, 1615 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1616 SELECTION_SCROLL_MAX_LINES);
1283 } 1617 }
1284 else 1618 else
1285 { 1619 {
1286 /* we are within the text window, so we 1620 /* we are within the text window, so we
1287 * shouldn't be scrolling 1621 * shouldn't be scrolling
1288 */ 1622 */
1289 pending_scroll_selection = 0; 1623 if (sel_scroll_ev.active)
1624 sel_scroll_ev.stop();
1290 } 1625 }
1291#endif 1626#endif
1292#ifdef MOUSE_THRESHOLD 1627#ifdef MOUSE_THRESHOLD
1293
1294 } 1628 }
1295#endif 1629#endif
1296
1297 } 1630 }
1298 } 1631 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1633 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1635 MotionNotify, &ev))
1636 ;
1637
1303 XQueryPointer (display->display, scrollBar.win, 1638 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1639 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1640 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1641 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1642 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1644 scrollbar_size ());
1310 scr_refresh (refresh_type); 1645 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1646 refresh_limit = 0;
… …
1313 } 1648 }
1314 break; 1649 break;
1315 } 1650 }
1316} 1651}
1317 1652
1653#if TRANSPARENT
1318void 1654void
1319rxvt_term::rootwin_cb (XEvent &ev) 1655rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1656{
1321 SET_R (this); 1657 SET_R (this);
1322 SET_LOCALE (locale); 1658 SET_LOCALE (locale);
1323 1659
1324 switch (ev.type) 1660 switch (ev.type)
1325 { 1661 {
1326 case PropertyNotify: 1662 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 /* 1663 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1664 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1665 * use the property to determine the pixmap. We use it later on.
1339 */ 1666 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1667 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1669 return;
1345 }
1346 1670
1347 /* FALLTHROUGH */ 1671 /* FALLTHROUGH */
1348 case ReparentNotify: 1672 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1674 want_refresh = want_full_refresh = 1;
1351 break; 1675 break;
1352#endif
1353 } 1676 }
1354} 1677}
1678#endif
1355 1679
1356void 1680void
1357rxvt_term::button_press (XButtonEvent &ev) 1681rxvt_term::button_press (XButtonEvent &ev)
1358{ 1682{
1359 int reportmode = 0, clickintime; 1683 int reportmode = 0, clickintime;
1360 1684
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1686 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1687 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688
1364 /* 1689 /*
1365 * VT window processing of button press 1690 * VT window processing of button press
1366 */ 1691 */
1367 if (ev.window == TermWin.vt) 1692 if (ev.window == TermWin.vt)
1368 { 1693 {
1694#if ISO_14755
1695 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 {
1698 iso14755_54 (ev.x, ev.y);
1699 return;
1700 }
1701#endif
1702
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1703 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1704
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) */
1374 MEvent.state = ev.state; 1709 MEvent.state = ev.state;
… …
1403 } 1738 }
1404 else 1739 else
1405 { 1740 {
1406 if (ev.button != MEvent.button) 1741 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1743
1408 switch (ev.button) 1744 switch (ev.button)
1409 { 1745 {
1410 case Button1: 1746 case Button1:
1747 /* allow meta + click to select rectangular areas */
1748 /* should be done in screen.C */
1749#if ENABLE_FRILLS
1750 selection.rect = !!(ev.state & ModMetaMask);
1751#else
1752 selection.rect = false;
1753#endif
1754
1411 /* allow shift+left click to extend selection */ 1755 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1757 {
1414 if (MEvent.button == Button1 && clickintime) 1758 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1759 selection_rotate (ev.x, ev.y);
1416 else 1760 else
1417 selection_extend (ev.x, ev.y, 1); 1761 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1776 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1777 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1778 selection_rotate (ev.x, ev.y);
1435 else 1779 else
1436 selection_extend (ev.x, ev.y, 1); 1780 selection_extend (ev.x, ev.y, 1);
1781
1437 MEvent.button = Button3; 1782 MEvent.button = Button3;
1438 break; 1783 break;
1439 } 1784 }
1440 } 1785 }
1786
1441 MEvent.time = ev.time; 1787 MEvent.time = ev.time;
1442 return; 1788 return;
1443 } 1789 }
1444 1790
1445 /* 1791 /*
… …
1511 upordown = 1; /* down */ 1857 upordown = 1; /* down */
1512 } 1858 }
1513 if (upordown) 1859 if (upordown)
1514 { 1860 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1861#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1862 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1863#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1864 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1865 {
1520 if (upordown < 0) 1866 if (upordown < 0)
1521 scrollBar.setUp (); 1867 scrollBar.setUp ();
… …
1537 break; 1883 break;
1538 case R_SB_ALIGN_BOTTOM: 1884 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1885 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1886 break;
1541 } 1887 }
1888
1542 if (scrollBar.style == R_SB_XTERM 1889 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1890 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1891 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1892 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1893
1547 scrollBar.setMotion (); 1894 scrollBar.setMotion ();
1548 break; 1895 break;
1549 1896
1550 case Button1: 1897 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1898 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1922 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1923 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1924 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1925 / scrollbar_size ()));
1579 } 1926 }
1927
1580 break; 1928 break;
1581 } 1929 }
1582 } 1930 }
1583 return; 1931 return;
1584 } 1932 }
… …
1596{ 1944{
1597 int reportmode = 0; 1945 int reportmode = 0;
1598 1946
1599 csrO = 0; /* reset csr Offset */ 1947 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1948 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1949 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1950
1603 if (scrollbar_isUpDn ()) 1951 if (scrollbar_isUpDn ())
1604 { 1952 {
1605 scrollBar.setIdle (); 1953 scrollBar.setIdle ();
1606 scrollbar_show (0); 1954 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1956 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1957#endif
1610
1611 } 1958 }
1959
1612#ifdef SELECTION_SCROLLING 1960#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1961 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop();
1614#endif 1963#endif
1964
1615 if (ev.window == TermWin.vt) 1965 if (ev.window == TermWin.vt)
1616 { 1966 {
1967#if ISO_14755
1968 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return;
1971#endif
1617 if (reportmode) 1972 if (reportmode)
1618 { 1973 {
1619 /* mouse report from vt window */ 1974 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1975 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1976 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 1990 MEvent.button = AnyButton;
1636 mouse_report (ev); 1991 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 1992#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 1993 return;
1639 } 1994 }
1995
1640 /* 1996 /*
1641 * dumb hack to compensate for the failure of click-and-drag 1997 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 1998 * when overriding mouse reporting
1643 */ 1999 */
1644 if (PrivateModes & PrivMode_mouse_report 2000 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2001 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2002 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2003 selection_extend (ev.x, ev.y, 0);
1648 2004
1649 switch (ev.button) 2005 switch (ev.button)
… …
1660 case Button5: 2016 case Button5:
1661 { 2017 {
1662 int i; 2018 int i;
1663 page_dirn v; 2019 page_dirn v;
1664 2020
1665 v = (ev.button == Button4) ? UP : DN; 2021 v = ev.button == Button4 ? UP : DN;
2022
1666 if (ev.state & ShiftMask) 2023 if (ev.state & ShiftMask)
1667 i = 1; 2024 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2025 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2026 i = TermWin.nrow - 1;
1670 else 2027 else
1671 i = 5; 2028 i = 5;
2029
1672# ifdef MOUSE_SLIP_WHEELING 2030# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2031 if (ev.state & ControlMask)
1674 { 2032 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2033 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2036
2037 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039
2040 slip_wheel_ev.start ();
1677 } 2041 }
2042 else
2043 {
1678# endif 2044# endif
1679# ifdef JUMP_MOUSE_WHEEL 2045# 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); 2046 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2047 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2048 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING
1689 } 2058 }
1690# endif 2059#endif
1691
1692 } 2060 }
1693 break; 2061 break;
1694#endif 2062#endif
1695
1696 } 2063 }
1697 } 2064 }
1698#ifdef MENUBAR 2065#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2066 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2067 menubar_control (ev);
1701#endif 2068#endif
1702} 2069}
1703 2070
1704#ifdef TRANSPARENT 2071#ifdef TRANSPARENT
1705#if TINTING 2072#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2073/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2074
1709static void 2075typedef 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 2076
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2077void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2078{
1717 /* No saturation */ 2079 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2080 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i;
1721 2085
1722 b = ((uint16_t *) ptr)[x]; 2086 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2087
1724 g = (b & 0x3e0) * gm; 2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2089
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2090 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2091 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2092 mask_g = visual->green_mask;
1729 } 2093 mask_b = visual->blue_mask;
1730 ptr += bpl; 2094
1731 } 2095 /* boring lookup table pre-initialization */
2096 switch (srcImage->bits_per_pixel) {
2097 case 15:
2098 if ((mask_r != 0x7c00) ||
2099 (mask_g != 0x03e0) ||
2100 (mask_b != 0x001f))
2101 return;
2102 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2103 lookup_r = lookup;
2104 lookup_g = lookup+32;
2105 lookup_b = lookup+32+32;
2106 sh_r = 10;
2107 sh_g = 5;
2108 sh_b = 0;
2109 break;
2110 case 16:
2111 if ((mask_r != 0xf800) ||
2112 (mask_g != 0x07e0) ||
2113 (mask_b != 0x001f))
2114 return;
2115 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2116 lookup_r = lookup;
2117 lookup_g = lookup+32;
2118 lookup_b = lookup+32+64;
2119 sh_r = 11;
2120 sh_g = 5;
2121 sh_b = 0;
2122 break;
2123 case 24:
2124 if ((mask_r != 0xff0000) ||
2125 (mask_g != 0x00ff00) ||
2126 (mask_b != 0x0000ff))
2127 return;
2128 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2129 lookup_r = lookup;
2130 lookup_g = lookup+256;
2131 lookup_b = lookup+256+256;
2132 sh_r = 16;
2133 sh_g = 8;
2134 sh_b = 0;
2135 break;
2136 case 32:
2137 if ((mask_r != 0xff0000) ||
2138 (mask_g != 0x00ff00) ||
2139 (mask_b != 0x0000ff))
2140 return;
2141 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2142 lookup_r = lookup;
2143 lookup_g = lookup+256;
2144 lookup_b = lookup+256+256;
2145 sh_r = 16;
2146 sh_g = 8;
2147 sh_b = 0;
2148 break;
2149 default:
2150 return; /* we do not support this color depth */
2151 }
2152
2153 /* prepare limits for color transformation (each channel is handled separately) */
2154 if (shade < 0) {
2155 shade = -shade;
2156 if (shade < 0) shade = 0;
2157 if (shade > 100) shade = 100;
2158
2159 lower_lim_r = 65535-rm;
2160 lower_lim_g = 65535-gm;
2161 lower_lim_b = 65535-bm;
2162
2163 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2164 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2165 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2166
2167 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2168 } else {
1733 for (y = h; --y >= 0;) { 2169 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2170 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2171
1737 b = ((uint16_t *) ptr)[x]; 2172 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2173
1739 g = (b & 0x3e0) * gm; 2174 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2175 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2176 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2177 }
1743 b |= (!(b >> 5) - 1); 2178
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2179 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2180 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2181 {
1747 } 2182 unsigned int tmp;
1748 ptr += bpl; 2183
2184 tmp = lower_lim_r;
2185 lower_lim_r = lower_lim_b;
2186 lower_lim_b = tmp;
2187
2188 tmp = upper_lim_r;
2189 upper_lim_r = upper_lim_b;
2190 upper_lim_b = tmp;
2191 }
2192
2193 /* fill our lookup tables */
2194 for (i = 0; i <= mask_r>>sh_r; i++)
2195 {
2196 RUINT32T tmp;
2197 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2198 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2199 lookup_r[i] = (tmp/65535)<<sh_r;
2200 }
2201 for (i = 0; i <= mask_g>>sh_g; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2205 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2206 lookup_g[i] = (tmp/65535)<<sh_g;
2207 }
2208 for (i = 0; i <= mask_b>>sh_b; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2212 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2213 lookup_b[i] = (tmp/65535)<<sh_b;
2214 }
2215
2216 /* apply table to input image (replacing colors by newly calculated ones) */
2217 switch (srcImage->bits_per_pixel)
2218 {
2219 case 15:
2220 {
2221 unsigned short *p1, *pf, *p, *pl;
2222 p1 = (unsigned short *) srcImage->data;
2223 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2224 while (p1 < pf)
2225 {
2226 p = p1;
2227 pl = p1 + srcImage->width;
2228 for (; p < pl; p++)
1749 } 2229 {
2230 *p = lookup_r[(*p & 0x7c00)>>10] |
2231 lookup_g[(*p & 0x03e0)>> 5] |
2232 lookup_b[(*p & 0x001f)];
2233 }
2234 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2235 }
1751} 2236 break;
1752 2237 }
1753/* RGB 16 */ 2238 case 16:
1754static void 2239 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2240 unsigned short *p1, *pf, *p, *pl;
1756{ 2241 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2242 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2243 while (p1 < pf)
1759 2244 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2245 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2246 pl = p1 + srcImage->width;
1762 /* No saturation */ 2247 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 } 2248 {
1777 } else { 2249 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2250 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2251 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 } 2252 }
1793 ptr += bpl; 2253 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2254 }
2255 break;
2256 }
2257 case 24:
2258 {
2259 unsigned char *p1, *pf, *p, *pl;
2260 p1 = (unsigned char *) srcImage->data;
2261 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2262 while (p1 < pf)
2263 {
2264 p = p1;
2265 pl = p1 + srcImage->width * 3;
2266 for (; p < pl; p += 3)
1794 } 2267 {
2268 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2269 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2270 p[2] = lookup_r[(p[2] & 0x0000ff)];
2271 }
2272 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2273 }
1796} 2274 break;
2275 }
2276 case 32:
2277 {
2278 RUINT32T *p1, *pf, *p, *pl;
2279 p1 = (RUINT32T *) srcImage->data;
2280 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2281
1798/* RGB 24 */ 2282 while (p1 < pf)
1799static void 2283 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2284 p = p1;
1801{ 2285 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2286 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 } 2287 {
1830 } else { 2288 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2289 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2290 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2291 (*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 } 2292 }
1861 ptr += bpl; 2293 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2294 }
2295 break;
2296 }
1863 } 2297 }
1864}
1865 2298
1866/* RGB 32 */ 2299 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} 2300}
1937
1938#endif 2301#endif
1939 2302
1940/* 2303/*
1941 * Check our parents are still who we think they are. 2304 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2305 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2315 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2316 XWindowAttributes wattr, wrootattr;
1954 2317
1955 pchanged = 0; 2318 pchanged = 0;
1956 2319
1957 if (!(Options & Opt_transparent)) 2320 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2321 return pchanged; /* Don't try any more */
1959 2322
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2323 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2324 rootdepth = wrootattr.depth;
1962 2325
… …
1965 if (rootdepth != wattr.depth) 2328 if (rootdepth != wattr.depth)
1966 { 2329 {
1967 if (am_transparent) 2330 if (am_transparent)
1968 { 2331 {
1969 pchanged = 1; 2332 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2334 am_transparent = am_pixmap_trans = 0;
1972 } 2335 }
1973 2336
1974 return pchanged; /* Don't try any more */ 2337 return pchanged; /* Don't try any more */
1975 } 2338 }
… …
1980 /* 2343 /*
1981 * Make the frame window set by the window manager have 2344 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2345 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2346 * windows for each client, so we have to take care about that.
1984 */ 2347 */
1985 i = (xa[XA_XROOTPMAPID] 2348 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2351 &nitems, &bytes_after, &prop) == Success);
1989 2352
1990 if (!i || prop == NULL) 2353 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2354 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2357 &nitems, &bytes_after, &prop) == Success);
1995 2358
1996 if (!i || prop == NULL) 2359 if (!i || prop == NULL
2360#if TINTING
2361 || !rs[Rs_color + Color_tint]
2362#endif
2363 )
1997 have_pixmap = 0; 2364 have_pixmap = 0;
1998 else 2365 else
1999 { 2366 {
2000 have_pixmap = 1; 2367 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2368 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2369 XFree (prop);
2003 } 2370 }
2004 2371
2005 if (have_pixmap) 2372 if (have_pixmap)
2006 { 2373 {
… …
2034 sy = 0; 2401 sy = 0;
2035 } 2402 }
2036 2403
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406
2407 XSync (display->display, False);
2039 allowedxerror = -1; 2408 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2410
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2412 /* XXX: may need a delay here? */
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2432 XFreePixmap (display->display, TermWin.pixmap);
2064 2433
2065#if TINTING 2434#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2435 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2436 {
2068 unsigned short shade, rm, gm, bm; 2437 unsigned short rm, gm, bm;
2438 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2439
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2440 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2441
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2442 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 } 2443 }
2083#endif 2444#endif
2084 2445
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2447 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2450 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2451 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2452 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2454 XClearWindow (display->display, TermWin.parent[0]);
2094 2455
2095 if (!am_transparent || !am_pixmap_trans) 2456 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2457 pchanged = 1;
2097 2458
2098 am_transparent = am_pixmap_trans = 1; 2459 am_transparent = am_pixmap_trans = 1;
2099 } 2460 }
2100 } 2461 }
2101 2462
2102 if (!am_pixmap_trans) 2463 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2465 else
2103 { 2466 {
2104 unsigned int n; 2467 unsigned int n;
2105 /* 2468 /*
2106 * InheritPixmap transparency 2469 * InheritPixmap transparency
2107 */ 2470 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2472 {
2111 oldp = TermWin.parent[i]; 2473 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2474 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2475 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2476 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2477
2117 if (TermWin.parent[i] == display->root) 2478 if (TermWin.parent[i] == display->root)
2118 { 2479 {
2119 if (oldp != None) 2480 if (oldp != None)
2120 pchanged = 1; 2481 pchanged = 1;
… …
2131 if (pchanged) 2492 if (pchanged)
2132 { 2493 {
2133 for (; n < (unsigned int)i; n++) 2494 for (; n < (unsigned int)i; n++)
2134 { 2495 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2496 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) 2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2498 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2500 break;
2141 } 2501 }
2142 } 2502 }
2143 } 2503 }
2144 2504
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2506 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2509 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2510 /* XXX: also turn off Opt_transparent? */
2152 } 2511 }
2153 else 2512 else
2154 { 2513 {
2155#if WAIT_FOR_WM 2514#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2515 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2516 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2517 sleep (1);
2159#endif 2518#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2519 for (n = 0; n < (unsigned int)i; n++)
2520 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]);
2523 }
2163 2524
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2526 am_transparent = 1;
2166 } 2527 }
2167 2528
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2530 TermWin.parent[i] = None;
2531 }
2532
2533 if (scrollBar.win)
2534 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle ();
2537 scrollbar_show (0);
2538 }
2539
2540 if (am_transparent)
2541 {
2542 want_refresh = want_full_refresh = 1;
2543 if (am_pixmap_trans)
2544 flush ();
2170 } 2545 }
2171 2546
2172 return pchanged; 2547 return pchanged;
2173} 2548}
2174#endif 2549#endif
… …
2191 } 2566 }
2192 2567
2193 if (ch == NOCHAR) // TODO: improve 2568 if (ch == NOCHAR) // TODO: improve
2194 break; 2569 break;
2195 2570
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 {
2573 if (!seen_input)
2197 { 2574 {
2575 seen_input = 1;
2576 // many badly-written programs (e.g. jed) contain a race condition:
2577 // they first read the screensize and then install a SIGWINCH handler.
2578 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized.
2583 if (seen_resize)
2584 kill (-cmd_pid, SIGWINCH);
2585 }
2586
2198 /* Read a text string from the input buffer */ 2587 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2588 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2589 bool refreshnow = false;
2201 int nlines = 0; 2590 int nlines = 0;
2202 unicode_t *str = buf; 2591 unicode_t *str = buf;
2203 2592
2204 *str++ = ch;
2205
2206 for (;;) 2593 for (;;)
2207 { 2594 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2596 break;
2213 2597
2214 *str++ = ch; 2598 *str++ = ch;
2215 2599
2216 if (ch == '\n') 2600 if (ch == C0_LF)
2217 { 2601 {
2218 nlines++; 2602 nlines++;
2219 refresh_count++; 2603 refresh_count++;
2220 2604
2221 if (! (Options & Opt_jumpScroll) 2605 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2607 {
2224 refreshnow = true; 2608 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2609 ch = NOCHAR;
2227 break; 2610 break;
2228 } 2611 }
2229 2612
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2614 if (nlines >= TermWin.nrow - 1)
2232 { 2615 {
2233 scr_add_lines (buf, nlines, str - buf); 2616 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2617 nlines = 0;
2235 str = buf; 2618 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2622 if (str >= buf + UBUFSIZ)
2240 { 2623 {
2241 ch = NOCHAR; 2624 ch = NOCHAR;
2242 break; 2625 break;
2243 } 2626 }
2627
2628 seq_begin = cmdbuf_ptr;
2629 ch = next_char ();
2244 } 2630 }
2245 2631
2246 scr_add_lines (buf, nlines, str - buf); 2632 scr_add_lines (buf, nlines, str - buf);
2247 2633
2248 /* 2634 /*
2249 * If there have been a lot of new lines, then update the screen 2635 * 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. 2636 * 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 2637 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2638 * 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 */ 2639 */
2257 if (refreshnow) 2640 if (refreshnow)
2258 { 2641 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2643 refresh_limit++;
2261 2644 else
2645 {
2646 flag = true;
2262 scr_refresh (refresh_type); 2647 scr_refresh (refresh_type);
2648 }
2263 } 2649 }
2264 2650
2265 } 2651 }
2266 else 2652 else
2267 { 2653 {
… …
2281 } 2667 }
2282 2668
2283 return flag; 2669 return flag;
2284} 2670}
2285 2671
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679}
2680
2286// read the next character 2681// read the next character
2287unicode_t 2682unicode_t
2288rxvt_term::next_char () 2683rxvt_term::next_char ()
2289{ 2684{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2685 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2701 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2703
2309 // assume wchar == unicode 2704 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2705 cmdbuf_ptr += len;
2311 return wc; 2706 return wc & UNICODE_MASK;
2312 } 2707 }
2313 2708
2314 return NOCHAR; 2709 return NOCHAR;
2315} 2710}
2316 2711
… …
2321 */ 2716 */
2322unicode_t 2717unicode_t
2323rxvt_term::cmd_getc () 2718rxvt_term::cmd_getc ()
2324{ 2719{
2325 unicode_t c = next_char (); 2720 unicode_t c = next_char ();
2721
2722 if (c == NOCHAR)
2723 throw out_of_input;
2724
2725 return c;
2726}
2727
2728unicode_t
2729rxvt_term::cmd_get8 ()
2730{
2731 unicode_t c = next_octet ();
2326 2732
2327 if (c == NOCHAR) 2733 if (c == NOCHAR)
2328 throw out_of_input; 2734 throw out_of_input;
2329 2735
2330 return c; 2736 return c;
… …
2431 process_escape_seq (); 2837 process_escape_seq ();
2432 break; 2838 break;
2433 case C0_ENQ: /* terminal Status */ 2839 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2840 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2843 else
2438 tt_write ((unsigned char *)VT100_ANS, 2844 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2845 (unsigned int)strlen (VT100_ANS));
2440 break; 2846 break;
2441 case C0_BEL: /* bell */ 2847 case C0_BEL: /* bell */
2442 scr_bell (); 2848 scr_bell ();
2443 break; 2849 break;
2444 case C0_BS: /* backspace */ 2850 case C0_BS: /* backspace */
… …
2460 break; 2866 break;
2461 case C0_SI: /* shift in - acs */ 2867 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2868 scr_charset_choose (0);
2463 break; 2869 break;
2464 2870
2871#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2872 // 8-bit controls
2466 case 0x90: /* DCS */ 2873 case 0x90: /* DCS */
2467 process_dcs_seq (); 2874 process_dcs_seq ();
2468 break; 2875 break;
2469 case 0x9b: /* CSI */ 2876 case 0x9b: /* CSI */
2470 process_csi_seq (); 2877 process_csi_seq ();
2471 break; 2878 break;
2472 case 0x9d: /* CSI */ 2879 case 0x9d: /* CSI */
2473 process_osc_seq (); 2880 process_osc_seq ();
2474 break; 2881 break;
2882#endif
2475 } 2883 }
2476} 2884}
2477/*}}} */ 2885/*}}} */
2478 2886
2479 2887
… …
2541void 2949void
2542rxvt_term::process_escape_seq () 2950rxvt_term::process_escape_seq ()
2543{ 2951{
2544 unicode_t ch = cmd_getc (); 2952 unicode_t ch = cmd_getc ();
2545 2953
2546 if (PrivateModes & PrivMode_vt52) 2954 if (priv_modes & PrivMode_vt52)
2547 { 2955 {
2548 process_escape_vt52 (ch); 2956 process_escape_vt52 (ch);
2549 return; 2957 return;
2550 } 2958 }
2551 2959
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2974 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2975 break;
2568 case '+': 2976 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2977 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2978 break;
2571#ifndef NO_FRILLS 2979#if ENABLE_FRILLS
2572 case '6': 2980 case '6':
2573 scr_backindex (); 2981 scr_backindex ();
2574 break; 2982 break;
2575#endif 2983#endif
2576 case '7': 2984 case '7':
2577 scr_cursor (SAVE); 2985 scr_cursor (SAVE);
2578 break; 2986 break;
2579 case '8': 2987 case '8':
2580 scr_cursor (RESTORE); 2988 scr_cursor (RESTORE);
2581 break; 2989 break;
2582#ifndef NO_FRILLS 2990#if ENABLE_FRILLS
2583 case '9': 2991 case '9':
2584 scr_forwardindex (); 2992 scr_forwardindex ();
2585 break; 2993 break;
2586#endif 2994#endif
2587 case '=': 2995 case '=':
… …
2597 break; 3005 break;
2598 3006
2599 /* 8.3.87: NEXT LINE */ 3007 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3008 case C1_NEL: /* ESC E */
2601 { 3009 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3010 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3011 scr_add_lines (nlcr, 1, 2);
2604 } 3012 }
2605 break; 3013 break;
2606 3014
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3015 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3076
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3077/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3078/* *INDENT-OFF* */
2671enum { 3079enum {
2672 CSI_ICH = 0x40, 3080 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3081 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3082 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3083 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3084 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3085 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3086 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3295 break;
2888 3296
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3298 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3299 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3300 break;
2893 3301
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3303 process_sgr_mode (nargs, arg);
2896 break; 3304 break;
… …
2903 break; 3311 break;
2904 case 6: /* CPR requested */ 3312 case 6: /* CPR requested */
2905 scr_report_position (); 3313 scr_report_position ();
2906 break; 3314 break;
2907 case 7: /* unofficial extension */ 3315 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3316 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3317 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3318 break;
2911 case 8: /* unofficial extension */ 3319 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3321 break;
2914 } 3322 }
… …
2950 break; 3358 break;
2951 3359
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3360 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3361 if (arg[0] == 4)
2954 scr_insert_mode (0); 3362 scr_insert_mode (0);
3363 else if (arg[0] == 20)
3364 priv_modes &= ~PrivMode_LFNL;
2955 break; 3365 break;
2956 3366
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3367 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3368 if (arg[0] == 4)
2959 scr_insert_mode (1); 3369 scr_insert_mode (1);
3370 else if (arg[0] == 20)
3371 priv_modes |= PrivMode_LFNL;
2960 break; 3372 break;
2961 3373
2962 /* 3374 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3375 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3376 */
… …
2976 break; 3388 break;
2977 case CSI_75: 3389 case CSI_75:
2978 scr_cursor (RESTORE); 3390 scr_cursor (RESTORE);
2979 break; 3391 break;
2980 3392
2981#ifndef NO_FRILLS 3393#if ENABLE_FRILLS
2982 case CSI_74: 3394 case CSI_74:
2983 process_window_ops (arg, nargs); 3395 process_window_ops (arg, nargs);
2984 break; 3396 break;
2985#endif 3397#endif
2986 3398
… …
2993 break; 3405 break;
2994 } 3406 }
2995} 3407}
2996/*}}} */ 3408/*}}} */
2997 3409
2998#ifndef NO_FRILLS 3410#if ENABLE_FRILLS
2999/* ARGSUSED */ 3411/* ARGSUSED */
3000void 3412void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3413rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3414{
3003 int x, y; 3415 int x, y;
… …
3070 break; 3482 break;
3071 case 19: /* report window size (chars) */ 3483 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3485 break;
3074 case 20: /* report icon label */ 3486 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3487 {
3077 char *s; 3488 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3489 XGetIconName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s);
3080 } 3492 }
3081 break; 3493 break;
3082 case 21: /* report window title */ 3494 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3495 {
3085 char *s; 3496 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3497 XFetchName (display->display, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3088 } 3500 }
3089 break; 3501 break;
3090 } 3502 }
3091} 3503}
3092#endif 3504#endif
3093 3505
3094/*----------------------------------------------------------------------*/ 3506/*----------------------------------------------------------------------*/
3095/* 3507/*
3096 * get input up until STRING TERMINATOR (or BEL) 3508 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3509 * ends_how is terminator used. returned input must be free()'d
3098 */ 3510 */
3099unsigned char * 3511unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3512rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3513{
3102 int seen_esc = 0; /* seen escape? */ 3514 unicode_t ch;
3515 bool seen_esc = false;
3103 unsigned int n = 0; 3516 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3517 wchar_t string[STRING_MAX];
3107 3518
3108 while ((ch = cmd_getc ())) 3519 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3520 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3521 if (seen_esc)
3522 {
3114 if (ch == 0x5c) /* 7bit ST */ 3523 if (ch == 0x5c) /* 7bit ST */
3115 break; 3524 break;
3116 else 3525 else
3117 return NULL; 3526 return NULL;
3118 3527 }
3119 if (ch == C0_ESC) 3528 else if (ch == C0_ESC)
3120 { 3529 {
3121 seen_esc = 1; 3530 seen_esc = true;
3122 continue; 3531 continue;
3123 } 3532 }
3124 else if (ch == '\t') 3533 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3534 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3535 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3536 return NULL; /* other control character - exit */
3537
3538 seen_esc = false;
3128 3539
3129 if (n >= sizeof (string) - 1) 3540 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3541 // stop at some sane length
3131 return NULL; 3542 return NULL;
3132 3543
3544 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 ();
3546 else
3133 string[n++] = ch; 3547 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3548 }
3136 3549
3137 string[n++] = '\0'; 3550 string[n++] = '\0';
3138 3551
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3552 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3553
3144 return s; 3554 return (unsigned char *)rxvt_wcstombs (string);
3145} 3555}
3146 3556
3147/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
3148/* 3558/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3603void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3605{
3196 if (str[0] == '?' && !str[1]) 3606 if (str[0] == '?' && !str[1])
3197 { 3607 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3608 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3609 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3610 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3611 }
3205 else 3612 else
3206 set_window_color (color, str); 3613 set_window_color (color, str);
3207} 3614}
3208 3615
… …
3236{ 3643{
3237 int changed = 0; 3644 int changed = 0;
3238 int color; 3645 int color;
3239 char *buf, *name; 3646 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3647 bool query = str[0] == '?' && !str[1];
3648 int saveop = op;
3241 3649
3242 assert (str != NULL); 3650 assert (str != NULL);
3243 switch (op) 3651 switch (op)
3244 { 3652 {
3245 case XTerm_name: 3653 case XTerm_name:
… …
3252 set_title (str); 3660 set_title (str);
3253 break; 3661 break;
3254 case XTerm_property: 3662 case XTerm_property:
3255 if (str[0] == '?') 3663 if (str[0] == '?')
3256 { 3664 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3665 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3666 Atom actual_type;
3259 int actual_format; 3667 int actual_format;
3260 unsigned long nitems; 3668 unsigned long nitems;
3261 unsigned long bytes_after; 3669 unsigned long bytes_after;
3262 unsigned char *value = 0; 3670 unsigned char *value = 0;
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3688 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3689
3282 if (eq) 3690 if (eq)
3283 { 3691 {
3284 *eq = 0; 3692 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3693 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3694 }
3290 else 3695 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3696 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str)); 3697 display->atom (str));
3293 } 3698 }
3294 break; 3699 break;
3295 3700
3296 case XTerm_Color: 3701 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3702 for (buf = (char *)str; buf && *buf;)
3298 { 3703 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3704 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3705 break;
3301 3706
3302 *name++ = '\0'; 3707 *name++ = '\0';
3303 color = atoi (buf); 3708 color = atoi (buf);
3304 3709
3305 if (color < 0 || color >= TOTAL_COLORS) 3710 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3711 break;
3307 3712
3308 if ((buf = STRCHR (name, ';')) != NULL) 3713 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3714 *buf++ = '\0';
3310 3715
3311 if (name[0] == '?' && !name[1]) 3716 if (name[0] == '?' && !name[1])
3312 { 3717 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3718 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3719 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); 3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3721 }
3320 else 3722 else
3321 set_window_color (color + minCOLOR, name); 3723 set_window_color (color + minCOLOR, name);
3322 } 3724 }
3323 break; 3725 break;
… …
3340 break; 3742 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3743#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3744 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3345 case XTerm_Color_UL: 3750 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3752 break;
3348 case XTerm_Color_RV: 3753 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break;
3756#endif
3757#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3760 check_our_parents ();
3761 if (am_transparent)
3762 want_full_refresh = want_refresh = 1;
3350 break; 3763 break;
3351#endif 3764#endif
3352 3765
3353 case XTerm_Pixmap: 3766 case XTerm_Pixmap:
3354 if (*str != ';') 3767 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3770 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3771 set_bgPixmap (str); /* change pixmap */
3359#endif 3772#endif
3360 scr_touch (true); 3773 scr_touch (true);
3361 } 3774 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3775 while ((str = strchr (str, ';')) != NULL)
3363 { 3776 {
3364 str++; 3777 str++;
3365#if XPM_BACKGROUND 3778#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3779 changed += scale_pixmap (str);
3367#endif 3780#endif
3368
3369 } 3781 }
3782
3370 if (changed) 3783 if (changed)
3371 { 3784 {
3372#ifdef XPM_BACKGROUND 3785#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3786 resize_pixmap ();
3374#endif 3787#endif
… …
3386 case XTerm_logfile: 3799 case XTerm_logfile:
3387 // TODO, when secure mode? 3800 // TODO, when secure mode?
3388 break; 3801 break;
3389 3802
3390 case XTerm_font: 3803 case XTerm_font:
3804 op = URxvt_font;
3805 case URxvt_font:
3806#if ENABLE_STYLES
3807 case URxvt_boldFont:
3808 case URxvt_italicFont:
3809 case URxvt_boldItalicFont:
3810#endif
3391 if (query) 3811 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3815 resp);
3816 else
3392 { 3817 {
3393 if (Options & Opt_insecure) 3818 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3819
3395 TermWin.fontset->fontdesc 3820 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3821 allocated.push_back ((void *)res);
3397 : "", 3822 set_fonts ();
3398 resp);
3399 } 3823 }
3400 else
3401 change_font (str);
3402 break; 3824 break;
3403 3825
3404#ifndef NO_FRILLS 3826#if ENABLE_FRILLS
3405 case XTerm_locale: 3827 case XTerm_locale:
3406 if (query) 3828 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3830 else
3412 { 3831 {
3413 set_locale (str); 3832 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8);
3414# ifdef USE_XIM 3834# ifdef USE_XIM
3415 im_cb (); 3835 im_cb ();
3416# endif 3836# endif
3417 } 3837 }
3418 break; 3838 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3839#endif
3429 3840
3430#ifdef MENUBAR 3841#ifdef MENUBAR
3431 case XTerm_Menu: 3842 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3843 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3845 break;
3435#endif 3846#endif
3436#if 0 3847#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3875{
3465 int state; 3876 int state;
3466 3877
3467 if (mode == 's') 3878 if (mode == 's')
3468 { 3879 {
3469 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3470 return -1; 3881 return -1;
3471 } 3882 }
3472 else 3883 else
3473 { 3884 {
3474 if (mode == 'r') 3885 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3887 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3889 PrivMode (state, bit);
3479 } 3890 }
3480 3891
3481 return state; 3892 return state;
3482} 3893}
… …
3500 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3918#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3508#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3925#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3928 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3929 // 45 margin bell NYI
3519 // 46 start logging 3930 // 46 start logging
… …
3560 3971
3561 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3973 switch (arg[i])
3563 { 3974 {
3564 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3565 if (Options & Opt_secondaryScreen) 3977 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3978 if (mode == 0)
3567 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3568 else if (mode == 1) 3980 else if (mode == 1)
3569 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3570 break; 3982 break;
… …
3581 * within VT52 mode 3993 * within VT52 mode
3582 */ 3994 */
3583 PrivMode (1, PrivMode_vt52); 3995 PrivMode (1, PrivMode_vt52);
3584 break; 3996 break;
3585 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4000 break;
3589 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3590 if (state) 4002 if (state)
3591 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3592 else 4004 else
3593 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3594 break; 4006 break;
3595 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3597 break; 4009 break;
3598 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4014 scr_autowrap (state);
3603 break; 4015 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4016 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4019 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4020 break;
3609#ifdef menuBar_esc 4021#ifdef menuBar_esc
3610 case menuBar_esc: 4022 case menuBar_esc:
3611#ifdef MENUBAR 4023#ifdef MENUBAR
3612 map_menuBar (state); 4024 map_menuBar (state);
… …
3632 break; 4044 break;
3633 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4049 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4050 break;
3639#if 0 4051#if 0
3640 case 1001: 4052 case 1001:
3641 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3642#endif 4054#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4056 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3646 else 4058 else
3647 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3648 break; 4060 break;
3649 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3650 if (state) 4062 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3652 else 4064 else
3653 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3654 break; 4066 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4067 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4068 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4070 scr_erase_screen (2);
3659 scr_change_screen (state); 4071 scr_change_screen (state);
3660 break; 4072 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4073 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4074 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4077 scr_erase_screen (2);
3666 break; 4078 break;
3667 default: 4079 default:
3668 break; 4080 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3695 break; 4107 break;
3696 case 1: 4108 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3698 break; 4110 break;
4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3699 case 4: 4115 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3701 break; 4117 break;
3702 case 5: 4118 case 5: // slowly blinking
4119 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4120 rendset = 1, rendstyle = RS_Blink;
3704 break; 4121 break;
4122 //case 6: // scoansi light background
3705 case 7: 4123 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4124 rendset = 1, rendstyle = RS_RVid;
3707 break; 4125 break;
3708 case 8: 4126 case 8:
3709 // invisible. NYI 4127 // invisible. NYI
3710 break; 4128 break;
3711 case 22: 4129 //case 9: // crossed out
4130 //case 10: // scoansi acs off, primary font
4131 //case 11: // scoansi acs on, first alt font
4132 //case 12: // scoansi acs on, |0x80, second alt font
4133 //...
4134 //case 19: // ninth alt font
4135 //case 20: // gothic
4136 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4137 rendset = 0, rendstyle = RS_Bold;
4138 break;
4139 case 22: // normal intensity
4140 rendset = 0, rendstyle = RS_Bold;
4141 break;
4142 case 23: // disable italic
4143 rendset = 0, rendstyle = RS_Italic;
3713 break; 4144 break;
3714 case 24: 4145 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3716 break; 4147 break;
3717 case 25: 4148 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4149 rendset = 0, rendstyle = RS_Blink;
3719 break; 4150 break;
4151 case 26: // variable spacing (iso 8613)
4152 rendset = 0, rendstyle = RS_Blink;
4153 break;
3720 case 27: 4154 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3722 break; 4156 break;
3723 case 28:
3724 // visible. NYI 4157 //case 28: // visible. NYI
3725 break; 4158 //case 29: // not crossed-out
3726 } 4159 }
3727 4160
3728 if (rendset != -1) 4161 if (rendset != -1)
3729 { 4162 {
3730 scr_rendition (rendset, rendstyle); 4163 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4174 case 35:
3742 case 36: 4175 case 36:
3743 case 37: 4176 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4178 break;
3746#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4181 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4183 i += 2;
3752 } 4184 }
3753 break; 4185 break;
3754#endif
3755 case 39: /* default fg */ 4186 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3757 break; 4188 break;
3758 4189
3759 case 40: 4190 case 40:
… …
3764 case 45: 4195 case 45:
3765 case 46: 4196 case 46:
3766 case 47: 4197 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4199 break;
3769#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4202 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4204 i += 2;
3775 } 4205 }
3776 break; 4206 break;
3777#endif
3778 case 49: /* default bg */ 4207 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3780 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3781 4212
3782#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3783 case 90: 4214 case 90:
3784 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3785 case 92: 4216 case 92:
3786 case 93: 4217 case 93:
3787 case 94: 4218 case 94:
3788 case 95: 4219 case 95:
3789 case 96: 4220 case 96:
3790 case 97: 4221 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4223 break;
3794 case 100: 4224 case 100:
3795 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3796 case 102: 4226 case 102:
3797 case 103: 4227 case 103:
3798 case 104: 4228 case 104:
3799 case 105: 4229 case 105:
3800 case 106: 4230 case 106:
3801 case 107: 4231 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4233 break;
3805#endif 4234#endif
3806 4235
3807 } 4236 }
3808 } 4237 }
3809} 4238}
3810/*}}} */ 4239/*}}} */
3811 4240
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4241/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4242void
3814rxvt_term::process_graphics () 4243rxvt_term::process_graphics ()
3815{ 4244{
3816 unicode_t ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3817 4246
3818 if (cmd == 'Q') 4247 if (cmd == 'Q')
3819 { /* query graphics */ 4248 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4250 return;
3822 } 4251 }
3823 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3824 do 4253 do
3825 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4269 unsigned char buf[256];
3841 4270
3842 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4273 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3846} 4275}
3847 4276
3848/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4278/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3851 */ 4280 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282
3852void 4283void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4284rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4285{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4286 if (v_buflen == 0)
4287 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4289
3857 if (len) 4290 if ((unsigned int)written == len)
4291 return;
4292
4293 data += written;
4294 len -= written;
3858 { 4295 }
4296
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4298
4299 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len;
4301
4302 pty_ev.set (EVENT_READ | EVENT_WRITE);
4303}
4304
4305void rxvt_term::pty_write ()
4306{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308
4309 if (written > 0)
4310 {
4311 v_buflen -= written;
4312
3859 if (v_buflen == 0) 4313 if (v_buflen == 0)
3860 { 4314 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4315 free (v_buffer);
3888 v_buffer = 0; 4316 v_buffer = 0;
3889 v_buflen = 0; 4317 v_buflen = 0;
3890 4318
3891 pty_ev.set (EVENT_READ); 4319 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4320 return;
3904 } 4321 }
4322
4323 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4324 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this...
4327 destroy ();
3906} 4328}
3907 4329
3908/*----------------------- end-of-file (C source) -----------------------*/ 4330/*----------------------- end-of-file (C source) -----------------------*/
3909 4331

Diff Legend

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