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.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

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

Diff Legend

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