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.34 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.34 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58void 58void
59rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
60{ 60{
61 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
62 unsigned int newlen; 62 unsigned int newlen;
63 KeySym keysym; 63 KeySym keysym;
64#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
66#endif 66#endif
67 int valid_keysym; 67 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
69 69
70/* 70 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
73 * 73 *
74 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
75 */ 75 */
76 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
77 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
78 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
79 79
80 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
81 { 81 {
82 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
84 } 84 }
85 85
86 kbuf[0] = 0; 86 kbuf[0] = 0;
87 87
88#ifdef USE_XIM 88#ifdef USE_XIM
89 if (Input_Context) 89 if (Input_Context)
90 { 90 {
91 Status status_return; 91 Status status_return;
92 92
93#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
97 else 97 else
98#endif 98#endif
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
114 { 117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
119 } 127 }
128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129 { 138 {
130 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
132 } 141 }
133 142
134 if (valid_keysym) 143 if (valid_keysym)
135 { 144 {
136/* for some backwards compatibility */ 145 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL 147# ifdef HOTKEY_CTRL
139 if (ctrl) 148 if (ctrl)
140# else 149# else
141 if (meta) 150 if (meta)
142# endif 151# endif
143 { 152 {
144 if (keysym == ks_bigfont) 153 if (keysym == ks_bigfont)
145 { 154 {
146 change_font (0, FONT_UP); 155 change_font (FONT_UP);
147 return; 156 return;
148 } 157 }
149 else if (keysym == ks_smallfont) 158 else if (keysym == ks_smallfont)
150 { 159 {
151 change_font (0, FONT_DN); 160 change_font (FONT_DN);
152 return; 161 return;
162 }
153 } 163 }
154 }
155#endif 164#endif
156 165
157 if (TermWin.saveLines) { 166 if (TermWin.saveLines)
167 {
158#ifdef UNSHIFTED_SCROLLKEYS 168#ifdef UNSHIFTED_SCROLLKEYS
159 if (!ctrl && !meta) { 169 if (!ctrl && !meta)
170 {
160#else 171#else
161 if (IS_SCROLL_MOD) { 172 if (IS_SCROLL_MOD)
173 {
162#endif 174#endif
163 int lnsppg; 175 int lnsppg;
164 176
165#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
166 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
167#else 179#else
168 lnsppg = TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
169#endif 181#endif
170 if (keysym == XK_Prior) { 182 if (keysym == XK_Prior)
183 {
171 scr_page (UP, lnsppg); 184 scr_page (UP, lnsppg);
172 return; 185 return;
186 }
173 } else if (keysym == XK_Next) { 187 else if (keysym == XK_Next)
188 {
174 scr_page (DN, lnsppg); 189 scr_page (DN, lnsppg);
175 return; 190 return;
176 } 191 }
177 } 192 }
178#ifdef SCROLL_ON_UPDOWN_KEYS 193#ifdef SCROLL_ON_UPDOWN_KEYS
179 if (IS_SCROLL_MOD) { 194 if (IS_SCROLL_MOD)
180 if (keysym == XK_Up) { 195 {
181 scr_page (UP, 1); 196 if (keysym == XK_Up)
182 return; 197 {
198 scr_page (UP, 1);
199 return;
200 }
183 } else if (keysym == XK_Down) { 201 else if (keysym == XK_Down)
184 scr_page (DN, 1); 202 {
185 return; 203 scr_page (DN, 1);
186 } 204 return;
187 } 205 }
206 }
188#endif 207#endif
189#ifdef SCROLL_ON_HOMEEND_KEYS 208#ifdef SCROLL_ON_HOMEEND_KEYS
190 if (IS_SCROLL_MOD) { 209 if (IS_SCROLL_MOD)
191 if (keysym == XK_Home) { 210 {
192 scr_move_to (0, 1); 211 if (keysym == XK_Home)
193 return; 212 {
213 scr_move_to (0, 1);
214 return;
215 }
194 } else if (keysym == XK_End) { 216 else if (keysym == XK_End)
195 scr_move_to (1, 0); 217 {
196 return; 218 scr_move_to (1, 0);
197 } 219 return;
198 } 220 }
221 }
199#endif 222#endif
200 } 223 }
201 224
202 if (shft) { 225 if (shft)
226 {
203 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
204 if (keysym >= XK_F1 && keysym <= XK_F10) { 228 if (keysym >= XK_F1 && keysym <= XK_F10)
229 {
205 keysym += (XK_F11 - XK_F1); 230 keysym += (XK_F11 - XK_F1);
206 shft = 0; /* turn off Shift */ 231 shft = 0; /* turn off Shift */
232 }
207 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
208 switch (keysym) { 234 {
209 /* normal XTerm key bindings */ 235 switch (keysym)
236 {
237 /* normal XTerm key bindings */
210 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
211 selection_request (ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
212 return; 240 return;
213 /* rxvt extras */ 241 /* rxvt extras */
214 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
215 change_font (0, FONT_UP); 243 change_font (FONT_UP);
216 return; 244 return;
217 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
218 change_font (0, FONT_DN); 246 change_font (FONT_DN);
219 return; 247 return;
220 } 248 }
221 } 249 }
222 } 250 }
223#ifdef PRINTPIPE 251#ifdef PRINTPIPE
224 if (keysym == XK_Print) { 252 if (keysym == XK_Print)
253 {
225 scr_printscreen (ctrl | shft); 254 scr_printscreen (ctrl | shft);
226 return; 255 return;
227 } 256 }
228#endif 257#endif
229#ifdef GREEK_SUPPORT
230 if (keysym == ks_greekmodeswith) {
231 greek_mode = !greek_mode;
232 if (greek_mode) {
233 xterm_seq (XTerm_title,
234 (greek_getmode() == GREEK_ELOT928
235 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
236 greek_reset();
237 } else
238 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
239 return;
240 }
241#endif
242 258
243 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
260 {
244#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
245 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
246 unsigned int l; 263 {
264 unsigned int l;
247 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
248 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
249 267
250 kbuf0 = (Keysym_map[keysym & 0xFF]); 268 kbuf0 = (Keysym_map[keysym & 0xFF]);
251 l = (unsigned int)*kbuf0++; 269 l = (unsigned int)*kbuf0++;
252 270
253 /* escape prefix */ 271 /* escape prefix */
254 if (meta) 272 if (meta)
255# ifdef META8_OPTION 273# ifdef META8_OPTION
256 if (meta_char == C0_ESC) 274 if (meta_char == C0_ESC)
257# endif 275# endif
258 tt_write (&ch, 1); 276 tt_write (&ch, 1);
259 tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
260 return; 278 return;
261 } else 279 }
280 else
262#endif 281#endif
263 { 282 {
264 newlen = 1; 283 newlen = 1;
265 switch (keysym) { 284 switch (keysym)
285 {
266#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
267 case XK_BackSpace: 287 case XK_BackSpace:
268 if (PrivateModes & PrivMode_HaveBackSpace) { 288 if (PrivateModes & PrivMode_HaveBackSpace)
289 {
269 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
270 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
271 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
272 } else 293 }
273 STRCPY(kbuf, key_backspace); 294 else
274# ifdef MULTICHAR_SET 295 STRCPY (kbuf, key_backspace);
275 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 296 break;
276 int col, row;
277
278 newlen = STRLEN(kbuf);
279 col = screen.cur.col - 1;
280 row = screen.cur.row + TermWin.saveLines;
281 if (IS_MULTI2(screen.rend[row][col]))
282 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
283 }
284# endif
285 break;
286#endif 297#endif
287#ifndef NO_DELETE_KEY 298#ifndef NO_DELETE_KEY
288 case XK_Delete: 299 case XK_Delete:
289 STRCPY(kbuf, key_delete); 300 STRCPY (kbuf, key_delete);
290# ifdef MULTICHAR_SET 301 break;
291 if (Options & Opt_mc_hack) {
292 int col, row;
293
294 newlen = STRLEN(kbuf);
295 col = screen.cur.col;
296 row = screen.cur.row + TermWin.saveLines;
297 if (IS_MULTI1(screen.rend[row][col]))
298 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
299 }
300# endif 302#endif
301 break; 303 case XK_Tab:
302#endif 304 if (shft)
303 case XK_Tab: 305 STRCPY (kbuf, "\033[Z");
304 if (shft) 306 else
305 STRCPY(kbuf, "\033[Z"); 307 {
306 else {
307#ifdef CTRL_TAB_MAKES_META 308#ifdef CTRL_TAB_MAKES_META
308 if (ctrl) 309 if (ctrl)
309 meta = 1; 310 meta = 1;
310#endif 311#endif
311#ifdef MOD4_TAB_MAKES_META 312#ifdef MOD4_TAB_MAKES_META
312 if (ev->state & Mod4Mask) 313 if (ev.state & Mod4Mask)
313 meta = 1; 314 meta = 1;
314#endif 315#endif
315 newlen = 0; 316 newlen = 0;
316 } 317 }
317 break; 318 break;
318
319 319
320#ifdef XK_KP_Left 320#ifdef XK_KP_Left
321 case XK_KP_Up: /* \033Ox or standard */ 321 case XK_KP_Up: /* \033Ox or standard */
322 case XK_KP_Down: /* \033Or or standard */ 322 case XK_KP_Down: /* \033Or or standard */
323 case XK_KP_Right: /* \033Ov or standard */ 323 case XK_KP_Right: /* \033Ov or standard */
324 case XK_KP_Left: /* \033Ot or standard */ 324 case XK_KP_Left: /* \033Ot or standard */
325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
326 STRCPY(kbuf, "\033OZ"); 326 {
327 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 327 STRCPY (kbuf, "\033OZ");
328 break; 328 kbuf[2] = "txvr"[keysym - XK_KP_Left];
329 } else 329 break;
330 }
331 else
330 /* translate to std. cursor key */ 332 /* translate to std. cursor key */
331 keysym = XK_Left + (keysym - XK_KP_Left); 333 keysym = XK_Left + (keysym - XK_KP_Left);
332 /* FALLTHROUGH */ 334 /* FALLTHROUGH */
333#endif 335#endif
334 case XK_Up: /* "\033[A" */ 336 case XK_Up: /* "\033[A" */
335 case XK_Down: /* "\033[B" */ 337 case XK_Down: /* "\033[B" */
336 case XK_Right: /* "\033[C" */ 338 case XK_Right: /* "\033[C" */
337 case XK_Left: /* "\033[D" */ 339 case XK_Left: /* "\033[D" */
338 STRCPY(kbuf, "\033[Z"); 340 STRCPY (kbuf, "\033[Z");
339 kbuf[2] = ("DACB"[keysym - XK_Left]); 341 kbuf[2] = "DACB"[keysym - XK_Left];
340 /* do Shift first */ 342 /* do Shift first */
341 if (shft) 343 if (shft)
342 kbuf[2] = ("dacb"[keysym - XK_Left]); 344 kbuf[2] = "dacb"[keysym - XK_Left];
343 else if (ctrl) { 345 else if (ctrl)
344 kbuf[1] = 'O'; 346 {
345 kbuf[2] = ("dacb"[keysym - XK_Left]); 347 kbuf[1] = 'O';
348 kbuf[2] = "dacb"[keysym - XK_Left];
349 }
346 } else if (PrivateModes & PrivMode_aplCUR) 350 else if (PrivateModes & PrivMode_aplCUR)
347 kbuf[1] = 'O'; 351 kbuf[1] = 'O';
348#ifdef MULTICHAR_SET 352 break;
349 //TODO: ??
350 if (Options & Opt_mc_hack) {
351 int col, row, m;
352
353 col = screen.cur.col;
354 row = screen.cur.row + TermWin.saveLines;
355 m = 0;
356 if (keysym == XK_Right
357 && IS_MULTI1(screen.rend[row][col]))
358 m = 1;
359 else if (keysym == XK_Left) {
360 if (col > 0) {
361 if (IS_MULTI2(screen.rend[row][col - 1]))
362 m = 1;
363 } else if (screen.cur.row > 0) {
364 col = screen.tlen[--row];
365 if (col == -1)
366 col = TermWin.ncol - 1;
367 else
368 col--;
369 if (col > 0
370 && IS_MULTI2(screen.rend[row][col]))
371 m = 1;
372 }
373 }
374 if (m)
375 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
376 }
377#endif
378 break;
379 353
380#ifndef UNSHIFTED_SCROLLKEYS 354#ifndef UNSHIFTED_SCROLLKEYS
381# ifdef XK_KP_Prior 355# ifdef XK_KP_Prior
382 case XK_KP_Prior: 356 case XK_KP_Prior:
383 /* allow shift to override */ 357 /* allow shift to override */
384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 358 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
385 STRCPY(kbuf, "\033Oy"); 359 {
386 break; 360 STRCPY (kbuf, "\033Oy");
387 } 361 break;
388 /* FALLTHROUGH */ 362 }
363 /* FALLTHROUGH */
389# endif 364# endif
390 case XK_Prior: 365 case XK_Prior:
391 STRCPY(kbuf, "\033[5~"); 366 STRCPY (kbuf, "\033[5~");
392 break; 367 break;
393# ifdef XK_KP_Next 368# ifdef XK_KP_Next
394 case XK_KP_Next: 369 case XK_KP_Next:
395 /* allow shift to override */ 370 /* allow shift to override */
396 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 371 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
397 STRCPY(kbuf, "\033Os"); 372 {
398 break; 373 STRCPY (kbuf, "\033Os");
399 } 374 break;
400 /* FALLTHROUGH */ 375 }
376 /* FALLTHROUGH */
401# endif 377# endif
402 case XK_Next: 378 case XK_Next:
403 STRCPY(kbuf, "\033[6~"); 379 STRCPY (kbuf, "\033[6~");
404 break; 380 break;
405#endif 381#endif
406 case XK_KP_Enter: 382 case XK_KP_Enter:
407 /* allow shift to override */ 383 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
409 STRCPY(kbuf, "\033OM"); 385 {
410 } else { 386 STRCPY (kbuf, "\033OM");
411 kbuf[0] = '\r'; 387 }
412 kbuf[1] = '\0'; 388 else
413 } 389 {
414 break; 390 kbuf[0] = '\r';
391 kbuf[1] = '\0';
392 }
393 break;
415 394
416#ifdef XK_KP_Begin 395#ifdef XK_KP_Begin
417 case XK_KP_Begin: 396 case XK_KP_Begin:
418 STRCPY(kbuf, "\033Ou"); 397 STRCPY (kbuf, "\033Ou");
419 break; 398 break;
420 399
421 case XK_KP_Insert: 400 case XK_KP_Insert:
422 STRCPY(kbuf, "\033Op"); 401 STRCPY (kbuf, "\033Op");
423 break; 402 break;
424 403
425 case XK_KP_Delete: 404 case XK_KP_Delete:
426 STRCPY(kbuf, "\033On"); 405 STRCPY (kbuf, "\033On");
427 break; 406 break;
428#endif 407#endif
429 case XK_KP_F1: /* "\033OP" */ 408 case XK_KP_F1: /* "\033OP" */
430 case XK_KP_F2: /* "\033OQ" */ 409 case XK_KP_F2: /* "\033OQ" */
431 case XK_KP_F3: /* "\033OR" */ 410 case XK_KP_F3: /* "\033OR" */
432 case XK_KP_F4: /* "\033OS" */ 411 case XK_KP_F4: /* "\033OS" */
433 STRCPY(kbuf, "\033OP"); 412 STRCPY (kbuf, "\033OP");
434 kbuf[2] += (keysym - XK_KP_F1); 413 kbuf[2] += (keysym - XK_KP_F1);
435 break; 414 break;
436 415
437 case XK_KP_Multiply: /* "\033Oj" : "*" */ 416 case XK_KP_Multiply: /* "\033Oj" : "*" */
438 case XK_KP_Add: /* "\033Ok" : "+" */ 417 case XK_KP_Add: /* "\033Ok" : "+" */
439 case XK_KP_Separator: /* "\033Ol" : "," */ 418 case XK_KP_Separator: /* "\033Ol" : "," */
440 case XK_KP_Subtract: /* "\033Om" : "-" */ 419 case XK_KP_Subtract: /* "\033Om" : "-" */
441 case XK_KP_Decimal: /* "\033On" : "." */ 420 case XK_KP_Decimal: /* "\033On" : "." */
442 case XK_KP_Divide: /* "\033Oo" : "/" */ 421 case XK_KP_Divide: /* "\033Oo" : "/" */
443 case XK_KP_0: /* "\033Op" : "0" */ 422 case XK_KP_0: /* "\033Op" : "0" */
444 case XK_KP_1: /* "\033Oq" : "1" */ 423 case XK_KP_1: /* "\033Oq" : "1" */
445 case XK_KP_2: /* "\033Or" : "2" */ 424 case XK_KP_2: /* "\033Or" : "2" */
446 case XK_KP_3: /* "\033Os" : "3" */ 425 case XK_KP_3: /* "\033Os" : "3" */
447 case XK_KP_4: /* "\033Ot" : "4" */ 426 case XK_KP_4: /* "\033Ot" : "4" */
448 case XK_KP_5: /* "\033Ou" : "5" */ 427 case XK_KP_5: /* "\033Ou" : "5" */
449 case XK_KP_6: /* "\033Ov" : "6" */ 428 case XK_KP_6: /* "\033Ov" : "6" */
450 case XK_KP_7: /* "\033Ow" : "7" */ 429 case XK_KP_7: /* "\033Ow" : "7" */
451 case XK_KP_8: /* "\033Ox" : "8" */ 430 case XK_KP_8: /* "\033Ox" : "8" */
452 case XK_KP_9: /* "\033Oy" : "9" */ 431 case XK_KP_9: /* "\033Oy" : "9" */
453 /* allow shift to override */ 432 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 433 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 STRCPY(kbuf, "\033Oj"); 434 {
456 kbuf[2] += (keysym - XK_KP_Multiply); 435 STRCPY (kbuf, "\033Oj");
457 } else { 436 kbuf[2] += (keysym - XK_KP_Multiply);
437 }
438 else
439 {
458 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 440 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
459 kbuf[1] = '\0'; 441 kbuf[1] = '\0';
460 } 442 }
461 break; 443 break;
462 444
463 case XK_Find: 445 case XK_Find:
464 STRCPY(kbuf, "\033[1~"); 446 STRCPY (kbuf, "\033[1~");
465 break; 447 break;
466 case XK_Insert: 448 case XK_Insert:
467 STRCPY(kbuf, "\033[2~"); 449 STRCPY (kbuf, "\033[2~");
468 break; 450 break;
469#ifdef DXK_Remove /* support for DEC remove like key */ 451#ifdef DXK_Remove /* support for DEC remove like key */
470 case DXK_Remove: 452 case DXK_Remove:
471 /* FALLTHROUGH */ 453 /* FALLTHROUGH */
472#endif 454#endif
473 case XK_Execute: 455 case XK_Execute:
474 STRCPY(kbuf, "\033[3~"); 456 STRCPY (kbuf, "\033[3~");
475 break; 457 break;
476 case XK_Select: 458 case XK_Select:
477 STRCPY(kbuf, "\033[4~"); 459 STRCPY (kbuf, "\033[4~");
478 break; 460 break;
479#ifdef XK_KP_End 461#ifdef XK_KP_End
480 case XK_KP_End: 462 case XK_KP_End:
481 /* allow shift to override */ 463 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 464 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
483 STRCPY(kbuf, "\033Oq"); 465 {
484 break; 466 STRCPY (kbuf, "\033Oq");
485 } 467 break;
486 /* FALLTHROUGH */ 468 }
469 /* FALLTHROUGH */
487#endif 470#endif
488 case XK_End: 471 case XK_End:
489 STRCPY(kbuf, KS_END); 472 STRCPY (kbuf, KS_END);
490 break; 473 break;
491#ifdef XK_KP_Home 474#ifdef XK_KP_Home
492 case XK_KP_Home: 475 case XK_KP_Home:
493 /* allow shift to override */ 476 /* allow shift to override */
494 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 477 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
495 STRCPY(kbuf, "\033Ow"); 478 {
496 break; 479 STRCPY (kbuf, "\033Ow");
497 } 480 break;
498 /* FALLTHROUGH */ 481 }
482 /* FALLTHROUGH */
499#endif 483#endif
500 case XK_Home: 484 case XK_Home:
501 STRCPY(kbuf, KS_HOME); 485 STRCPY (kbuf, KS_HOME);
502 break; 486 break;
503 487
504#define FKEY(n, fkey) \ 488#define FKEY(n, fkey) \
505 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 489 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
506 490
507 case XK_F1: /* "\033[11~" */ 491 case XK_F1: /* "\033[11~" */
508 case XK_F2: /* "\033[12~" */ 492 case XK_F2: /* "\033[12~" */
509 case XK_F3: /* "\033[13~" */ 493 case XK_F3: /* "\033[13~" */
510 case XK_F4: /* "\033[14~" */ 494 case XK_F4: /* "\033[14~" */
511 case XK_F5: /* "\033[15~" */ 495 case XK_F5: /* "\033[15~" */
512 FKEY(11, XK_F1); 496 FKEY (11, XK_F1);
513 break; 497 break;
514 case XK_F6: /* "\033[17~" */ 498 case XK_F6: /* "\033[17~" */
515 case XK_F7: /* "\033[18~" */ 499 case XK_F7: /* "\033[18~" */
516 case XK_F8: /* "\033[19~" */ 500 case XK_F8: /* "\033[19~" */
517 case XK_F9: /* "\033[20~" */ 501 case XK_F9: /* "\033[20~" */
518 case XK_F10: /* "\033[21~" */ 502 case XK_F10: /* "\033[21~" */
519 FKEY(17, XK_F6); 503 FKEY (17, XK_F6);
520 break; 504 break;
521 case XK_F11: /* "\033[23~" */ 505 case XK_F11: /* "\033[23~" */
522 case XK_F12: /* "\033[24~" */ 506 case XK_F12: /* "\033[24~" */
523 case XK_F13: /* "\033[25~" */ 507 case XK_F13: /* "\033[25~" */
524 case XK_F14: /* "\033[26~" */ 508 case XK_F14: /* "\033[26~" */
525 FKEY(23, XK_F11); 509 FKEY (23, XK_F11);
526 break; 510 break;
527 case XK_F15: /* "\033[28~" */ 511 case XK_F15: /* "\033[28~" */
528 case XK_F16: /* "\033[29~" */ 512 case XK_F16: /* "\033[29~" */
529 FKEY(28, XK_F15); 513 FKEY (28, XK_F15);
530 break; 514 break;
531 case XK_Help: /* "\033[28~" */ 515 case XK_Help: /* "\033[28~" */
532 FKEY(28, XK_Help); 516 FKEY (28, XK_Help);
533 break; 517 break;
534 case XK_Menu: /* "\033[29~" */ 518 case XK_Menu: /* "\033[29~" */
535 FKEY(29, XK_Menu); 519 FKEY (29, XK_Menu);
536 break; 520 break;
537 case XK_F17: /* "\033[31~" */ 521 case XK_F17: /* "\033[31~" */
538 case XK_F18: /* "\033[32~" */ 522 case XK_F18: /* "\033[32~" */
539 case XK_F19: /* "\033[33~" */ 523 case XK_F19: /* "\033[33~" */
540 case XK_F20: /* "\033[34~" */ 524 case XK_F20: /* "\033[34~" */
541 case XK_F21: /* "\033[35~" */ 525 case XK_F21: /* "\033[35~" */
542 case XK_F22: /* "\033[36~" */ 526 case XK_F22: /* "\033[36~" */
543 case XK_F23: /* "\033[37~" */ 527 case XK_F23: /* "\033[37~" */
544 case XK_F24: /* "\033[38~" */ 528 case XK_F24: /* "\033[38~" */
545 case XK_F25: /* "\033[39~" */ 529 case XK_F25: /* "\033[39~" */
546 case XK_F26: /* "\033[40~" */ 530 case XK_F26: /* "\033[40~" */
547 case XK_F27: /* "\033[41~" */ 531 case XK_F27: /* "\033[41~" */
548 case XK_F28: /* "\033[42~" */ 532 case XK_F28: /* "\033[42~" */
549 case XK_F29: /* "\033[43~" */ 533 case XK_F29: /* "\033[43~" */
550 case XK_F30: /* "\033[44~" */ 534 case XK_F30: /* "\033[44~" */
551 case XK_F31: /* "\033[45~" */ 535 case XK_F31: /* "\033[45~" */
552 case XK_F32: /* "\033[46~" */ 536 case XK_F32: /* "\033[46~" */
553 case XK_F33: /* "\033[47~" */ 537 case XK_F33: /* "\033[47~" */
554 case XK_F34: /* "\033[48~" */ 538 case XK_F34: /* "\033[48~" */
555 case XK_F35: /* "\033[49~" */ 539 case XK_F35: /* "\033[49~" */
556 FKEY(31, XK_F17); 540 FKEY (31, XK_F17);
557 break; 541 break;
558#undef FKEY 542#undef FKEY
559 default: 543 default:
560 newlen = 0; 544 newlen = 0;
561 break; 545 break;
562 } 546 }
563 if (newlen) 547 if (newlen)
564 len = STRLEN(kbuf); 548 len = STRLEN (kbuf);
565 } 549 }
566 /* 550 /*
567 * Pass meta for all function keys, if 'meta' option set 551 * Pass meta for all function keys, if 'meta' option set
568 */ 552 */
569#ifdef META8_OPTION 553#ifdef META8_OPTION
570 if (meta && (meta_char == 0x80) && len > 0) 554 if (meta && (meta_char == 0x80) && len > 0)
571 kbuf[len - 1] |= 0x80; 555 kbuf[len - 1] |= 0x80;
572#endif 556#endif
557
558 }
573 } else if (ctrl && keysym == XK_minus) { 559 else if (ctrl && keysym == XK_minus)
560 {
574 len = 1; 561 len = 1;
575 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
576 } else { 563 }
564 else
565 {
577#ifdef META8_OPTION 566#ifdef META8_OPTION
578 /* set 8-bit on */ 567 /* set 8-bit on */
579 if (meta && (meta_char == 0x80)) { 568 if (meta && (meta_char == 0x80))
580 unsigned char *ch; 569 {
570 unsigned char *ch;
581 571
582 for (ch = kbuf; ch < kbuf + len; ch++) 572 for (ch = kbuf; ch < kbuf + len; ch++)
583 *ch |= 0x80; 573 *ch |= 0x80;
584 meta = 0; 574 meta = 0;
575 }
576#endif
577 /* nil */ ;
578 }
585 } 579 }
586#endif 580
587#ifdef GREEK_SUPPORT 581 if (len <= 0)
588 if (greek_mode) 582 return; /* not mapped */
589 len = greek_xlat(kbuf, len); 583
590#endif 584 if (Options & Opt_scrollTtyKeypress)
591 /* nil */ ; 585 if (TermWin.view_start)
592 } 586 {
587 TermWin.view_start = 0;
588 want_refresh = 1;
593 } 589 }
594 590
595 if (len <= 0) 591 /*
596 return; /* not mapped */
597
598 if (Options & Opt_scrollTtyKeypress)
599 if (TermWin.view_start) {
600 TermWin.view_start = 0;
601 want_refresh = 1;
602 }
603
604/*
605 * these modifications only affect the static keybuffer 592 * these modifications only affect the static keybuffer
606 * pass Shift/Control indicators for function keys ending with `~' 593 * pass Shift/Control indicators for function keys ending with `~'
607 * 594 *
608 * eg, 595 * eg,
609 * Prior = "ESC[5~" 596 * Prior = "ESC[5~"
610 * Shift+Prior = "ESC[5$" 597 * Shift+Prior = "ESC[5$"
611 * Ctrl+Prior = "ESC[5^" 598 * Ctrl+Prior = "ESC[5^"
612 * Ctrl+Shift+Prior = "ESC[5@" 599 * Ctrl+Shift+Prior = "ESC[5@"
613 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 600 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
614 */ 601 */
615 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 602 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
616 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
617 604
618/* escape prefix */ 605 /* escape prefix */
619 if (meta 606 if (meta
620#ifdef META8_OPTION 607#ifdef META8_OPTION
621 && (meta_char == C0_ESC) 608 && meta_char == C0_ESC
622#endif 609#endif
623 ) { 610 )
611 {
624 const unsigned char ch = C0_ESC; 612 const unsigned char ch = C0_ESC;
625
626 tt_write(&ch, 1); 613 tt_write (&ch, 1);
627 } 614 }
615
628#ifdef DEBUG_CMD 616#if defined(DEBUG_CMD)
629 if (debug_key) { /* Display keyboard buffer contents */ 617 /* Display keyboard buffer contents */
630 char *p; 618 unsigned char *p;
631 int i; 619 int i;
632 620
633 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 621 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
634 for (i = 0, p = kbuf; i < len; i++, p++) 622 for (i = 0, p = kbuf; i < len; i++, p++)
635 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 623 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
636 fprintf(stderr, "'\n"); 624 fprintf (stderr, "'\n");
637 }
638#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
639 tt_write (kbuf, (unsigned int)len); 626 tt_write (kbuf, (unsigned int)len);
640} 627}
641/*}}} */ 628/*}}} */
642 629
643#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
644/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
645/* attempt to `write' count to the input buffer */ 632/* attempt to `write' count to the input buffer */
646unsigned int 633unsigned int
647rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 634rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
648{ 635{
649 unsigned int n, s; 636 unsigned int n, s;
650 637
651 n = cmdbuf_ptr - cmdbuf_base; 638 n = cmdbuf_ptr - cmdbuf_base;
652 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
640
653 if (n > 0 && s < count) { 641 if (n > 0 && s < count)
642 {
654 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 643 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
655 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
656 cmdbuf_ptr = cmdbuf_base; 645 cmdbuf_ptr = cmdbuf_base;
657 cmdbuf_endp -= n; 646 cmdbuf_endp -= n;
658 s += n; 647 s += n;
659 } 648 }
649
660 if (count > s) { 650 if (count > s)
651 {
661 rxvt_print_error("data loss: cmd_write too large"); 652 rxvt_print_error ("data loss: cmd_write too large");
662 count = s; 653 count = s;
663 } 654 }
655
664 for (; count--;) 656 for (; count--;)
665 *cmdbuf_endp++ = *str++; 657 *cmdbuf_endp++ = *str++;
658
659 cmd_parse ();
660
666 return 0; 661 return 0;
667} 662}
668#endif /* MENUBAR_MAX */ 663#endif /* MENUBAR_MAX */
669 664
670void 665void
671rxvt_term::flush () 666rxvt_term::flush ()
… …
685 scr_refresh (refresh_type); 680 scr_refresh (refresh_type);
686 scrollbar_show (1); 681 scrollbar_show (1);
687#ifdef USE_XIM 682#ifdef USE_XIM
688 IMSendSpot (); 683 IMSendSpot ();
689#endif 684#endif
690 }
691 685
692 XFlush (Xdisplay); 686 }
687
688 display->flush ();
693} 689}
694 690
695void 691void
696rxvt_term::check_cb (check_watcher &w) 692rxvt_term::check_cb (check_watcher &w)
697{ 693{
698 SET_R (this); 694 SET_R (this);
699 SET_LOCALE (locale); 695 SET_LOCALE (locale);
700 696
701 flush (); 697 flush ();
702}
703
704void
705rxvt_term::process_x_events ()
706{
707 do
708 {
709 XEvent xev;
710
711 XNextEvent (Xdisplay, &xev);
712
713#if defined(CURSOR_BLINK)
714 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
715 {
716 if (hidden_cursor)
717 {
718 hidden_cursor = 0;
719 want_refresh = 1;
720 }
721
722 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
723 }
724#endif
725
726#if defined(POINTER_BLANK)
727 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
728 {
729 if (xev.type == MotionNotify
730 || xev.type == ButtonPress
731 || xev.type == ButtonRelease)
732 if (hidden_pointer)
733 pointer_unblank ();
734
735 if (xev.type == KeyPress && hidden_pointer == 0)
736 pointer_blank ();
737 }
738#endif
739
740#ifdef USE_XIM
741 if (!XFilterEvent (&xev, xev.xany.window))
742#endif
743 process_x_event (&xev);
744 }
745 while (XPending (Xdisplay));
746} 698}
747 699
748#ifdef CURSOR_BLINK 700#ifdef CURSOR_BLINK
749void 701void
750rxvt_term::cursor_blink_cb (time_watcher &w) 702rxvt_term::cursor_blink_cb (time_watcher &w)
… …
767 w.start (w.at + TEXT_BLINK_INTERVAL); 719 w.start (w.at + TEXT_BLINK_INTERVAL);
768 } 720 }
769} 721}
770#endif 722#endif
771 723
772void
773rxvt_term::x_cb (io_watcher &w, short revents)
774{
775 SET_R (this);
776 SET_LOCALE (locale);
777
778 process_x_events ();
779}
780
781bool 724bool
782rxvt_term::pty_fill () 725rxvt_term::pty_fill ()
783{ 726{
784 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 727 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
785 728
786 memmove (cmdbuf_base, cmdbuf_ptr, n); 729 memmove (cmdbuf_base, cmdbuf_ptr, n);
787 cmdbuf_ptr = cmdbuf_base; 730 cmdbuf_ptr = cmdbuf_base;
788 cmdbuf_endp = cmdbuf_ptr + n; 731 cmdbuf_endp = cmdbuf_ptr + n;
789 732
790 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
791 734
792 if (n > 0) 735 if (n > 0)
793 { 736 {
794 cmdbuf_endp += n; 737 cmdbuf_endp += n;
795 return true; 738 return true;
796 } 739 }
797 else if (n < 0 && errno != EAGAIN) 740 else if (n < 0 && errno != EAGAIN)
798 destroy (); 741 destroy ();
799 742
800 return false; 743 return false;
801} 744}
802 745
803void 746void
804rxvt_term::pty_cb (io_watcher &w, short revents) 747rxvt_term::pty_cb (io_watcher &w, short revents)
… …
821 seen_input = 1; 764 seen_input = 1;
822 /* once we know the shell is running, send the screen size. Again! */ 765 /* once we know the shell is running, send the screen size. Again! */
823 tt_winch (); 766 tt_winch ();
824 } 767 }
825 768
769 if (cmd_parse ())
770 break;
771 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
826 uint32_t ch = NOCHAR; 779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
827 798
828 for (;;) 799 for (;;)
829 { 800 {
830 if (ch == NOCHAR)
831 ch = next_char (); 801 ch = next_char ();
832 802
833 if (ch == NOCHAR) // TODO: improve 803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
834 break; 804 break;
835 805 else
836 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
837 { 806 {
838 /* Read a text string from the input buffer */
839 uint32_t buf[BUFSIZ];
840 bool refreshnow = false;
841 int nlines = 0;
842 uint32_t *str = buf;
843
844 *str++ = ch; 807 *str++ = ch;
845 808
846 for (;;) 809 if (ch == '\n')
847 { 810 {
848 ch = next_char ();
849
850 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
851 break;
852 else 811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
853 { 816 {
854 *str++ = ch;
855
856 if (ch == '\n')
857 {
858 nlines++;
859 refresh_count++;
860
861 if (!(Options & Opt_jumpScroll)
862 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
863 {
864 refreshnow = true; 817 refreshnow = true;
865 flag = false; 818 flag = false;
866 ch = NOCHAR;
867 break;
868 }
869 }
870
871 if (str >= buf + BUFSIZ)
872 {
873 ch = NOCHAR; 819 ch = NOCHAR;
874 break; 820 break;
875 } 821 }
822
823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
824 if (nlines >= TermWin.nrow - 1)
825 {
826 scr_add_lines (buf, nlines, str - buf);
827 nlines = 0;
828 str = buf;
876 } 829 }
877 } 830 }
878 831
879 scr_add_lines (buf, nlines, str - buf); 832 if (str >= buf + BUFSIZ)
880
881 /*
882 * If there have been a lot of new lines, then update the screen
883 * What the heck I'll cheat and only refresh less than every page-full.
884 * the number of pages between refreshes is refresh_limit, which
885 * is incremented here because we must be doing flat-out scrolling.
886 *
887 * refreshing should be correct for small scrolls, because of the
888 * time-out
889 */
890 if (refreshnow)
891 { 833 {
892 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 834 ch = NOCHAR;
893 refresh_limit++; 835 break;
894
895 scr_refresh (refresh_type);
896 } 836 }
897
898 }
899 else
900 {
901 switch (ch)
902 {
903 default:
904 process_nonprinting (ch);
905 break;
906 case C0_ESC: /* escape char */
907 process_escape_seq ();
908 break;
909 /*case 0x9b: */ /* CSI */
910 /* process_csi_seq (); */
911 }
912
913 ch = NOCHAR;
914 } 837 }
915 } 838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
916 } 861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
917 } 876 }
877
878 return flag;
918} 879}
919 880
920// read the next character, currently handles UTF-8 881// read the next character, currently handles UTF-8
921// will probably handle all sorts of other stuff in the future 882// will probably handle all sorts of other stuff in the future
922uint32_t 883uint32_t
923rxvt_term::next_char () 884rxvt_term::next_char ()
924{ 885{
925 while (cmdbuf_ptr < cmdbuf_endp) 886 while (cmdbuf_ptr < cmdbuf_endp)
926 { 887 {
927 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
890 || !*cmdbuf_ptr)
928 return *cmdbuf_ptr++; 891 return *cmdbuf_ptr++;
929 892
930 wchar_t wc; 893 wchar_t wc;
931 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
932 895
933 if (len == (size_t)-2) 896 if (len == (size_t)-2)
934 return NOCHAR; 897 {
898 // the mbstate stores incomplete sequences. didn't know this :/
899 cmdbuf_ptr = cmdbuf_endp;
900 break;
901 }
935 902
936 if (len == (size_t)-1) 903 if (len == (size_t)-1)
937 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
938 905
939 // assume wchar == unicode 906 // assume wchar == unicode
… …
942 } 909 }
943 910
944 return NOCHAR; 911 return NOCHAR;
945} 912}
946 913
947/* rxvt_cmd_getc() - Return next input character */ 914/* rxvt_cmd_getc () - Return next input character */
948/* 915/*
949 * Return the next input character after first passing any keyboard input 916 * Return the next input character after first passing any keyboard input
950 * to the command. 917 * to the command.
951 */ 918 */
952uint32_t 919uint32_t
… …
962 // would be preferred. either setjmp/longjmp or better design. 929 // would be preferred. either setjmp/longjmp or better design.
963 fcntl (cmd_fd, F_SETFL, 0); 930 fcntl (cmd_fd, F_SETFL, 0);
964 pty_fill (); 931 pty_fill ();
965 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
966 } 933 }
967
968#if 0
969#define TIMEOUT_USEC 5000
970 fd_set readfds;
971 int quick_timeout, select_res;
972 int want_motion_time, want_keypress_time;
973 struct timeval value;
974#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
975 struct timeval tp;
976#endif
977
978 for (;;) {
979 /* loop until we can return something */
980
981 if (v_bufstr < v_bufptr) /* output any pending chars */
982 tt_write(NULL, 0);
983
984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
985 if (mouse_slip_wheel_speed) {
986 quick_timeout = 1;
987 if (!mouse_slip_wheel_delay--
988 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
989 abs(mouse_slip_wheel_speed))) {
990 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
991 refresh_type |= SMOOTH_REFRESH;
992 want_refresh = 1;
993 }
994 }
995#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
996#ifdef SELECTION_SCROLLING
997 if (pending_scroll_selection) {
998 quick_timeout = 1;
999 if (!scroll_selection_delay--
1000 && scr_page (scroll_selection_dir,
1001 scroll_selection_lines)) {
1002 selection_extend (selection_save_x,
1003 selection_save_y, selection_save_state);
1004 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1005 refresh_type |= SMOOTH_REFRESH;
1006 want_refresh = 1;
1007 }
1008 }
1009#endif
1010#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1011 if (scrollbar_isUp() || scrollbar_isDn()) {
1012 quick_timeout = 1;
1013 if (!scroll_arrow_delay--
1014 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1015 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1;
1018 }
1019 }
1020#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1021
1022#ifdef TRANSPARENT
1023 quick_timeout |= want_full_refresh;
1024#endif
1025#endif
1026} 934}
1027 935
1028#ifdef POINTER_BLANK 936#ifdef POINTER_BLANK
1029void 937void
1030rxvt_term::pointer_unblank () 938rxvt_term::pointer_unblank ()
1031{ 939{
1032 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 940 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1033 recolour_cursor (); 941 recolour_cursor ();
1034 942
1035 hidden_pointer = 0; 943 hidden_pointer = 0;
1036 944
1037 if (Options & Opt_pointerBlank) 945 if (Options & Opt_pointerBlank)
… …
1039} 947}
1040 948
1041void 949void
1042rxvt_term::pointer_blank () 950rxvt_term::pointer_blank ()
1043{ 951{
1044 if (!(Options & Opt_pointerBlank)) 952 if (! (Options & Opt_pointerBlank))
1045 return; 953 return;
1046 954
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 955 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 956 XFlush (display->display);
1049 957
1050 hidden_pointer = 1; 958 hidden_pointer = 1;
1051} 959}
1052 960
1053void 961void
… …
1059 pointer_blank (); 967 pointer_blank ();
1060} 968}
1061#endif 969#endif
1062 970
1063void 971void
1064rxvt_term::mouse_report (const XButtonEvent *ev) 972rxvt_term::mouse_report (XButtonEvent &ev)
1065{ 973{
1066 int button_number, key_state = 0; 974 int button_number, key_state = 0;
1067 int x, y; 975 int x, y;
1068 976
1069 x = ev->x; 977 x = ev.x;
1070 y = ev->y; 978 y = ev.y;
1071 pixel_position (&x, &y); 979 pixel_position (&x, &y);
1072 980
1073 if (MEvent.button == AnyButton) { 981 if (MEvent.button == AnyButton)
982 {
1074 button_number = 3; 983 button_number = 3;
1075 } else { 984 }
985 else
986 {
1076 button_number = MEvent.button - Button1; 987 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 988 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 989 if (button_number >= 3)
1079 button_number += (64 - 3); 990 button_number += (64 - 3);
1080 } 991 }
1081 992
1082 if (PrivateModes & PrivMode_MouseX10) { 993 if (PrivateModes & PrivMode_MouseX10)
994 {
1083 /* 995 /*
1084 * do not report ButtonRelease 996 * do not report ButtonRelease
1085 * no state info allowed 997 * no state info allowed
1086 */ 998 */
1087 key_state = 0; 999 key_state = 0;
1088 if (button_number == 3) 1000 if (button_number == 3)
1089 return; 1001 return;
1090 } else { 1002 }
1003 else
1004 {
1091 /* XTerm mouse reporting needs these values: 1005 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 1006 * 4 = Shift
1093 * 8 = Meta 1007 * 8 = Meta
1094 * 16 = Control 1008 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1009 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1010 * 32 = Double Click
1097 */ 1011 */
1098 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1012 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1013 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((MEvent.state & ControlMask) ? 16 : 0); 1014 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1015#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1016 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1017#endif
1018
1104 } 1019 }
1105 1020
1106#ifdef DEBUG_MOUSEREPORT 1021#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1022 fprintf (stderr, "Mouse [");
1108 if (key_state & 16) 1023 if (key_state & 16)
1109 fputc('C', stderr); 1024 fputc ('C', stderr);
1110 if (key_state & 4) 1025 if (key_state & 4)
1111 fputc('S', stderr); 1026 fputc ('S', stderr);
1112 if (key_state & 8) 1027 if (key_state & 8)
1113 fputc('A', stderr); 1028 fputc ('A', stderr);
1114 if (key_state & 32) 1029 if (key_state & 32)
1115 fputc('2', stderr); 1030 fputc ('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1031 fprintf (stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1032 button_number,
1118 x + 1, 1033 x + 1,
1119 y + 1); 1034 y + 1);
1120#else 1035#else
1121 tt_printf("\033[M%c%c%c", 1036 tt_printf ("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1037 (32 + button_number + key_state),
1123 (32 + x + 1), 1038 (32 + x + 1),
1124 (32 + y + 1)); 1039 (32 + y + 1));
1125#endif 1040#endif
1126} 1041}
1127 1042
1128#ifdef USING_W11LIB 1043#ifdef USING_W11LIB
1129void 1044void
1130rxvt_W11_process_x_event(XEvent *ev) 1045rxvt_W11_process_x_event (XEvent *ev)
1131{ 1046{
1132 rxvt_t *r = rxvt_get_r(); 1047 rxvt_t *r = rxvt_get_r ();
1133 1048
1134 process_x_event (ev); 1049 x_cb (*ev);
1135} 1050}
1136#endif 1051#endif
1137 1052
1138/*{{{ process an X event */ 1053/*{{{ process an X event */
1139void 1054void
1140rxvt_term::process_x_event (XEvent *ev) 1055rxvt_term::x_cb (XEvent &ev)
1141{ 1056{
1057 SET_R (this);
1058 SET_LOCALE (locale);
1059
1060#if defined(CURSOR_BLINK)
1061 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1062 {
1063 if (hidden_cursor)
1064 {
1065 hidden_cursor = 0;
1066 want_refresh = 1;
1067 }
1068
1069 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1070 }
1071#endif
1072
1073#if defined(POINTER_BLANK)
1074 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1075 {
1076 if (ev.type == MotionNotify
1077 || ev.type == ButtonPress
1078 || ev.type == ButtonRelease)
1079 if (hidden_pointer)
1080 pointer_unblank ();
1081
1082 if (ev.type == KeyPress && hidden_pointer == 0)
1083 pointer_blank ();
1084 }
1085#endif
1086
1087#ifdef USE_XIM
1088 if (XFilterEvent (&ev, None))
1089 return;
1090#endif
1091
1142 Window unused_root, unused_child; 1092 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1093 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1094 unsigned int unused_mask;
1145 1095
1146#ifdef DEBUG_X 1096#ifdef DEBUG_X
1147 const char *const eventnames[] = 1097 const char *const eventnames[] =
1148 { /* mason - this matches my system */ 1098 { /* mason - this matches my system */
1149 "", 1099 "",
1150 "", 1100 "",
1151 "KeyPress", 1101 "KeyPress",
1152 "KeyRelease", 1102 "KeyRelease",
1153 "ButtonPress", 1103 "ButtonPress",
1154 "ButtonRelease", 1104 "ButtonRelease",
1155 "MotionNotify", 1105 "MotionNotify",
1156 "EnterNotify", 1106 "EnterNotify",
1157 "LeaveNotify", 1107 "LeaveNotify",
1158 "FocusIn", 1108 "FocusIn",
1159 "FocusOut", 1109 "FocusOut",
1160 "KeymapNotify", 1110 "KeymapNotify",
1161 "Expose", 1111 "Expose",
1162 "GraphicsExpose", 1112 "GraphicsExpose",
1163 "NoExpose", 1113 "NoExpose",
1164 "VisibilityNotify", 1114 "VisibilityNotify",
1165 "CreateNotify", 1115 "CreateNotify",
1166 "DestroyNotify", 1116 "DestroyNotify",
1167 "UnmapNotify", 1117 "UnmapNotify",
1168 "MapNotify", 1118 "MapNotify",
1169 "MapRequest", 1119 "MapRequest",
1170 "ReparentNotify", 1120 "ReparentNotify",
1171 "ConfigureNotify", 1121 "ConfigureNotify",
1172 "ConfigureRequest", 1122 "ConfigureRequest",
1173 "GravityNotify", 1123 "GravityNotify",
1174 "ResizeRequest", 1124 "ResizeRequest",
1175 "CirculateNotify", 1125 "CirculateNotify",
1176 "CirculateRequest", 1126 "CirculateRequest",
1177 "PropertyNotify", 1127 "PropertyNotify",
1178 "SelectionClear", 1128 "SelectionClear",
1179 "SelectionRequest", 1129 "SelectionRequest",
1180 "SelectionNotify", 1130 "SelectionNotify",
1181 "ColormapNotify", 1131 "ColormapNotify",
1182 "ClientMessage", 1132 "ClientMessage",
1183 "MappingNotify" 1133 "MappingNotify"
1184 }; 1134 };
1185#endif 1135#endif
1186 1136
1187#ifdef DEBUG_X 1137#ifdef DEBUG_X
1188 struct timeval tp; 1138 struct timeval tp;
1189 struct tm *ltt; 1139 struct tm *ltt;
1190 (void)gettimeofday(&tp, NULL); 1140 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime(&(tp.tv_sec)); 1141 ltt = localtime (& (tp.tv_sec));
1192 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)); 1142 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));
1193#endif 1143#endif
1194 1144
1195 switch (ev->type) { 1145 switch (ev.type)
1146 {
1196 case KeyPress: 1147 case KeyPress:
1197 lookup_key ((XKeyEvent *)ev); 1148 lookup_key (ev.xkey);
1198 break; 1149 break;
1199 1150
1200#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1201 case KeyRelease: 1152 case KeyRelease:
1202 { 1153 {
1203 if (!(ev->xkey.state & ControlMask)) 1154 if (! (ev.xkey.state & ControlMask))
1204 mouse_slip_wheel_speed = 0;
1205 else {
1206 KeySym ks;
1207
1208 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1209 if (ks == XK_Control_L || ks == XK_Control_R)
1210 mouse_slip_wheel_speed = 0; 1155 mouse_slip_wheel_speed = 0;
1211 } 1156 else
1212 break; 1157 {
1213 } 1158 KeySym ks;
1214#endif
1215 1159
1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1161 if (ks == XK_Control_L || ks == XK_Control_R)
1162 mouse_slip_wheel_speed = 0;
1163 }
1164 break;
1165 }
1166#endif
1167
1216 case ButtonPress: 1168 case ButtonPress:
1217 button_press ((XButtonEvent *)ev); 1169 button_press (ev.xbutton);
1218 break; 1170 break;
1219 1171
1220 case ButtonRelease: 1172 case ButtonRelease:
1221 button_release ((XButtonEvent *)ev); 1173 button_release (ev.xbutton);
1222 break; 1174 break;
1223 1175
1224 case ClientMessage: 1176 case ClientMessage:
1225 if (ev->xclient.format == 32 1177 if (ev.xclient.format == 32
1226 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1178 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1227 destroy (); 1179 destroy ();
1228#ifdef OFFIX_DND 1180#ifdef OFFIX_DND
1229 /* OffiX Dnd (drag 'n' drop) protocol */ 1181 /* OffiX Dnd (drag 'n' drop) protocol */
1230 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1182 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1231 && (ev->xclient.data.l[0] == DndFile 1183 && (ev.xclient.data.l[0] == DndFile
1232 || ev->xclient.data.l[0] == DndDir 1184 || ev.xclient.data.l[0] == DndDir
1233 || ev->xclient.data.l[0] == DndLink)) { 1185 || ev.xclient.data.l[0] == DndLink))
1234 /* Get Dnd data */ 1186 {
1187 /* Get Dnd data */
1235 Atom ActualType; 1188 Atom ActualType;
1236 int ActualFormat; 1189 int ActualFormat;
1237 unsigned char *data; 1190 unsigned char *data;
1238 unsigned long Size, RemainingBytes; 1191 unsigned long Size, RemainingBytes;
1239 1192
1240 XGetWindowProperty(Xdisplay, Xroot, 1193 XGetWindowProperty (display->display, display->root,
1241 xa[XA_DNDSELECTION], 1194 xa[XA_DNDSELECTION],
1242 0L, 1000000L, 1195 0L, 1000000L,
1243 False, AnyPropertyType, 1196 False, AnyPropertyType,
1244 &ActualType, &ActualFormat, 1197 &ActualType, &ActualFormat,
1245 &Size, &RemainingBytes, 1198 &Size, &RemainingBytes,
1246 &data); 1199 &data);
1247 XChangeProperty(Xdisplay, Xroot, 1200 XChangeProperty (display->display, display->root,
1248 XA_CUT_BUFFER0, XA_STRING, 1201 XA_CUT_BUFFER0, XA_STRING,
1249 8, PropModeReplace, 1202 8, PropModeReplace,
1250 data, STRLEN(data)); 1203 data, STRLEN (data));
1251 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1204 selection_paste (display->root, XA_CUT_BUFFER0, True);
1252 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1253 } 1206 }
1254#endif /* OFFIX_DND */ 1207#endif /* OFFIX_DND */
1255 break; 1208 break;
1256 1209
1257 case MappingNotify: 1210 case MappingNotify:
1258 XRefreshKeyboardMapping(&(ev->xmapping)); 1211 XRefreshKeyboardMapping (& (ev.xmapping));
1259 break; 1212 break;
1260 1213
1261 /* 1214 /*
1262 * XXX: this is not the _current_ arrangement 1215 * XXX: this is not the _current_ arrangement
1263 * Here's my conclusion: 1216 * Here's my conclusion:
1264 * If the window is completely unobscured, use bitblt's 1217 * If the window is completely unobscured, use bitblt's
1265 * to scroll. Even then, they're only used when doing partial 1218 * to scroll. Even then, they're only used when doing partial
1266 * screen scrolling. When partially obscured, we have to fill 1219 * screen scrolling. When partially obscured, we have to fill
1267 * in the GraphicsExpose parts, which means that after each refresh, 1220 * in the GraphicsExpose parts, which means that after each refresh,
1268 * we need to wait for the graphics expose or Noexpose events, 1221 * we need to wait for the graphics expose or Noexpose events,
1269 * which ought to make things real slow! 1222 * which ought to make things real slow!
1270 */ 1223 */
1271 case VisibilityNotify: 1224 case VisibilityNotify:
1272 switch (ev->xvisibility.state) 1225 switch (ev.xvisibility.state)
1273 { 1226 {
1274 case VisibilityUnobscured: 1227 case VisibilityUnobscured:
1275 refresh_type = FAST_REFRESH; 1228 refresh_type = FAST_REFRESH;
1276 break; 1229 break;
1277 case VisibilityPartiallyObscured: 1230 case VisibilityPartiallyObscured:
… …
1279 break; 1232 break;
1280 default: 1233 default:
1281 refresh_type = NO_REFRESH; 1234 refresh_type = NO_REFRESH;
1282 break; 1235 break;
1283 } 1236 }
1284 break; 1237 break;
1285 1238
1286 case FocusIn: 1239 case FocusIn:
1287 if (!TermWin.focus) { 1240 if (!TermWin.focus)
1241 {
1288 TermWin.focus = 1; 1242 TermWin.focus = 1;
1289 want_refresh = 1; 1243 want_refresh = 1;
1290#ifdef USE_XIM 1244#ifdef USE_XIM
1291 if (Input_Context != NULL) 1245 if (Input_Context != NULL)
1292 XSetICFocus(Input_Context); 1246 XSetICFocus (Input_Context);
1293#endif 1247#endif
1294#ifdef CURSOR_BLINK 1248#ifdef CURSOR_BLINK
1295 if (Options & Opt_cursorBlink) 1249 if (Options & Opt_cursorBlink)
1296 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1297#endif 1251#endif
1298 }
1299 break;
1300 1252
1253 }
1254 break;
1255
1301 case FocusOut: 1256 case FocusOut:
1302 if (TermWin.focus) { 1257 if (TermWin.focus)
1258 {
1303 TermWin.focus = 0; 1259 TermWin.focus = 0;
1304 want_refresh = 1; 1260 want_refresh = 1;
1305#ifdef USE_XIM 1261#ifdef USE_XIM
1306 if (Input_Context != NULL) 1262 if (Input_Context != NULL)
1307 XUnsetICFocus(Input_Context); 1263 XUnsetICFocus (Input_Context);
1308#endif 1264#endif
1309#ifdef CURSOR_BLINK 1265#ifdef CURSOR_BLINK
1310 if (Options & Opt_cursorBlink) 1266 if (Options & Opt_cursorBlink)
1311 cursor_blink_ev.stop (); 1267 cursor_blink_ev.stop ();
1312 hidden_cursor = 0; 1268 hidden_cursor = 0;
1313#endif 1269#endif
1314 }
1315 break;
1316 1270
1271 }
1272 break;
1273
1317 case ConfigureNotify: 1274 case ConfigureNotify:
1318 if (ev->xconfigure.window == TermWin.parent[0]) { 1275 if (ev.xconfigure.window == TermWin.parent[0])
1319 int height, width; 1276 {
1277 int height, width;
1320 1278
1279 do
1321 do { /* Wrap lots of configures into one */ 1280 { /* Wrap lots of configures into one */
1322 width = ev->xconfigure.width; 1281 width = ev.xconfigure.width;
1323 height = ev->xconfigure.height; 1282 height = ev.xconfigure.height;
1324 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1325 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1284 }
1326 ConfigureNotify, ev)); 1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286
1327 if (szHint.width != width || szHint.height != height) { 1287 if (szHint.width != width || szHint.height != height)
1288 {
1328 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1329 resize_all_windows (width, height, 1); 1290 resize_all_windows (width, height, 1);
1330 } 1291 }
1331#ifdef DEBUG_SIZE 1292#ifdef DEBUG_SIZE
1332 else { 1293 else
1294 {
1333 D_SIZE((stderr, "Size: Not resizing")); 1295 D_SIZE ((stderr, "Size: Not resizing"));
1334 } 1296 }
1335#endif 1297#endif
1336#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1337 if (Options & Opt_transparent) { 1299 if (Options & Opt_transparent)
1338 check_our_parents (); 1300 {
1339 if (am_transparent) 1301 check_our_parents ();
1302 if (am_transparent)
1340 want_full_refresh = 1; 1303 want_full_refresh = 1;
1341 } 1304 }
1342#endif 1305#endif
1343 }
1344 break;
1345 1306
1307 }
1308 break;
1309
1346 case SelectionClear: 1310 case SelectionClear:
1347 selection_clear (); 1311 display->set_selection_owner (0);
1348 break; 1312 break;
1349 1313
1350 case SelectionNotify: 1314 case SelectionNotify:
1351 if (selection_wait == Sel_normal) 1315 if (selection_wait == Sel_normal)
1352 selection_paste (ev->xselection.requestor, 1316 selection_paste (ev.xselection.requestor,
1353 ev->xselection.property, True); 1317 ev.xselection.property, True);
1354 break; 1318 break;
1355 1319
1356 case SelectionRequest: 1320 case SelectionRequest:
1357 selection_send (&(ev->xselectionrequest)); 1321 selection_send (ev.xselectionrequest);
1358 break; 1322 break;
1359 1323
1360 case UnmapNotify: 1324 case UnmapNotify:
1361 TermWin.mapped = 0; 1325 TermWin.mapped = 0;
1362#ifdef TEXT_BLINK 1326#ifdef TEXT_BLINK
1363 text_blink_ev.stop (); 1327 text_blink_ev.stop ();
1364#endif 1328#endif
1365 break; 1329 break;
1366 1330
1367 case MapNotify: 1331 case MapNotify:
1368 TermWin.mapped = 1; 1332 TermWin.mapped = 1;
1369#ifdef TEXT_BLINK 1333#ifdef TEXT_BLINK
1370 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371#endif 1335#endif
1372 break;
1373
1374 case PropertyNotify:
1375 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1376 if (ev->xproperty.state == PropertyNewValue)
1377 selection_property (ev->xproperty.window,
1378 ev->xproperty.atom);
1379 break; 1336 break;
1380 } 1337
1381#ifdef TRANSPARENT 1338#ifdef TRANSPARENT
1382 /*
1383 * if user used some Esetroot compatible prog to set the root bg,
1384 * use the property to determine the pixmap. We use it later on.
1385 */
1386 if (xa[XA_XROOTPMAPID] == 0)
1387 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1388 "_XROOTPMAP_ID", False);
1389 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1390 break;
1391 /* FALLTHROUGH */
1392 case ReparentNotify: 1339 case ReparentNotify:
1393 if ((Options & Opt_transparent) && check_our_parents ()) { 1340 rootwin_cb (ev);
1394 if (am_transparent) 1341 break;
1395 want_full_refresh = 1;
1396 }
1397#endif /* TRANSPARENT */ 1342#endif /* TRANSPARENT */
1398 break;
1399 1343
1400 case GraphicsExpose: 1344 case GraphicsExpose:
1401 case Expose: 1345 case Expose:
1402 if (ev->xany.window == TermWin.vt) { 1346 if (ev.xany.window == TermWin.vt)
1347 {
1403#ifdef NO_SLOW_LINK_SUPPORT 1348#ifdef NO_SLOW_LINK_SUPPORT
1404 scr_expose (ev->xexpose.x, ev->xexpose.y, 1349 scr_expose (ev.xexpose.x, ev.xexpose.y,
1405 ev->xexpose.width, ev->xexpose.height, False); 1350 ev.xexpose.width, ev.xexpose.height, False);
1406#else 1351#else
1407 // don't understand this, so commented it out 1352 // don't understand this, so commented it out
1408 scr_expose (ev->xexpose.x, ev->xexpose.y, 1353 scr_expose (ev.xexpose.x, ev.xexpose.y,
1409 ev->xexpose.width, ev->xexpose.height, False); 1354 ev.xexpose.width, ev.xexpose.height, False);
1410 //scr_expose (ev->xexpose.x, 0, 1355 //scr_expose (ev.xexpose.x, 0,
1411 // ev->xexpose.width, TermWin.height, False); 1356 // ev.xexpose.width, TermWin.height, False);
1412#endif 1357#endif
1413 want_refresh = 1; 1358 want_refresh = 1;
1414 } else { 1359 }
1415 XEvent unused_xevent; 1360 else
1361 {
1362 XEvent unused_event;
1416 1363
1417 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1418 Expose, 1365 Expose,
1419 &unused_xevent)) ; 1366 &unused_event)) ;
1420 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1421 GraphicsExpose, 1368 GraphicsExpose,
1422 &unused_xevent)) ; 1369 &unused_event)) ;
1423 if (isScrollbarWindow(ev->xany.window)) { 1370 if (isScrollbarWindow (ev.xany.window))
1424 scrollBar.setIdle(); 1371 {
1425 scrollbar_show (0); 1372 scrollBar.setIdle ();
1426 } 1373 scrollbar_show (0);
1374 }
1427#ifdef MENUBAR 1375#ifdef MENUBAR
1428 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1429 menubar_expose (); 1377 menubar_expose ();
1430#endif 1378#endif
1431#ifdef RXVT_GRAPHICS 1379 }
1432 Gr_expose (ev->xany.window); 1380 break;
1433#endif
1434 }
1435 break;
1436 1381
1437 case MotionNotify: 1382 case MotionNotify:
1438#ifdef POINTER_BLANK 1383#ifdef POINTER_BLANK
1439 if (hidden_pointer) 1384 if (hidden_pointer)
1440 pointer_unblank (); 1385 pointer_unblank ();
1441#endif 1386#endif
1442#if MENUBAR 1387#if MENUBAR
1443 if (isMenuBarWindow(ev->xany.window)) { 1388 if (isMenuBarWindow (ev.xany.window))
1389 {
1444 menubar_control (&(ev->xbutton)); 1390 menubar_control (ev.xbutton);
1445 break; 1391 break;
1446 } 1392 }
1447#endif 1393#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1395 break;
1450 1396
1451 if (ev->xany.window == TermWin.vt) { 1397 if (ev.xany.window == TermWin.vt)
1398 {
1452 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1453 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1400 {
1454 MotionNotify, ev)) ; 1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1455 XQueryPointer(Xdisplay, TermWin.vt, 1402 ;
1456 &unused_root, &unused_child, 1403
1457 &unused_root_x, &unused_root_y, 1404 XQueryPointer (display->display, TermWin.vt,
1458 &(ev->xbutton.x), &(ev->xbutton.y), 1405 &unused_root, &unused_child,
1459 &unused_mask); 1406 &unused_root_x, &unused_root_y,
1407 & (ev.xbutton.x), & (ev.xbutton.y),
1408 &unused_mask);
1460#ifdef MOUSE_THRESHOLD 1409#ifdef MOUSE_THRESHOLD
1461 /* deal with a `jumpy' mouse */ 1410 /* deal with a `jumpy' mouse */
1462 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1412 {
1463#endif 1413#endif
1464 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1465 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1415 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1466#ifdef SELECTION_SCROLLING 1416#ifdef SELECTION_SCROLLING
1467 if (ev->xbutton.y < TermWin.int_bwidth 1417 if (ev.xbutton.y < TermWin.int_bwidth
1468 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1469 int dist;
1470
1471 pending_scroll_selection=1;
1472
1473 /* don't clobber the current delay if we are
1474 * already in the middle of scrolling.
1475 */
1476 if (scroll_selection_delay<=0)
1477 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1478
1479 /* save the event params so we can highlight
1480 * the selection in the pending-scroll loop
1481 */
1482 selection_save_x=ev->xbutton.x;
1483 selection_save_y=ev->xbutton.y;
1484 selection_save_state=
1485 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1486
1487 /* calc number of lines to scroll */
1488 if (ev->xbutton.y<TermWin.int_bwidth) {
1489 scroll_selection_dir = UP;
1490 dist = TermWin.int_bwidth - ev->xbutton.y;
1491 }
1492 else {
1493 scroll_selection_dir = DN;
1494 dist = ev->xbutton.y -
1495 (TermWin.int_bwidth + TermWin.height);
1496 }
1497 scroll_selection_lines=(Pixel2Height(dist)/
1498 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1499 MIN_IT(scroll_selection_lines,
1500 SELECTION_SCROLL_MAX_LINES);
1501 }
1502 else {
1503 /* we are within the text window, so we
1504 * shouldn't be scrolling
1505 */
1506 pending_scroll_selection = 0;
1507 }
1508#endif
1509#ifdef MOUSE_THRESHOLD
1510 }
1511#endif
1512 }
1513 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1514 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1515 MotionNotify, ev)) ;
1516 XQueryPointer(Xdisplay, scrollBar.win,
1517 &unused_root, &unused_child,
1518 &unused_root_x, &unused_root_y,
1519 &(ev->xbutton.x), &(ev->xbutton.y),
1520 &unused_mask);
1521 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1522 scrollbar_size());
1523 scr_refresh (refresh_type);
1524 refresh_limit = 0;
1525 scrollbar_show (1);
1526 }
1527 break;
1528 }
1529}
1530
1531void
1532rxvt_term::button_press (XButtonEvent *ev)
1533{
1534 int reportmode = 0, clickintime;
1535
1536 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1537 if (!bypass_keystate)
1538 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1539/*
1540 * VT window processing of button press
1541 */
1542 if (ev->window == TermWin.vt)
1543 {
1544#if RXVT_GRAPHICS
1545 if (ev->subwindow != None)
1546 rxvt_Gr_ButtonPress (ev->x, ev->y);
1547 else
1548#endif
1549 {
1550 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1551 if (reportmode)
1552 {
1553 /* mouse report from vt window */
1554 /* save the xbutton state (for ButtonRelease) */
1555 MEvent.state = ev->state;
1556#ifdef MOUSE_REPORT_DOUBLECLICK
1557 if (ev->button == MEvent.button && clickintime)
1558 {
1559 /* same button, within alloted time */
1560 MEvent.clicks++;
1561 if (MEvent.clicks > 1)
1562 { 1419 {
1563 /* only report double clicks */ 1420 int dist;
1564 MEvent.clicks = 2;
1565 mouse_report (ev);
1566 1421
1567 /* don't report the release */ 1422 pending_scroll_selection=1;
1568 MEvent.clicks = 0; 1423
1569 MEvent.button = AnyButton; 1424 /* don't clobber the current delay if we are
1570 } 1425 * already in the middle of scrolling.
1571 }
1572 else
1573 { 1426 */
1574 /* different button, or time expired */ 1427 if (scroll_selection_delay<=0)
1575 MEvent.clicks = 1; 1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1576 MEvent.button = ev->button; 1429
1577 mouse_report (ev); 1430 /* save the event params so we can highlight
1578 } 1431 * the selection in the pending-scroll loop
1579#else
1580 MEvent.button = ev->button;
1581 mouse_report (ev);
1582#endif /* MOUSE_REPORT_DOUBLECLICK */
1583 }
1584 else
1585 {
1586 if (ev->button != MEvent.button)
1587 MEvent.clicks = 0;
1588 switch (ev->button)
1589 { 1432 */
1590 case Button1: 1433 selection_save_x=ev.xbutton.x;
1591 /* allow shift+left click to extend selection */ 1434 selection_save_y=ev.xbutton.y;
1592 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1435 selection_save_state=
1436 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1437
1438 /* calc number of lines to scroll */
1439 if (ev.xbutton.y<TermWin.int_bwidth)
1593 { 1440 {
1594 if (MEvent.button == Button1 && clickintime) 1441 scroll_selection_dir = UP;
1595 selection_rotate (ev->x, ev->y); 1442 dist = TermWin.int_bwidth - ev.xbutton.y;
1596 else
1597 selection_extend (ev->x, ev->y, 1);
1598 } 1443 }
1599 else 1444 else
1600 { 1445 {
1601 if (MEvent.button == Button1 && clickintime) 1446 scroll_selection_dir = DN;
1602 MEvent.clicks++; 1447 dist = ev.xbutton.y -
1603 else 1448 (TermWin.int_bwidth + TermWin.height);
1604 MEvent.clicks = 1;
1605
1606 selection_click (MEvent.clicks, ev->x, ev->y);
1607 } 1449 }
1450 scroll_selection_lines= (Pixel2Height (dist)/
1451 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1452 MIN_IT (scroll_selection_lines,
1453 SELECTION_SCROLL_MAX_LINES);
1454 }
1455 else
1456 {
1457 /* we are within the text window, so we
1458 * shouldn't be scrolling
1459 */
1460 pending_scroll_selection = 0;
1461 }
1462#endif
1463#ifdef MOUSE_THRESHOLD
1608 1464
1465 }
1466#endif
1467
1468 }
1469 }
1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1471 {
1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1473 MotionNotify, &ev)) ;
1474 XQueryPointer (display->display, scrollBar.win,
1475 &unused_root, &unused_child,
1476 &unused_root_x, &unused_root_y,
1477 & (ev.xbutton.x), & (ev.xbutton.y),
1478 &unused_mask);
1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1480 scrollbar_size ());
1481 scr_refresh (refresh_type);
1482 refresh_limit = 0;
1483 scrollbar_show (1);
1484 }
1485 break;
1486 }
1487}
1488
1489void
1490rxvt_term::rootwin_cb (XEvent &ev)
1491{
1492 SET_R (this);
1493 SET_LOCALE (locale);
1494
1495 switch (ev.type)
1496 {
1497 case PropertyNotify:
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1499 {
1500 if (ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 break;
1503 }
1504#ifdef TRANSPARENT
1505 else
1506 {
1507 /*
1508 * if user used some Esetroot compatible prog to set the root bg,
1509 * use the property to determine the pixmap. We use it later on.
1510 */
1511 if (xa[XA_XROOTPMAPID] == 0)
1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1513
1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1515 return;
1516 }
1517
1518 /* FALLTHROUGH */
1519 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ())
1521 if (am_transparent)
1522 want_full_refresh = 1;
1523 break;
1524#endif
1525 }
1526}
1527
1528void
1529rxvt_term::button_press (XButtonEvent &ev)
1530{
1531 int reportmode = 0, clickintime;
1532
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1534 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1536 /*
1537 * VT window processing of button press
1538 */
1539 if (ev.window == TermWin.vt)
1540 {
1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1542 if (reportmode)
1543 {
1544 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state;
1547#ifdef MOUSE_REPORT_DOUBLECLICK
1548 if (ev.button == MEvent.button && clickintime)
1549 {
1550 /* same button, within alloted time */
1551 MEvent.clicks++;
1552 if (MEvent.clicks > 1)
1553 {
1554 /* only report double clicks */
1555 MEvent.clicks = 2;
1556 mouse_report (ev);
1557
1558 /* don't report the release */
1559 MEvent.clicks = 0;
1560 MEvent.button = AnyButton;
1561 }
1562 }
1563 else
1564 {
1565 /* different button, or time expired */
1566 MEvent.clicks = 1;
1567 MEvent.button = ev.button;
1568 mouse_report (ev);
1569 }
1570#else
1571 MEvent.button = ev.button;
1572 mouse_report (ev);
1573#endif /* MOUSE_REPORT_DOUBLECLICK */
1574
1575 }
1576 else
1577 {
1578 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0;
1580 switch (ev.button)
1581 {
1582 case Button1:
1583 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1585 {
1586 if (MEvent.button == Button1 && clickintime)
1587 selection_rotate (ev.x, ev.y);
1588 else
1589 selection_extend (ev.x, ev.y, 1);
1590 }
1591 else
1592 {
1593 if (MEvent.button == Button1 && clickintime)
1594 MEvent.clicks++;
1595 else
1596 MEvent.clicks = 1;
1597
1598 selection_click (MEvent.clicks, ev.x, ev.y);
1599 }
1600
1609 MEvent.button = Button1; 1601 MEvent.button = Button1;
1602 break;
1603
1604 case Button3:
1605 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y);
1607 else
1608 selection_extend (ev.x, ev.y, 1);
1609 MEvent.button = Button3;
1610 break;
1611 }
1612 }
1613 MEvent.time = ev.time;
1614 return;
1615 }
1616
1617 /*
1618 * Scrollbar window processing of button press
1619 */
1620 if (isScrollbarWindow (ev.window))
1621 {
1622 scrollBar.setIdle ();
1623 /*
1624 * Rxvt-style scrollbar:
1625 * move up if mouse is above slider
1626 * move dn if mouse is below slider
1627 *
1628 * XTerm-style scrollbar:
1629 * Move display proportional to pointer location
1630 * pointer near top -> scroll one line
1631 * pointer near bot -> scroll full page
1632 */
1633#ifndef NO_SCROLLBAR_REPORT
1634 if (reportmode)
1635 {
1636 /*
1637 * Mouse report disabled scrollbar:
1638 * arrow buttons - send up/down
1639 * click on scrollbar - send pageup/down
1640 */
1641 if ((scrollBar.style == R_SB_NEXT
1642 && scrollbarnext_upButton (ev.y))
1643 || (scrollBar.style == R_SB_RXVT
1644 && scrollbarrxvt_upButton (ev.y)))
1645 tt_printf ("\033[A");
1646 else if ((scrollBar.style == R_SB_NEXT
1647 && scrollbarnext_dnButton (ev.y))
1648 || (scrollBar.style == R_SB_RXVT
1649 && scrollbarrxvt_dnButton (ev.y)))
1650 tt_printf ("\033[B");
1651 else
1652 switch (ev.button)
1653 {
1654 case Button2:
1655 tt_printf ("\014");
1656 break;
1657 case Button1:
1658 tt_printf ("\033[6~");
1659 break;
1660 case Button3:
1661 tt_printf ("\033[5~");
1662 break;
1663 }
1664 }
1665 else
1666#endif /* NO_SCROLLBAR_REPORT */
1667
1668 {
1669 char upordown = 0;
1670
1671 if (scrollBar.style == R_SB_NEXT)
1672 {
1673 if (scrollbarnext_upButton (ev.y))
1674 upordown = -1; /* up */
1675 else if (scrollbarnext_dnButton (ev.y))
1676 upordown = 1; /* down */
1677 }
1678 else if (scrollBar.style == R_SB_RXVT)
1679 {
1680 if (scrollbarrxvt_upButton (ev.y))
1681 upordown = -1; /* up */
1682 else if (scrollbarrxvt_dnButton (ev.y))
1683 upordown = 1; /* down */
1684 }
1685 if (upordown)
1686 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1689#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 }
1698 else
1699 switch (ev.button)
1700 {
1701 case Button2:
1702 switch (scrollbar_align)
1703 {
1704 case R_SB_ALIGN_TOP:
1705 csrO = 0;
1610 break; 1706 break;
1611 1707 case R_SB_ALIGN_CENTRE:
1612 case Button3: 1708 csrO = (scrollBar.bot - scrollBar.top) / 2;
1613 if (MEvent.button == Button3 && clickintime)
1614 selection_rotate (ev->x, ev->y);
1615 else
1616 selection_extend (ev->x, ev->y, 1);
1617 MEvent.button = Button3;
1618 break; 1709 break;
1710 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top;
1712 break;
1713 }
1714 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO,
1718 scrollbar_size ());
1719 scrollBar.setMotion ();
1720 break;
1721
1722 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1724 csrO = ev.y - scrollBar.top;
1725 /* FALLTHROUGH */
1726
1727 case Button3:
1728 if (scrollBar.style != R_SB_XTERM)
1729 {
1730 if (scrollbar_above_slider (ev.y))
1731# ifdef RXVT_SCROLL_FULL
1732 scr_page (UP, TermWin.nrow - 1);
1733# else
1734 scr_page (UP, TermWin.nrow / 4);
1735# endif
1736 else if (scrollbar_below_slider (ev.y))
1737# ifdef RXVT_SCROLL_FULL
1738 scr_page (DN, TermWin.nrow - 1);
1739# else
1740 scr_page (DN, TermWin.nrow / 4);
1741# endif
1742 else
1743 scrollBar.setMotion ();
1744 }
1745 else
1746 {
1747 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow
1749 * scrollbar_position (ev.y)
1750 / scrollbar_size ()));
1751 }
1752 break;
1753 }
1619 } 1754 }
1620 }
1621 MEvent.time = ev->time;
1622 return; 1755 return;
1623 }
1624 }
1625
1626/*
1627 * Scrollbar window processing of button press
1628 */
1629 if (isScrollbarWindow(ev->window))
1630 {
1631 scrollBar.setIdle ();
1632 /*
1633 * Rxvt-style scrollbar:
1634 * move up if mouse is above slider
1635 * move dn if mouse is below slider
1636 *
1637 * XTerm-style scrollbar:
1638 * Move display proportional to pointer location
1639 * pointer near top -> scroll one line
1640 * pointer near bot -> scroll full page
1641 */
1642#ifndef NO_SCROLLBAR_REPORT
1643 if (reportmode) {
1644 /*
1645 * Mouse report disabled scrollbar:
1646 * arrow buttons - send up/down
1647 * click on scrollbar - send pageup/down
1648 */
1649 if ((scrollBar.style == R_SB_NEXT
1650 && scrollbarnext_upButton(ev->y))
1651 || (scrollBar.style == R_SB_RXVT
1652 && scrollbarrxvt_upButton(ev->y)))
1653 tt_printf("\033[A");
1654 else if ((scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_dnButton(ev->y))
1656 || (scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_dnButton(ev->y)))
1658 tt_printf("\033[B");
1659 else
1660 switch (ev->button) {
1661 case Button2:
1662 tt_printf("\014");
1663 break;
1664 case Button1:
1665 tt_printf("\033[6~");
1666 break;
1667 case Button3:
1668 tt_printf("\033[5~");
1669 break;
1670 }
1671 }
1672 else
1673#endif /* NO_SCROLLBAR_REPORT */
1674 {
1675 char upordown = 0;
1676
1677 if (scrollBar.style == R_SB_NEXT) {
1678 if (scrollbarnext_upButton(ev->y))
1679 upordown = -1; /* up */
1680 else if (scrollbarnext_dnButton(ev->y))
1681 upordown = 1; /* down */
1682 } else if (scrollBar.style == R_SB_RXVT) {
1683 if (scrollbarrxvt_upButton(ev->y))
1684 upordown = -1; /* up */
1685 else if (scrollbarrxvt_dnButton(ev->y))
1686 upordown = 1; /* down */
1687 } 1756 }
1688 if (upordown) { 1757#if MENUBAR
1758 /*
1759 * Menubar window processing of button press
1760 */
1761 if (isMenuBarWindow (ev.window))
1762 menubar_control (ev);
1763#endif
1764}
1765
1766void
1767rxvt_term::button_release (XButtonEvent &ev)
1768{
1769 int reportmode = 0;
1770
1771 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1774
1775 if (scrollbar_isUpDn ())
1776 {
1777 scrollBar.setIdle ();
1778 scrollbar_show (0);
1689#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1690 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1780 refresh_type &= ~SMOOTH_REFRESH;
1691#endif
1692 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1693 if (upordown < 0)
1694 scrollBar.setUp ();
1695 else
1696 scrollBar.setDn ();
1697 }
1698 } else
1699 switch (ev->button) {
1700 case Button2:
1701 switch (scrollbar_align) {
1702 case R_SB_ALIGN_TOP:
1703 csrO = 0;
1704 break;
1705 case R_SB_ALIGN_CENTRE:
1706 csrO = (scrollBar.bot - scrollBar.top) / 2;
1707 break;
1708 case R_SB_ALIGN_BOTTOM:
1709 csrO = scrollBar.bot - scrollBar.top;
1710 break;
1711 }
1712 if (scrollBar.style == R_SB_XTERM
1713 || scrollbar_above_slider(ev->y)
1714 || scrollbar_below_slider(ev->y))
1715 scr_move_to ( scrollbar_position(ev->y) - csrO,
1716 scrollbar_size());
1717 scrollBar.setMotion ();
1718 break;
1719
1720 case Button1:
1721 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1722 csrO = ev->y - scrollBar.top;
1723 /* FALLTHROUGH */
1724
1725 case Button3:
1726 if (scrollBar.style != R_SB_XTERM) {
1727 if (scrollbar_above_slider(ev->y))
1728# ifdef RXVT_SCROLL_FULL
1729 scr_page (UP, TermWin.nrow - 1);
1730# else
1731 scr_page (UP, TermWin.nrow / 4);
1732# endif 1781#endif
1733 else if (scrollbar_below_slider(ev->y))
1734# ifdef RXVT_SCROLL_FULL
1735 scr_page (DN, TermWin.nrow - 1);
1736# else
1737 scr_page (DN, TermWin.nrow / 4);
1738# endif
1739 else
1740 scrollBar.setMotion ();
1741 } else {
1742 scr_page ((ev->button == Button1 ? DN : UP),
1743 (TermWin.nrow
1744 * scrollbar_position(ev->y)
1745 / scrollbar_size()));
1746 }
1747 break;
1748 }
1749 }
1750 return;
1751 }
1752#if MENUBAR
1753 /*
1754 * Menubar window processing of button press
1755 */
1756 if (isMenuBarWindow(ev->window))
1757 menubar_control (ev);
1758#endif
1759}
1760 1782
1761void
1762rxvt_term::button_release (XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 csrO = 0; /* reset csr Offset */
1767 if (!bypass_keystate)
1768 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 scrollBar.setIdle ();
1772 scrollbar_show (0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1783 }
1777#ifdef SELECTION_SCROLLING 1784#ifdef SELECTION_SCROLLING
1778 pending_scroll_selection=0; 1785 pending_scroll_selection=0;
1779#endif 1786#endif
1780 if (ev->window == TermWin.vt) 1787 if (ev.window == TermWin.vt)
1781 { 1788 {
1782#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1785 else
1786#endif
1787 {
1788 if (reportmode) 1789 if (reportmode)
1789 { 1790 {
1790 /* mouse report from vt window */ 1791 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1792 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1793 if (ev.button >= 4)
1793 return; 1794 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1795#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1796 /* only report the release of 'slow' single clicks */
1796 if (MEvent.button != AnyButton 1797 if (MEvent.button != AnyButton
1797 && (ev->button != MEvent.button 1798 && (ev.button != MEvent.button
1798 || (ev->time - MEvent.time 1799 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1800 > MULTICLICK_TIME / 2)))
1800 { 1801 {
1801 MEvent.clicks = 0; 1802 MEvent.clicks = 0;
1802 MEvent.button = AnyButton; 1803 MEvent.button = AnyButton;
1803 mouse_report (ev); 1804 mouse_report (ev);
1804 } 1805 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1806#else /* MOUSE_REPORT_DOUBLECLICK */
1806 MEvent.button = AnyButton; 1807 MEvent.button = AnyButton;
1807 mouse_report (ev); 1808 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1809#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1810 return;
1810 } 1811 }
1811 /* 1812 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1813 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1814 * when overriding mouse reporting
1814 */ 1815 */
1815 if (PrivateModes & PrivMode_mouse_report 1816 if (PrivateModes & PrivMode_mouse_report
1816 && bypass_keystate 1817 && bypass_keystate
1817 && ev->button == Button1 && MEvent.clicks <= 1) 1818 && ev.button == Button1 && MEvent.clicks <= 1)
1818 selection_extend (ev->x, ev->y, 0); 1819 selection_extend (ev.x, ev.y, 0);
1819 1820
1820 switch (ev->button) { 1821 switch (ev.button)
1822 {
1821 case Button1: 1823 case Button1:
1822 case Button3: 1824 case Button3:
1823 selection_make (ev->time); 1825 selection_make (ev.time);
1824 break; 1826 break;
1825 case Button2: 1827 case Button2:
1826 selection_request (ev->time, ev->x, ev->y); 1828 selection_request (ev.time, ev.x, ev.y);
1827 break; 1829 break;
1828#ifdef MOUSE_WHEEL 1830#ifdef MOUSE_WHEEL
1829 case Button4: 1831 case Button4:
1830 case Button5: 1832 case Button5:
1831 { 1833 {
1832 int i; 1834 int i;
1833 page_dirn v; 1835 page_dirn v;
1834 1836
1835 v = (ev->button == Button4) ? UP : DN; 1837 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1838 if (ev.state & ShiftMask)
1837 i = 1; 1839 i = 1;
1838 else if ((Options & Opt_mouseWheelScrollPage)) 1840 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = TermWin.nrow - 1; 1841 i = TermWin.nrow - 1;
1840 else 1842 else
1841 i = 5; 1843 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1844# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1845 if (ev.state & ControlMask)
1844 { 1846 {
1845 mouse_slip_wheel_speed += (v ? -1 : 1); 1847 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1849 }
1848# endif 1850# endif
1849# ifdef JUMP_MOUSE_WHEEL 1851# ifdef JUMP_MOUSE_WHEEL
1850 scr_page (v, i); 1852 scr_page (v, i);
1851 scr_refresh (SMOOTH_REFRESH); 1853 scr_refresh (SMOOTH_REFRESH);
1852 scrollbar_show (1); 1854 scrollbar_show (1);
1853# else 1855# else
1854 while (i--) 1856 while (i--)
1855 { 1857 {
1856 scr_page (v, 1); 1858 scr_page (v, 1);
1857 scr_refresh (SMOOTH_REFRESH); 1859 scr_refresh (SMOOTH_REFRESH);
1858 scrollbar_show (1); 1860 scrollbar_show (1);
1859 } 1861 }
1860# endif 1862# endif
1861 } 1863
1862 break; 1864 }
1865 break;
1863#endif 1866#endif
1864 } 1867
1865 }
1866 } 1868 }
1869 }
1867#ifdef MENUBAR 1870#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1871 else if (isMenuBarWindow (ev.window))
1869 menubar_control (ev); 1872 menubar_control (ev);
1870#endif 1873#endif
1871} 1874}
1872 1875
1873 1876
1874#ifdef TRANSPARENT 1877#ifdef TRANSPARENT
… …
1877 * Do transparency updates if required 1880 * Do transparency updates if required
1878 */ 1881 */
1879int 1882int
1880rxvt_term::check_our_parents () 1883rxvt_term::check_our_parents ()
1881{ 1884{
1882 int i, pchanged, aformat, have_pixmap, rootdepth; 1885 int i, pchanged, aformat, have_pixmap, rootdepth;
1883 unsigned long nitems, bytes_after; 1886 unsigned long nitems, bytes_after;
1884 Atom atype; 1887 Atom atype;
1885 unsigned char *prop = NULL; 1888 unsigned char *prop = NULL;
1886 Window root, oldp, *list; 1889 Window root, oldp, *list;
1887 Pixmap rootpixmap = None; 1890 Pixmap rootpixmap = None;
1888 XWindowAttributes wattr, wrootattr; 1891 XWindowAttributes wattr, wrootattr;
1889 1892
1890 pchanged = 0; 1893 pchanged = 0;
1891 1894
1892 if (!(Options & Opt_transparent)) 1895 if (! (Options & Opt_transparent))
1893 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1894 1897
1895 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1898 XGetWindowAttributes (display->display, display->root, &wrootattr);
1896 rootdepth = wrootattr.depth; 1899 rootdepth = wrootattr.depth;
1897 1900
1898 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1899 if (rootdepth != wattr.depth) { 1902 if (rootdepth != wattr.depth)
1903 {
1900 if (am_transparent) { 1904 if (am_transparent)
1905 {
1901 pchanged = 1; 1906 pchanged = 1;
1902 XSetWindowBackground(Xdisplay, TermWin.vt, 1907 XSetWindowBackground (display->display, TermWin.vt,
1903 PixColors[Color_bg]); 1908 PixColors[Color_bg]);
1904 am_transparent = am_pixmap_trans = 0; 1909 am_transparent = am_pixmap_trans = 0;
1905 } 1910 }
1906 return pchanged; /* Don't try any more */ 1911 return pchanged; /* Don't try any more */
1907 } 1912 }
1908 1913
1909/* Get all X ops out of the queue so that our information is up-to-date. */ 1914 /* Get all X ops out of the queue so that our information is up-to-date. */
1910 XSync(Xdisplay, False); 1915 XSync (display->display, False);
1911 1916
1912/* 1917 /*
1913 * Make the frame window set by the window manager have 1918 * Make the frame window set by the window manager have
1914 * the root background. Some window managers put multiple nested frame 1919 * the root background. Some window managers put multiple nested frame
1915 * windows for each client, so we have to take care about that. 1920 * windows for each client, so we have to take care about that.
1916 */ 1921 */
1917 i = (xa[XA_XROOTPMAPID] != 0 1922 i = (xa[XA_XROOTPMAPID] != 0
1918 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1919 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1920 &nitems, &bytes_after, &prop) == Success)); 1925 &nitems, &bytes_after, &prop) == Success));
1921 if (!i || prop == NULL) 1926 if (!i || prop == NULL)
1922 have_pixmap = 0; 1927 have_pixmap = 0;
1923 else { 1928 else
1929 {
1924 have_pixmap = 1; 1930 have_pixmap = 1;
1925 rootpixmap = *((Pixmap *)prop); 1931 rootpixmap = * ((Pixmap *)prop);
1926 XFree(prop); 1932 XFree (prop);
1927 } 1933 }
1928 if (have_pixmap) { 1934 if (have_pixmap)
1929/* 1935 {
1936 /*
1930 * Copy Xroot pixmap transparency 1937 * Copy display->root pixmap transparency
1931 */ 1938 */
1932 int sx, sy, nx, ny; 1939 int sx, sy, nx, ny;
1933 unsigned int nw, nh; 1940 unsigned int nw, nh;
1934 Window cr; 1941 Window cr;
1935 XImage *image; 1942 XImage *image;
1936 GC gc; 1943 GC gc;
1937 XGCValues gcvalue; 1944 XGCValues gcvalue;
1938 1945
1939 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1940 0, 0, &sx, &sy, &cr); 1947 0, 0, &sx, &sy, &cr);
1941 nw = (unsigned int)szHint.width; 1948 nw = (unsigned int)szHint.width;
1942 nh = (unsigned int)szHint.height; 1949 nh = (unsigned int)szHint.height;
1943 nx = ny = 0; 1950 nx = ny = 0;
1944 if (sx < 0) { 1951 if (sx < 0)
1952 {
1945 nw += sx; 1953 nw += sx;
1946 nx = -sx; 1954 nx = -sx;
1947 sx = 0; 1955 sx = 0;
1948 } 1956 }
1949 if (sy < 0) { 1957 if (sy < 0)
1958 {
1950 nh += sy; 1959 nh += sy;
1951 ny = -sy; 1960 ny = -sy;
1952 sy = 0; 1961 sy = 0;
1953 } 1962 }
1954 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1955 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1956 allowedxerror = -1; 1965 allowedxerror = -1;
1957 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1958 ZPixmap); 1967 ZPixmap);
1959 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1960 /* XXX: may need a delay here? */ 1969 /* XXX: may need a delay here? */
1961 allowedxerror = 0; 1970 allowedxerror = 0;
1962 if (image == NULL) { 1971 if (image == NULL)
1972 {
1963 if (am_transparent && am_pixmap_trans) { 1973 if (am_transparent && am_pixmap_trans)
1964 pchanged = 1; 1974 {
1975 pchanged = 1;
1965 if (TermWin.pixmap != None) { 1976 if (TermWin.pixmap != None)
1977 {
1966 XFreePixmap(Xdisplay, TermWin.pixmap); 1978 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 1979 TermWin.pixmap = None;
1968 } 1980 }
1969 } 1981 }
1970 am_pixmap_trans = 0; 1982 am_pixmap_trans = 0;
1971 } else { 1983 }
1984 else
1985 {
1972 if (TermWin.pixmap != None) 1986 if (TermWin.pixmap != None)
1973 XFreePixmap(Xdisplay, TermWin.pixmap); 1987 XFreePixmap (display->display, TermWin.pixmap);
1974 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1975 (unsigned int)szHint.width, 1989 (unsigned int)szHint.width,
1976 (unsigned int)szHint.height, 1990 (unsigned int)szHint.height,
1977 (unsigned int)image->depth); 1991 (unsigned int)image->depth);
1978 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1979 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1980 nx, ny, (unsigned int)image->width, 1994 nx, ny, (unsigned int)image->width,
1981 (unsigned int)image->height); 1995 (unsigned int)image->height);
1982 XFreeGC(Xdisplay, gc); 1996 XFreeGC (display->display, gc);
1983 XDestroyImage(image); 1997 XDestroyImage (image);
1984 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1985 TermWin.pixmap); 1999 TermWin.pixmap);
1986 if (!am_transparent || !am_pixmap_trans) 2000 if (!am_transparent || !am_pixmap_trans)
1987 pchanged = 1; 2001 pchanged = 1;
1988 am_transparent = am_pixmap_trans = 1; 2002 am_transparent = am_pixmap_trans = 1;
1989 } 2003 }
1990 } 2004 }
1991 if (!am_pixmap_trans) { 2005 if (!am_pixmap_trans)
2006 {
1992 unsigned int n; 2007 unsigned int n;
1993/* 2008 /*
1994 * InheritPixmap transparency 2009 * InheritPixmap transparency
1995 */ 2010 */
1996 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1997 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1998 i++) { 2013 i++)
2014 {
1999 oldp = TermWin.parent[i]; 2015 oldp = TermWin.parent[i];
2000 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2016 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2001 &TermWin.parent[i], &list, &n); 2017 &TermWin.parent[i], &list, &n);
2002 XFree(list); 2018 XFree (list);
2003 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2004 if (TermWin.parent[i] == Xroot) { 2020 if (TermWin.parent[i] == display->root)
2005 if (oldp != None) 2021 {
2006 pchanged = 1; 2022 if (oldp != None)
2007 break; 2023 pchanged = 1;
2008 } 2024 break;
2025 }
2009 if (oldp != TermWin.parent[i]) 2026 if (oldp != TermWin.parent[i])
2010 pchanged = 1; 2027 pchanged = 1;
2011 } 2028 }
2012 n = 0; 2029 n = 0;
2013 if (pchanged) { 2030 if (pchanged)
2031 {
2014 for (; n < (unsigned int)i; n++) { 2032 for (; n < (unsigned int)i; n++)
2033 {
2015 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2016 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2035 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2036 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2037 {
2018 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2019 break; 2039 break;
2020 } 2040 }
2021 } 2041 }
2022 } 2042 }
2023 if (n > (int)(sizeof(TermWin.parent) 2043 if (n > (int) (sizeof (TermWin.parent)
2024 / sizeof(TermWin.parent[0]))) { 2044 / sizeof (TermWin.parent[0])))
2045 {
2025 D_X((stderr, "InheritPixmap Turning off")); 2046 D_X ((stderr, "InheritPixmap Turning off"));
2026 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2047 XSetWindowBackground (display->display, TermWin.parent[0],
2027 PixColors[Color_fg]); 2048 PixColors[Color_fg]);
2028 XSetWindowBackground(Xdisplay, TermWin.vt, 2049 XSetWindowBackground (display->display, TermWin.vt,
2029 PixColors[Color_bg]); 2050 PixColors[Color_bg]);
2030 am_transparent = 0; 2051 am_transparent = 0;
2031 /* XXX: also turn off Opt_transparent? */ 2052 /* XXX: also turn off Opt_transparent? */
2032 } else { 2053 }
2054 else
2055 {
2033 /* wait (an arbitrary period) for the WM to do its thing 2056 /* wait (an arbitrary period) for the WM to do its thing
2034 * needed for fvwm2.2.2 (and before?) */ 2057 * needed for fvwm2.2.2 (and before?) */
2035# ifdef HAVE_NANOSLEEP 2058# ifdef HAVE_NANOSLEEP
2036 struct timespec rqt; 2059 struct timespec rqt;
2037 2060
2038 rqt.tv_sec = 1; 2061 rqt.tv_sec = 1;
2039 rqt.tv_nsec = 0; 2062 rqt.tv_nsec = 0;
2040 nanosleep(&rqt, NULL); 2063 nanosleep (&rqt, NULL);
2041# else 2064# else
2042 sleep(1); 2065 sleep (1);
2043# endif 2066# endif
2044 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2045 for (n = 0; n < (unsigned int)i; n++) 2068 for (n = 0; n < (unsigned int)i; n++)
2046 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2047 ParentRelative); 2070 ParentRelative);
2048 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2049 ParentRelative); 2072 ParentRelative);
2050 am_transparent = 1; 2073 am_transparent = 1;
2051 } 2074 }
2052 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2053 TermWin.parent[i] = None; 2076 TermWin.parent[i] = None;
2054 } 2077 }
2055 return pchanged; 2078 return pchanged;
2056} 2079}
2057#endif 2080#endif
2058 2081
2059/*}}} */ 2082/*}}} */
2060 2083
… …
2062/*----------------------------------------------------------------------*/ 2085/*----------------------------------------------------------------------*/
2063#ifdef PRINTPIPE 2086#ifdef PRINTPIPE
2064FILE * 2087FILE *
2065rxvt_term::popen_printer () 2088rxvt_term::popen_printer ()
2066{ 2089{
2067 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2090 FILE *stream = popen (rs[Rs_print_pipe], "w");
2068 2091
2069 if (stream == NULL) 2092 if (stream == NULL)
2070 rxvt_print_error("can't open printer pipe"); 2093 rxvt_print_error ("can't open printer pipe");
2071 return stream; 2094 return stream;
2072} 2095}
2073 2096
2074int 2097int
2075rxvt_term::pclose_printer (FILE *stream) 2098rxvt_term::pclose_printer (FILE *stream)
2076{ 2099{
2077 fflush (stream); 2100 fflush (stream);
2078/* pclose() reported not to work on SunOS 4.1.3 */ 2101 /* pclose () reported not to work on SunOS 4.1.3 */
2079# if defined (__sun__) /* TODO: RESOLVE THIS */ 2102# if defined (__sun__) /* TODO: RESOLVE THIS */
2080/* pclose works provided SIGCHLD handler uses waitpid */ 2103 /* pclose works provided SIGCHLD handler uses waitpid */
2081 return pclose (stream); /* return fclose (stream); */ 2104 return pclose (stream); /* return fclose (stream); */
2082# else 2105# else
2083 return pclose (stream); 2106 return pclose (stream);
2084# endif 2107# endif
2085} 2108}
… …
2088 * simulate attached vt100 printer 2111 * simulate attached vt100 printer
2089 */ 2112 */
2090void 2113void
2091rxvt_term::process_print_pipe () 2114rxvt_term::process_print_pipe ()
2092{ 2115{
2093 int done; 2116 int done;
2094 FILE *fd; 2117 FILE *fd;
2095 2118
2096 if ((fd = popen_printer ()) == NULL) 2119 if ((fd = popen_printer ()) == NULL)
2097 return; 2120 return;
2098 2121
2099/* 2122 /*
2100 * Send all input to the printer until either ESC[4i or ESC[?4i 2123 * Send all input to the printer until either ESC[4i or ESC[?4i
2101 * is received. 2124 * is received.
2102 */ 2125 */
2103 for (done = 0; !done;) { 2126 for (done = 0; !done;)
2127 {
2104 unsigned char buf[8]; 2128 unsigned char buf[8];
2105 unsigned char ch; 2129 unsigned char ch;
2106 unsigned int i, len; 2130 unsigned int i, len;
2107 2131
2108 if ((ch = cmd_getc ()) != C0_ESC) { 2132 if ((ch = cmd_getc ()) != C0_ESC)
2133 {
2109 if (putc(ch, fd) == EOF) 2134 if (putc (ch, fd) == EOF)
2110 break; /* done = 1 */ 2135 break; /* done = 1 */
2111 } else { 2136 }
2137 else
2138 {
2112 len = 0; 2139 len = 0;
2113 buf[len++] = ch; 2140 buf[len++] = ch;
2114 2141
2115 if ((buf[len++] = cmd_getc ()) == '[') { 2142 if ((buf[len++] = cmd_getc ()) == '[')
2143 {
2116 if ((ch = cmd_getc ()) == '?') { 2144 if ((ch = cmd_getc ()) == '?')
2117 buf[len++] = '?'; 2145 {
2118 ch = cmd_getc (); 2146 buf[len++] = '?';
2119 } 2147 ch = cmd_getc ();
2148 }
2120 if ((buf[len++] = ch) == '4') { 2149 if ((buf[len++] = ch) == '4')
2150 {
2121 if ((buf[len++] = cmd_getc ()) == 'i') 2151 if ((buf[len++] = cmd_getc ()) == 'i')
2122 break; /* done = 1 */ 2152 break; /* done = 1 */
2123 } 2153 }
2154 }
2155 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF)
2157 {
2158 done = 1;
2159 break;
2160 }
2161 }
2124 } 2162 }
2125 for (i = 0; i < len; i++)
2126 if (putc(buf[i], fd) == EOF) {
2127 done = 1;
2128 break;
2129 }
2130 }
2131 }
2132 pclose_printer (fd); 2163 pclose_printer (fd);
2133} 2164}
2134#endif /* PRINTPIPE */ 2165#endif /* PRINTPIPE */
2135/*}}} */ 2166/*}}} */
2136 2167
2137/* *INDENT-OFF* */ 2168/* *INDENT-OFF* */
2138enum { 2169enum {
2139 C1_40 = 0x40, 2170 C1_40 = 0x40,
2140 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2141 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2172 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2142 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2173 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2143 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2174 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2144}; 2175};
2145/* *INDENT-ON* */ 2176/* *INDENT-ON* */
2146 2177
2147/*{{{ process non-printing single characters */ 2178/*{{{ process non-printing single characters */
2148void 2179void
2149rxvt_term::process_nonprinting (unsigned char ch) 2180rxvt_term::process_nonprinting (unsigned char ch)
2150{ 2181{
2151 switch (ch) { 2182 switch (ch)
2183 {
2152 case C0_ENQ: /* terminal Status */ 2184 case C0_ENQ: /* terminal Status */
2153 if (rs[Rs_answerbackstring]) 2185 if (rs[Rs_answerbackstring])
2154 tt_write( 2186 tt_write (
2155 (const unsigned char *)rs[Rs_answerbackstring], 2187 (const unsigned char *)rs[Rs_answerbackstring],
2156 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2188 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2157 else 2189 else
2158 tt_write((unsigned char *)VT100_ANS, 2190 tt_write ((unsigned char *)VT100_ANS,
2159 (unsigned int)STRLEN(VT100_ANS)); 2191 (unsigned int)STRLEN (VT100_ANS));
2160 break; 2192 break;
2161 case C0_BEL: /* bell */ 2193 case C0_BEL: /* bell */
2162 scr_bell (); 2194 scr_bell ();
2163 break; 2195 break;
2164 case C0_BS: /* backspace */ 2196 case C0_BS: /* backspace */
2165 scr_backspace (); 2197 scr_backspace ();
2166 break; 2198 break;
2167 case C0_HT: /* tab */ 2199 case C0_HT: /* tab */
2168 scr_tab (1); 2200 scr_tab (1);
2169 break; 2201 break;
2170 case C0_CR: /* carriage return */ 2202 case C0_CR: /* carriage return */
2171 scr_gotorc (0, 0, R_RELATIVE); 2203 scr_gotorc (0, 0, R_RELATIVE);
2172 break; 2204 break;
2173 case C0_VT: /* vertical tab, form feed */ 2205 case C0_VT: /* vertical tab, form feed */
2174 case C0_FF: 2206 case C0_FF:
2175 case C0_LF: /* line feed */ 2207 case C0_LF: /* line feed */
2176 scr_index (UP); 2208 scr_index (UP);
2177 break; 2209 break;
2178 case C0_SO: /* shift out - acs */ 2210 case C0_SO: /* shift out - acs */
2179 scr_charset_choose (1); 2211 scr_charset_choose (1);
2180 break; 2212 break;
2181 case C0_SI: /* shift in - acs */ 2213 case C0_SI: /* shift in - acs */
2182 scr_charset_choose (0); 2214 scr_charset_choose (0);
2183 break; 2215 break;
2184 } 2216 }
2185} 2217}
2186/*}}} */ 2218/*}}} */
2187 2219
2188 2220
2189/*{{{ process VT52 escape sequences */ 2221/*{{{ process VT52 escape sequences */
2190void 2222void
2191rxvt_term::process_escape_vt52 (unsigned char ch) 2223rxvt_term::process_escape_vt52 (unsigned char ch)
2192{ 2224{
2193 int row, col; 2225 int row, col;
2226
2227 switch (ch)
2194 2228 {
2195 switch (ch) {
2196 case 'A': /* cursor up */ 2229 case 'A': /* cursor up */
2197 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2230 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2198 break; 2231 break;
2199 case 'B': /* cursor down */ 2232 case 'B': /* cursor down */
2200 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2233 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2201 break; 2234 break;
2202 case 'C': /* cursor right */ 2235 case 'C': /* cursor right */
2203 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2236 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2204 break; 2237 break;
2205 case 'D': /* cursor left */ 2238 case 'D': /* cursor left */
2206 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2239 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2207 break; 2240 break;
2208 case 'H': /* cursor home */ 2241 case 'H': /* cursor home */
2209 scr_gotorc (0, 0, 0); 2242 scr_gotorc (0, 0, 0);
2210 break; 2243 break;
2211 case 'I': /* cursor up and scroll down if needed */ 2244 case 'I': /* cursor up and scroll down if needed */
2212 scr_index (DN); 2245 scr_index (DN);
2213 break; 2246 break;
2214 case 'J': /* erase to end of screen */ 2247 case 'J': /* erase to end of screen */
2215 scr_erase_screen (0); 2248 scr_erase_screen (0);
2216 break; 2249 break;
2217 case 'K': /* erase to end of line */ 2250 case 'K': /* erase to end of line */
2218 scr_erase_line (0); 2251 scr_erase_line (0);
2219 break; 2252 break;
2220 case 'Y': /* move to specified row and col */ 2253 case 'Y': /* move to specified row and col */
2221 /* full command is 'ESC Y row col' where row and col 2254 /* full command is 'ESC Y row col' where row and col
2222 * are encoded by adding 32 and sending the ascii 2255 * are encoded by adding 32 and sending the ascii
2223 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2256 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2224 * etc. */ 2257 * etc. */
2225 row = cmd_getc () - ' '; 2258 row = cmd_getc () - ' ';
2226 col = cmd_getc () - ' '; 2259 col = cmd_getc () - ' ';
2227 scr_gotorc (row, col, 0); 2260 scr_gotorc (row, col, 0);
2228 break; 2261 break;
2229 case 'Z': /* identify the terminal type */ 2262 case 'Z': /* identify the terminal type */
2230 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2263 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2231 break; 2264 break;
2232 case '<': /* turn off VT52 mode */ 2265 case '<': /* turn off VT52 mode */
2233 PrivMode(0, PrivMode_vt52); 2266 PrivMode (0, PrivMode_vt52);
2234 break; 2267 break;
2235 case 'F': /* use special graphics character set */ 2268 case 'F': /* use special graphics character set */
2236 case 'G': /* use regular character set */ 2269 case 'G': /* use regular character set */
2237 /* unimplemented */ 2270 /* unimplemented */
2238 break; 2271 break;
2239 case '=': /* use alternate keypad mode */ 2272 case '=': /* use alternate keypad mode */
2240 case '>': /* use regular keypad mode */ 2273 case '>': /* use regular keypad mode */
2241 /* unimplemented */ 2274 /* unimplemented */
2242 break; 2275 break;
2243 } 2276 }
2244} 2277}
2245/*}}} */ 2278/*}}} */
2246 2279
2247 2280
2248/*{{{ process escape sequences */ 2281/*{{{ process escape sequences */
2249void 2282void
2250rxvt_term::process_escape_seq () 2283rxvt_term::process_escape_seq ()
2251{ 2284{
2252 unsigned char ch = cmd_getc (); 2285 unsigned char ch = cmd_getc ();
2253 2286
2254 if (PrivateModes & PrivMode_vt52) { 2287 if (PrivateModes & PrivMode_vt52)
2255 process_escape_vt52 (ch);
2256 return;
2257 }
2258 2288 {
2289 process_escape_vt52 (ch);
2290 return;
2291 }
2292
2259 switch (ch) { 2293 switch (ch)
2294 {
2260 /* case 1: do_tek_mode (); break; */ 2295 /* case 1: do_tek_mode (); break; */
2261 case '#': 2296 case '#':
2262 if (cmd_getc () == '8') 2297 if (cmd_getc () == '8')
2263 scr_E (); 2298 scr_E ();
2264 break; 2299 break;
2265 case '(': 2300 case '(':
2266 scr_charset_set (0, (unsigned int)cmd_getc ()); 2301 scr_charset_set (0, (unsigned int)cmd_getc ());
2267 break; 2302 break;
2268 case ')': 2303 case ')':
2269 scr_charset_set (1, (unsigned int)cmd_getc ()); 2304 scr_charset_set (1, (unsigned int)cmd_getc ());
2270 break; 2305 break;
2271 case '*': 2306 case '*':
2272 scr_charset_set (2, (unsigned int)cmd_getc ()); 2307 scr_charset_set (2, (unsigned int)cmd_getc ());
2273 break; 2308 break;
2274 case '+': 2309 case '+':
2275 scr_charset_set (3, (unsigned int)cmd_getc ()); 2310 scr_charset_set (3, (unsigned int)cmd_getc ());
2276 break; 2311 break;
2277#ifdef MULTICHAR_SET
2278 case '$':
2279 scr_charset_set (-2, (unsigned int)cmd_getc ());
2280 break;
2281#endif
2282#ifndef NO_FRILLS 2312#ifndef NO_FRILLS
2283 case '6': 2313 case '6':
2284 scr_backindex (); 2314 scr_backindex ();
2285 break; 2315 break;
2286#endif 2316#endif
2287 case '7': 2317 case '7':
2288 scr_cursor (SAVE); 2318 scr_cursor (SAVE);
2289 break; 2319 break;
2290 case '8': 2320 case '8':
2291 scr_cursor (RESTORE); 2321 scr_cursor (RESTORE);
2292 break; 2322 break;
2293#ifndef NO_FRILLS 2323#ifndef NO_FRILLS
2294 case '9': 2324 case '9':
2295 scr_forwardindex (); 2325 scr_forwardindex ();
2296 break; 2326 break;
2297#endif 2327#endif
2298 case '=': 2328 case '=':
2299 case '>': 2329 case '>':
2300 PrivMode((ch == '='), PrivMode_aplKP); 2330 PrivMode ((ch == '='), PrivMode_aplKP);
2301 break; 2331 break;
2302 2332
2303 case C1_40: 2333 case C1_40:
2304 cmd_getc (); 2334 cmd_getc ();
2305 break; 2335 break;
2306 case C1_44: 2336 case C1_44:
2307 scr_index (UP); 2337 scr_index (UP);
2308 break; 2338 break;
2309 2339
2310 /* 8.3.87: NEXT LINE */ 2340 /* 8.3.87: NEXT LINE */
2311 case C1_NEL: /* ESC E */ 2341 case C1_NEL: /* ESC E */
2312 { 2342 {
2313 uint32_t nlcr[] = { '\n', '\r' }; 2343 uint32_t nlcr[] = { '\n', '\r' };
2314 scr_add_lines (nlcr, 1, 2); 2344 scr_add_lines (nlcr, 1, 2);
2315 } 2345 }
2316 break; 2346 break;
2317 2347
2318 /* kidnapped escape sequence: Should be 8.3.48 */ 2348 /* kidnapped escape sequence: Should be 8.3.48 */
2319 case C1_ESA: /* ESC G */ 2349 case C1_ESA: /* ESC G */
2320 process_graphics (); 2350 process_graphics ();
2321 break; 2351 break;
2322 2352
2323 /* 8.3.63: CHARACTER TABULATION SET */ 2353 /* 8.3.63: CHARACTER TABULATION SET */
2324 case C1_HTS: /* ESC H */ 2354 case C1_HTS: /* ESC H */
2325 scr_set_tab (1); 2355 scr_set_tab (1);
2326 break; 2356 break;
2327 2357
2328 /* 8.3.105: REVERSE LINE FEED */ 2358 /* 8.3.105: REVERSE LINE FEED */
2329 case C1_RI: /* ESC M */ 2359 case C1_RI: /* ESC M */
2330 scr_index (DN); 2360 scr_index (DN);
2331 break; 2361 break;
2332 2362
2333 /* 8.3.142: SINGLE-SHIFT TWO */ 2363 /* 8.3.142: SINGLE-SHIFT TWO */
2334 /*case C1_SS2: scr_single_shift (2); break; */ 2364 /*case C1_SS2: scr_single_shift (2); break; */
2335 2365
2336 /* 8.3.143: SINGLE-SHIFT THREE */ 2366 /* 8.3.143: SINGLE-SHIFT THREE */
2337 /*case C1_SS3: scr_single_shift (3); break; */ 2367 /*case C1_SS3: scr_single_shift (3); break; */
2338 2368
2339 /* 8.3.27: DEVICE CONTROL STRING */ 2369 /* 8.3.27: DEVICE CONTROL STRING */
2340 case C1_DCS: /* ESC P */ 2370 case C1_DCS: /* ESC P */
2341 process_dcs_seq (); 2371 process_dcs_seq ();
2342 break; 2372 break;
2343 2373
2344 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2374 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2345 case C1_SCI: /* ESC Z */ 2375 case C1_SCI: /* ESC Z */
2346 tt_write((const unsigned char *)ESCZ_ANSWER, 2376 tt_write ((const unsigned char *)ESCZ_ANSWER,
2347 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2377 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2348 break; /* steal obsolete ESC [ c */ 2378 break; /* steal obsolete ESC [ c */
2349 2379
2350 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2380 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2351 case C1_CSI: /* ESC [ */ 2381 case C1_CSI: /* ESC [ */
2352 process_csi_seq (); 2382 process_csi_seq ();
2353 break; 2383 break;
2354 2384
2355 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2385 /* 8.3.90: OPERATING SYSTEM COMMAND */
2356 case C1_OSC: /* ESC ] */ 2386 case C1_OSC: /* ESC ] */
2357 process_osc_seq (); 2387 process_osc_seq ();
2358 break; 2388 break;
2359 2389
2360 /* 8.3.106: RESET TO INITIAL STATE */ 2390 /* 8.3.106: RESET TO INITIAL STATE */
2361 case 'c': 2391 case 'c':
2362 scr_poweron (); 2392 scr_poweron ();
2363 scrollbar_show (1); 2393 scrollbar_show (1);
2364 break; 2394 break;
2365 2395
2366 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2367 case 'n': 2397 case 'n':
2368 scr_charset_choose (2); 2398 scr_charset_choose (2);
2369 break; 2399 break;
2370 2400
2371 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2401 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2372 case 'o': 2402 case 'o':
2373 scr_charset_choose (3); 2403 scr_charset_choose (3);
2374 break; 2404 break;
2375 } 2405 }
2376} 2406}
2377/*}}} */ 2407/*}}} */
2378 2408
2379/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2409/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2380/* *INDENT-OFF* */ 2410/* *INDENT-OFF* */
2381enum { 2411enum {
2382 CSI_ICH = 0x40, 2412 CSI_ICH = 0x40,
2383 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2413 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2384 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2414 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2385 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2415 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2386 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2416 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2387 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2417 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2388 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2418 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2389 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2419 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2390 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2420 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2391}; 2421};
2392 2422
2393#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2423#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2394 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2424 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2395 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2425 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2396#define get_byte_array_bit(array, bit) \ 2426#define get_byte_array_bit(array, bit) \
2397 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2427 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2398 2428
2399const unsigned char csi_defaults[] = { 2429const unsigned char csi_defaults[] =
2430 {
2400 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2431 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2401 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2432 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2402 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2433 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2403 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2434 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2404 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2435 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2405 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2436 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2406 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2437 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2407 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2438 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2408}; 2439 };
2409/* *INDENT-ON* */ 2440/* *INDENT-ON* */
2410 2441
2411void 2442void
2412rxvt_term::process_csi_seq () 2443rxvt_term::process_csi_seq ()
2413{ 2444{
2414 unsigned char ch, priv, i; 2445 unsigned char ch, priv, i;
2415 unsigned int nargs, p; 2446 unsigned int nargs, p;
2416 int n, ndef; 2447 int n, ndef;
2417 int arg[ESC_ARGS]; 2448 int arg[ESC_ARGS];
2418 2449
2419 for (nargs = ESC_ARGS; nargs > 0;) 2450 for (nargs = ESC_ARGS; nargs > 0;)
2420 arg[--nargs] = 0; 2451 arg[--nargs] = 0;
2421 2452
2422 priv = 0; 2453 priv = 0;
2454 ch = cmd_getc ();
2455 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */
2457 priv = ch;
2423 ch = cmd_getc (); 2458 ch = cmd_getc ();
2424 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2425 priv = ch;
2426 ch = cmd_getc ();
2427 } 2459 }
2428/* read any numerical arguments */ 2460 /* read any numerical arguments */
2429 for (n = -1; ch < CSI_ICH; ) { 2461 for (n = -1; ch < CSI_ICH; )
2462 {
2430 if (isdigit(ch)) { 2463 if (isdigit (ch))
2464 {
2431 if (n < 0) 2465 if (n < 0)
2432 n = ch - '0'; 2466 n = ch - '0';
2433 else 2467 else
2434 n = n * 10 + ch - '0'; 2468 n = n * 10 + ch - '0';
2469 }
2435 } else if (ch == ';') { 2470 else if (ch == ';')
2471 {
2436 if (nargs < ESC_ARGS) 2472 if (nargs < ESC_ARGS)
2437 arg[nargs++] = n; 2473 arg[nargs++] = n;
2438 n = -1; 2474 n = -1;
2475 }
2439 } else if (ch == '\b') { 2476 else if (ch == '\b')
2477 {
2440 scr_backspace (); 2478 scr_backspace ();
2479 }
2441 } else if (ch == C0_ESC) { 2480 else if (ch == C0_ESC)
2481 {
2442 process_escape_seq (); 2482 process_escape_seq ();
2483 return;
2484 }
2485 else if (ch < ' ')
2486 {
2487 process_nonprinting (ch);
2488 }
2489 ch = cmd_getc ();
2490 }
2491
2492 if (ch > CSI_7F)
2443 return; 2493 return;
2444 } else if (ch < ' ') {
2445 process_nonprinting (ch);
2446 }
2447 ch = cmd_getc ();
2448 }
2449 2494
2450 if (ch > CSI_7F)
2451 return;
2452
2453 if (nargs < ESC_ARGS) 2495 if (nargs < ESC_ARGS)
2454 arg[nargs++] = n; 2496 arg[nargs++] = n;
2455 2497
2456 i = ch - CSI_ICH; 2498 i = ch - CSI_ICH;
2457 ndef = get_byte_array_bit(csi_defaults, i); 2499 ndef = get_byte_array_bit (csi_defaults, i);
2458 for (p = 0; p < nargs; p++) 2500 for (p = 0; p < nargs; p++)
2459 if (arg[p] == -1) 2501 if (arg[p] == -1)
2460 arg[p] = ndef; 2502 arg[p] = ndef;
2461 2503
2462#ifdef DEBUG_CMD 2504#ifdef DEBUG_CMD
2463 fprintf(stderr, "CSI "); 2505 fprintf (stderr, "CSI ");
2464 for (p = 0; p < nargs; p++) 2506 for (p = 0; p < nargs; p++)
2465 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2507 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2466 fprintf(stderr, "%c\n", ch); 2508 fprintf (stderr, "%c\n", ch);
2467#endif 2509#endif
2468 2510
2469/* 2511 /*
2470 * private mode handling 2512 * private mode handling
2471 */ 2513 */
2472 if (priv) { 2514 if (priv)
2473 switch (priv) { 2515 {
2474 case '>': 2516 switch (priv)
2517 {
2518 case '>':
2475 if (ch == CSI_DA) /* secondary device attributes */ 2519 if (ch == CSI_DA) /* secondary device attributes */
2476 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2520 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2477 break; 2521 break;
2478 case '?': 2522 case '?':
2479 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2523 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2480 process_terminal_mode (ch, priv, nargs, arg); 2524 process_terminal_mode (ch, priv, nargs, arg);
2481 break; 2525 break;
2482 } 2526 }
2483 return; 2527 return;
2484 } 2528 }
2485 2529
2486 switch (ch) { 2530 switch (ch)
2487/* 2531 {
2532 /*
2488 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2533 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2489 */ 2534 */
2490#ifdef PRINTPIPE 2535#ifdef PRINTPIPE
2491 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2536 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2492 switch (arg[0]) { 2537 switch (arg[0])
2538 {
2493 case 0: /* initiate transfer to primary aux device */ 2539 case 0: /* initiate transfer to primary aux device */
2494 scr_printscreen (0); 2540 scr_printscreen (0);
2495 break; 2541 break;
2496 case 5: /* start relay to primary aux device */ 2542 case 5: /* start relay to primary aux device */
2497 process_print_pipe (); 2543 process_print_pipe ();
2544 break;
2545 }
2498 break; 2546 break;
2499 }
2500 break;
2501#endif 2547#endif
2502 2548
2503 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2549 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2504 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2550 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2505 arg[0] = -arg[0]; 2551 arg[0] = -arg[0];
2506 /* FALLTHROUGH */ 2552 /* FALLTHROUGH */
2507 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2553 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2508 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2554 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2509 scr_gotorc (arg[0], 0, RELATIVE); 2555 scr_gotorc (arg[0], 0, RELATIVE);
2510 break; 2556 break;
2511 2557
2512 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2558 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2513 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2559 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2514#ifdef ISO6429 2560#ifdef ISO6429
2515 arg[0] = -arg[0]; 2561 arg[0] = -arg[0];
2516#else /* emulate common DEC VTs */ 2562#else /* emulate common DEC VTs */
2517 arg[0] = arg[0] ? -arg[0] : -1; 2563 arg[0] = arg[0] ? -arg[0] : -1;
2518#endif 2564#endif
2519 /* FALLTHROUGH */ 2565 /* FALLTHROUGH */
2520 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2566 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2521 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2567 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2522#ifdef ISO6429 2568#ifdef ISO6429
2523 scr_gotorc (0, arg[0], RELATIVE); 2569 scr_gotorc (0, arg[0], RELATIVE);
2524#else /* emulate common DEC VTs */ 2570#else /* emulate common DEC VTs */
2525 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2571 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2526#endif 2572#endif
2527 break; 2573 break;
2528 2574
2529 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2575 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2530 arg[0] = -arg[0]; 2576 arg[0] = -arg[0];
2531 /* FALLTHROUGH */ 2577 /* FALLTHROUGH */
2532 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2578 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2533 scr_gotorc (arg[0], 0, R_RELATIVE); 2579 scr_gotorc (arg[0], 0, R_RELATIVE);
2534 break; 2580 break;
2535 2581
2536 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2582 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2537 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2583 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2538 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2584 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2539 break; 2585 break;
2540 2586
2541 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2587 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2542 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2588 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2543 break; 2589 break;
2544 2590
2545 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2591 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2546 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2592 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2547 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2593 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2548 break; 2594 break;
2549 2595
2550 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2596 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2551 arg[0] = -arg[0]; 2597 arg[0] = -arg[0];
2552 /* FALLTHROUGH */ 2598 /* FALLTHROUGH */
2553 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2599 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2554 scr_tab (arg[0]); 2600 scr_tab (arg[0]);
2555 break; 2601 break;
2556 2602
2557 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2603 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2558 scr_erase_screen (arg[0]); 2604 scr_erase_screen (arg[0]);
2559 break; 2605 break;
2560 2606
2561 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2607 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2562 scr_erase_line (arg[0]); 2608 scr_erase_line (arg[0]);
2563 break; 2609 break;
2564 2610
2565 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2611 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2566 scr_insdel_chars (arg[0], INSERT); 2612 scr_insdel_chars (arg[0], INSERT);
2567 break; 2613 break;
2568 2614
2569 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2615 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2570 scr_insdel_lines (arg[0], INSERT); 2616 scr_insdel_lines (arg[0], INSERT);
2571 break; 2617 break;
2572 2618
2573 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2619 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2574 scr_insdel_lines (arg[0], DELETE); 2620 scr_insdel_lines (arg[0], DELETE);
2575 break; 2621 break;
2576 2622
2577 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2623 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2578 scr_insdel_chars (arg[0], ERASE); 2624 scr_insdel_chars (arg[0], ERASE);
2579 break; 2625 break;
2580 2626
2581 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2627 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2582 scr_insdel_chars (arg[0], DELETE); 2628 scr_insdel_chars (arg[0], DELETE);
2583 break; 2629 break;
2584 2630
2585 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2631 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2586 arg[0] = -arg[0]; 2632 arg[0] = -arg[0];
2587 /* FALLTHROUGH */ 2633 /* FALLTHROUGH */
2588 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2634 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2589 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2635 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2590 break; 2636 break;
2591 2637
2592 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2638 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2593 tt_write((const unsigned char *)VT100_ANS, 2639 tt_write ((const unsigned char *)VT100_ANS,
2594 (unsigned int)(sizeof(VT100_ANS) - 1)); 2640 (unsigned int) (sizeof (VT100_ANS) - 1));
2595 break; 2641 break;
2596 2642
2597 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2643 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2598 process_sgr_mode (nargs, arg); 2644 process_sgr_mode (nargs, arg);
2599 break; 2645 break;
2600 2646
2601 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2647 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2602 switch (arg[0]) { 2648 switch (arg[0])
2649 {
2603 case 5: /* DSR requested */ 2650 case 5: /* DSR requested */
2604 tt_printf("\033[0n"); 2651 tt_printf ("\033[0n");
2605 break; 2652 break;
2606 case 6: /* CPR requested */ 2653 case 6: /* CPR requested */
2607 scr_report_position (); 2654 scr_report_position ();
2608 break; 2655 break;
2609#if defined (ENABLE_DISPLAY_ANSWER) 2656#if defined (ENABLE_DISPLAY_ANSWER)
2610 case 7: /* unofficial extension */ 2657 case 7: /* unofficial extension */
2611 tt_printf("%-.250s\n", rs[Rs_display_name]); 2658 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2612 break; 2659 break;
2613#endif 2660#endif
2614 case 8: /* unofficial extension */ 2661 case 8: /* unofficial extension */
2615 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break;
2664 }
2616 break; 2665 break;
2617 }
2618 break;
2619 2666
2620 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2621 switch (arg[0]) { 2668 switch (arg[0])
2669 {
2622 case 0: /* char tab stop cleared at active position */ 2670 case 0: /* char tab stop cleared at active position */
2623 scr_set_tab (0); 2671 scr_set_tab (0);
2624 break; 2672 break;
2625 /* case 1: */ /* line tab stop cleared in active line */ 2673 /* case 1: */ /* line tab stop cleared in active line */
2626 /* case 2: */ /* char tab stops cleared in active line */ 2674 /* case 2: */ /* char tab stops cleared in active line */
2627 case 3: /* all char tab stops are cleared */ 2675 case 3: /* all char tab stops are cleared */
2628 /* case 4: */ /* all line tab stops are cleared */ 2676 /* case 4: */ /* all line tab stops are cleared */
2629 case 5: /* all tab stops are cleared */ 2677 case 5: /* all tab stops are cleared */
2630 scr_set_tab (-1); 2678 scr_set_tab (-1);
2679 break;
2680 }
2631 break; 2681 break;
2632 }
2633 break;
2634 2682
2635 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2683 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2636 switch (arg[0]) { 2684 switch (arg[0])
2685 {
2637 case 0: /* char tab stop set at active position */ 2686 case 0: /* char tab stop set at active position */
2638 scr_set_tab (1); 2687 scr_set_tab (1);
2639 break; /* = ESC H */ 2688 break; /* = ESC H */
2640 /* case 1: */ /* line tab stop set at active line */ 2689 /* case 1: */ /* line tab stop set at active line */
2641 case 2: /* char tab stop cleared at active position */ 2690 case 2: /* char tab stop cleared at active position */
2642 scr_set_tab (0); 2691 scr_set_tab (0);
2643 break; /* = ESC [ 0 g */ 2692 break; /* = ESC [ 0 g */
2644 /* case 3: */ /* line tab stop cleared at active line */ 2693 /* case 3: */ /* line tab stop cleared at active line */
2645 /* case 4: */ /* char tab stops cleared at active line */ 2694 /* case 4: */ /* char tab stops cleared at active line */
2646 case 5: /* all char tab stops are cleared */ 2695 case 5: /* all char tab stops are cleared */
2647 scr_set_tab (-1); 2696 scr_set_tab (-1);
2648 break; /* = ESC [ 3 g */ 2697 break; /* = ESC [ 3 g */
2649 /* case 6: */ /* all line tab stops are cleared */ 2698 /* case 6: */ /* all line tab stops are cleared */
2650 } 2699 }
2651 break; 2700 break;
2652 2701
2653 case CSI_RM: /* 8.3.107: RESET MODE */ 2702 case CSI_RM: /* 8.3.107: RESET MODE */
2654 if (arg[0] == 4) 2703 if (arg[0] == 4)
2655 scr_insert_mode (0); 2704 scr_insert_mode (0);
2656 break; 2705 break;
2657 2706
2658 case CSI_SM: /* 8.3.126: SET MODE */ 2707 case CSI_SM: /* 8.3.126: SET MODE */
2659 if (arg[0] == 4) 2708 if (arg[0] == 4)
2660 scr_insert_mode (1); 2709 scr_insert_mode (1);
2661 break; 2710 break;
2662 2711
2663/* 2712 /*
2664 * PRIVATE USE beyond this point. All CSI_7? sequences here 2713 * PRIVATE USE beyond this point. All CSI_7? sequences here
2665 */ 2714 */
2666 case CSI_72: /* DECSTBM: set top and bottom margins */ 2715 case CSI_72: /* DECSTBM: set top and bottom margins */
2667 if (nargs == 1) 2716 if (nargs == 1)
2668 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2717 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2669 else if (nargs == 0 || arg[0] >= arg[1]) 2718 else if (nargs == 0 || arg[0] >= arg[1])
2670 scr_scroll_region (0, MAX_ROWS - 1); 2719 scr_scroll_region (0, MAX_ROWS - 1);
2671 else 2720 else
2672 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2721 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2673 break; 2722 break;
2674 2723
2675 case CSI_73: 2724 case CSI_73:
2676 scr_cursor (SAVE); 2725 scr_cursor (SAVE);
2677 break; 2726 break;
2678 case CSI_75: 2727 case CSI_75:
2679 scr_cursor (RESTORE); 2728 scr_cursor (RESTORE);
2680 break; 2729 break;
2681 2730
2682#ifndef NO_FRILLS 2731#ifndef NO_FRILLS
2683 case CSI_74: 2732 case CSI_74:
2684 process_window_ops (arg, nargs); 2733 process_window_ops (arg, nargs);
2685 break; 2734 break;
2686#endif 2735#endif
2687 2736
2688 case CSI_78: /* DECREQTPARM */ 2737 case CSI_78: /* DECREQTPARM */
2689 if (arg[0] == 0 || arg[0] == 1) 2738 if (arg[0] == 0 || arg[0] == 1)
2690 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2691 /* FALLTHROUGH */ 2740 /* FALLTHROUGH */
2692 2741
2693 default: 2742 default:
2694 break; 2743 break;
2695 } 2744 }
2696} 2745}
2697/*}}} */ 2746/*}}} */
2698 2747
2699#ifndef NO_FRILLS 2748#ifndef NO_FRILLS
2700/* ARGSUSED */ 2749/* ARGSUSED */
2701void 2750void
2702rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2751rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2703{ 2752{
2704 int x, y; 2753 int x, y;
2705#if 0 2754#if 0
2706 char *s; 2755 char *s;
2707#endif 2756#endif
2708 XWindowAttributes wattr; 2757 XWindowAttributes wattr;
2709 Window wdummy; 2758 Window wdummy;
2710 2759
2711 if (nargs == 0) 2760 if (nargs == 0)
2712 return; 2761 return;
2713 switch (args[0]) { 2762 switch (args[0])
2763 {
2714 /* 2764 /*
2715 * commands 2765 * commands
2716 */ 2766 */
2717 case 1: /* deiconify window */ 2767 case 1: /* deiconify window */
2718 XMapWindow(Xdisplay, TermWin.parent[0]); 2768 XMapWindow (display->display, TermWin.parent[0]);
2719 break; 2769 break;
2720 case 2: /* iconify window */ 2770 case 2: /* iconify window */
2721 XIconifyWindow(Xdisplay, TermWin.parent[0], 2771 XIconifyWindow (display->display, TermWin.parent[0],
2722 DefaultScreen(Xdisplay)); 2772 DefaultScreen (display->display));
2723 break; 2773 break;
2724 case 3: /* set position (pixels) */ 2774 case 3: /* set position (pixels) */
2725 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2775 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2726 break; 2776 break;
2727 case 4: /* set size (pixels) */ 2777 case 4: /* set size (pixels) */
2728 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2778 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2729 break; 2779 break;
2730 case 5: /* raise window */ 2780 case 5: /* raise window */
2731 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2781 XRaiseWindow (display->display, TermWin.parent[0]);
2732 break; 2782 break;
2733 case 6: /* lower window */ 2783 case 6: /* lower window */
2734 XLowerWindow(Xdisplay, TermWin.parent[0]); 2784 XLowerWindow (display->display, TermWin.parent[0]);
2735 break; 2785 break;
2736 case 7: /* refresh window */ 2786 case 7: /* refresh window */
2737 scr_touch (true); 2787 scr_touch (true);
2738 break; 2788 break;
2739 case 8: /* set size (chars) */ 2789 case 8: /* set size (chars) */
2740 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2741 (unsigned int)(args[1] * TermWin.fheight)); 2791 (unsigned int) (args[1] * TermWin.fheight));
2742 break; 2792 break;
2743 default: 2793 default:
2744 if (args[0] >= 24) /* set height (chars) */ 2794 if (args[0] >= 24) /* set height (chars) */
2745 set_widthheight ((unsigned int)TermWin.width, 2795 set_widthheight ((unsigned int)TermWin.width,
2746 (unsigned int)(args[1] * TermWin.fheight)); 2796 (unsigned int) (args[1] * TermWin.fheight));
2747 break; 2797 break;
2748 /* 2798 /*
2749 * reports - some output format copied from XTerm 2799 * reports - some output format copied from XTerm
2750 */ 2800 */
2751 case 11: /* report window state */ 2801 case 11: /* report window state */
2752 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2753 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2754 break; 2804 break;
2755 case 13: /* report window position */ 2805 case 13: /* report window position */
2756 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2757 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2758 -wattr.border_width, -wattr.border_width, 2808 -wattr.border_width, -wattr.border_width,
2759 &x, &y, &wdummy); 2809 &x, &y, &wdummy);
2760 tt_printf("\033[3;%d;%dt", x, y); 2810 tt_printf ("\033[3;%d;%dt", x, y);
2761 break; 2811 break;
2762 case 14: /* report window size (pixels) */ 2812 case 14: /* report window size (pixels) */
2763 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2764 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2765 break; 2815 break;
2766 case 18: /* report window size (chars) */ 2816 case 18: /* report window size (chars) */
2767 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2768 break; 2818 break;
2769#if 0 /* XXX: currently disabled due to security concerns */ 2819#if 0 /* XXX: currently disabled due to security concerns */
2770 case 20: /* report icon label */ 2820 case 20: /* report icon label */
2771 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2821 XGetIconName (display->display, TermWin.parent[0], &s);
2772 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2773 break; 2823 break;
2774 case 21: /* report window title */ 2824 case 21: /* report window title */
2775 XFetchName(Xdisplay, TermWin.parent[0], &s); 2825 XFetchName (display->display, TermWin.parent[0], &s);
2776 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2777 break; 2827 break;
2778#endif 2828#endif
2829
2779 } 2830 }
2780} 2831}
2781#endif 2832#endif
2782 2833
2783/*----------------------------------------------------------------------*/ 2834/*----------------------------------------------------------------------*/
2784/* 2835/*
2785 * get input up until STRING TERMINATOR (or BEL) 2836 * get input up until STRING TERMINATOR (or BEL)
2786 * ends_how is terminator used. returned input must be free()d 2837 * ends_how is terminator used. returned input must be free ()d
2787 */ 2838 */
2788unsigned char * 2839unsigned char *
2789rxvt_term::get_to_st (unsigned char *ends_how) 2840rxvt_term::get_to_st (unsigned char *ends_how)
2790{ 2841{
2791 int seen_esc = 0; /* seen escape? */ 2842 int seen_esc = 0; /* seen escape? */
2792 unsigned int n = 0; 2843 unsigned int n = 0;
2793 unsigned char *s; 2844 unsigned char *s;
2794 unsigned char ch, string[STRING_MAX]; 2845 unsigned char ch, string[STRING_MAX];
2795 2846
2796 for (; (ch = cmd_getc ());) { 2847 for (; (ch = cmd_getc ());)
2848 {
2797 if (ch == C0_BEL 2849 if (ch == C0_BEL
2798 || ch == CHAR_ST 2850 || ch == CHAR_ST
2799 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2800 break; 2852 break;
2801 if (ch == C0_ESC) { 2853 if (ch == C0_ESC)
2854 {
2802 seen_esc = 1; 2855 seen_esc = 1;
2803 continue; 2856 continue;
2857 }
2804 } else if (ch == '\t') 2858 else if (ch == '\t')
2805 ch = ' '; /* translate '\t' to space */ 2859 ch = ' '; /* translate '\t' to space */
2806 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2807 return NULL; /* other control character - exit */ 2861 return NULL; /* other control character - exit */
2808 if (n < sizeof(string) - 1) 2862 if (n < sizeof (string) - 1)
2809 string[n++] = ch; 2863 string[n++] = ch;
2810 seen_esc = 0; 2864 seen_esc = 0;
2811 } 2865 }
2812 string[n++] = '\0'; 2866 string[n++] = '\0';
2813 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2814 return NULL; 2868 return NULL;
2815 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2869 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2816 STRNCPY(s, string, n); 2870 STRNCPY (s, string, n);
2817 return s; 2871 return s;
2818} 2872}
2819 2873
2820/*----------------------------------------------------------------------*/ 2874/*----------------------------------------------------------------------*/
2821/* 2875/*
2822 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2823 */ 2877 */
2824void 2878void
2825rxvt_term::process_dcs_seq () 2879rxvt_term::process_dcs_seq ()
2826{ 2880{
2827 unsigned char eh, *s; 2881 unsigned char eh, *s;
2828/* 2882 /*
2829 * Not handled yet 2883 * Not handled yet
2830 */ 2884 */
2831 s = get_to_st (&eh); 2885 s = get_to_st (&eh);
2832 if (s) 2886 if (s)
2833 free(s); 2887 free (s);
2834 return; 2888 return;
2835} 2889}
2836 2890
2837/*----------------------------------------------------------------------*/ 2891/*----------------------------------------------------------------------*/
2838/* 2892/*
2839 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2840 */ 2894 */
2841void 2895void
2842rxvt_term::process_osc_seq () 2896rxvt_term::process_osc_seq ()
2843{ 2897{
2844 unsigned char ch, eh, *s; 2898 unsigned char ch, eh, *s;
2845 int arg; 2899 int arg;
2846 2900
2847 ch = cmd_getc (); 2901 ch = cmd_getc ();
2848 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2902 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2849 arg = arg * 10 + (ch - '0'); 2903 arg = arg * 10 + (ch - '0');
2850 2904
2851 if (ch == ';') { 2905 if (ch == ';')
2906 {
2852 s = get_to_st (&eh); 2907 s = get_to_st (&eh);
2853 if (s) { 2908 if (s)
2854 /* 2909 {
2910 /*
2855 * rxvt_menubar_dispatch() violates the constness of the string, 2911 * rxvt_menubar_dispatch () violates the constness of the string,
2856 * so do it here 2912 * so do it here
2857 */ 2913 */
2858 if (arg == XTerm_Menu) 2914 if (arg == XTerm_Menu)
2859#if 0 /* XXX: currently disabled due to security concerns */ 2915#if 0 /* XXX: currently disabled due to security concerns */
2860 menubar_dispatch ((char *)s); 2916 menubar_dispatch ((char *)s);
2861#else 2917#else
2862 (void)0; 2918 (void)0;
2863#endif 2919#endif
2864 else 2920 else
2865 xterm_seq (arg, (char *)s, eh); 2921 xterm_seq (arg, (char *)s, eh);
2866 free(s); 2922 free (s);
2867 } 2923 }
2868 } 2924 }
2869} 2925}
2870/* 2926/*
2871 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2872 * 0 = change iconName/title 2928 * 0 = change iconName/title
… …
2880 * 19 = change underlined character color 2936 * 19 = change underlined character color
2881 * 46 = change logfile (not implemented) 2937 * 46 = change logfile (not implemented)
2882 * 50 = change font 2938 * 50 = change font
2883 * 2939 *
2884 * rxvt extensions: 2940 * rxvt extensions:
2941 * 9 = change locale (NYI)
2885 * 10 = menu (may change in future) 2942 * 10 = menu (may change in future)
2886 * 20 = bg pixmap 2943 * 20 = bg pixmap
2887 * 39 = change default fg color 2944 * 39 = change default fg color
2888 * 49 = change default bg color 2945 * 49 = change default bg color
2889 * 55 = dump scrollback buffer and all of screen 2946 * 55 = dump scrollback buffer and all of screen
2890 */ 2947 */
2891void 2948void
2892rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2893{ 2950{
2894 int changed = 0; 2951 int changed = 0;
2895 int color; 2952 int color;
2896 char *buf, *name; 2953 char *buf, *name;
2897 2954
2898 assert(str != NULL); 2955 assert (str != NULL);
2899 switch (op) { 2956 switch (op)
2957 {
2900 case XTerm_name: 2958 case XTerm_name:
2901 set_title (str); 2959 set_title (str);
2902 /* FALLTHROUGH */ 2960 /* FALLTHROUGH */
2903 case XTerm_iconName: 2961 case XTerm_iconName:
2904 set_iconName (str); 2962 set_iconName (str);
2905 break; 2963 break;
2906 case XTerm_title: 2964 case XTerm_title:
2907 set_title (str); 2965 set_title (str);
2908 break; 2966 break;
2909 case XTerm_Color: 2967 case XTerm_Color:
2910 for (buf = (char *)str; buf && *buf;) { 2968 for (buf = (char *)str; buf && *buf;)
2969 {
2911 if ((name = STRCHR(buf, ';')) == NULL) 2970 if ((name = STRCHR (buf, ';')) == NULL)
2912 break; 2971 break;
2913 *name++ = '\0'; 2972 *name++ = '\0';
2914 color = atoi(buf); 2973 color = atoi (buf);
2915 if (color < 0 || color >= TOTAL_COLORS) 2974 if (color < 0 || color >= TOTAL_COLORS)
2916 break; 2975 break;
2917 if ((buf = STRCHR(name, ';')) != NULL) 2976 if ((buf = STRCHR (name, ';')) != NULL)
2918 *buf++ = '\0'; 2977 *buf++ = '\0';
2919 set_window_color (color + minCOLOR, name); 2978 set_window_color (color + minCOLOR, name);
2920 } 2979 }
2921 break; 2980 break;
2922#ifndef NO_CURSORCOLOR 2981#ifndef NO_CURSORCOLOR
2923 case XTerm_Color_cursor: 2982 case XTerm_Color_cursor:
2924 set_window_color (Color_cursor, str); 2983 set_window_color (Color_cursor, str);
2925 break; 2984 break;
2926#endif 2985#endif
2927 case XTerm_Color_pointer: 2986 case XTerm_Color_pointer:
2928 set_window_color (Color_pointer, str); 2987 set_window_color (Color_pointer, str);
2929 break; 2988 break;
2930#ifndef NO_BOLD_UNDERLINE_REVERSE 2989#ifndef NO_BOLD_UNDERLINE_REVERSE
2931 case XTerm_Color_BD: 2990 case XTerm_Color_BD:
2932 set_window_color (Color_BD, str); 2991 set_window_color (Color_BD, str);
2933 break; 2992 break;
2934 case XTerm_Color_UL: 2993 case XTerm_Color_UL:
2935 set_window_color (Color_UL, str); 2994 set_window_color (Color_UL, str);
2936 break; 2995 break;
2937 case XTerm_Color_RV: 2996 case XTerm_Color_RV:
2938 set_window_color (Color_RV, str); 2997 set_window_color (Color_RV, str);
2939 break; 2998 break;
2940#endif 2999#endif
2941 3000
2942 case XTerm_Menu: 3001 case XTerm_Menu:
2943 /* 3002 /*
2944 * rxvt_menubar_dispatch() violates the constness of the string, 3003 * rxvt_menubar_dispatch () violates the constness of the string,
2945 * so DON'T do it here 3004 * so DON'T do it here
2946 */ 3005 */
2947 break; 3006 break;
2948 case XTerm_Pixmap: 3007 case XTerm_Pixmap:
2949 if (*str != ';') { 3008 if (*str != ';')
3009 {
2950#if XPM_BACKGROUND 3010#if XPM_BACKGROUND
2951 scale_pixmap (""); /* reset to default scaling */ 3011 scale_pixmap (""); /* reset to default scaling */
2952 set_bgPixmap (str); /* change pixmap */ 3012 set_bgPixmap (str); /* change pixmap */
2953#endif 3013#endif
2954 scr_touch (true); 3014 scr_touch (true);
2955 } 3015 }
2956 while ((str = STRCHR(str, ';')) != NULL) { 3016 while ((str = STRCHR (str, ';')) != NULL)
2957 str++; 3017 {
3018 str++;
2958#if XPM_BACKGROUND 3019#if XPM_BACKGROUND
2959 changed += scale_pixmap (str); 3020 changed += scale_pixmap (str);
2960#endif 3021#endif
2961 } 3022
2962 if (changed) { 3023 }
3024 if (changed)
3025 {
2963#ifdef XPM_BACKGROUND 3026#ifdef XPM_BACKGROUND
2964 resize_pixmap (); 3027 resize_pixmap ();
2965#endif 3028#endif
2966 scr_touch (true); 3029 scr_touch (true);
2967 } 3030 }
2968 break; 3031 break;
2969 3032
2970 case XTerm_restoreFG: 3033 case XTerm_restoreFG:
2971 set_window_color (Color_fg, str); 3034 set_window_color (Color_fg, str);
2972 break; 3035 break;
2973 case XTerm_restoreBG: 3036 case XTerm_restoreBG:
2974 set_window_color (Color_bg, str); 3037 set_window_color (Color_bg, str);
2975 break; 3038 break;
2976 case XTerm_logfile: 3039 case XTerm_logfile:
2977 break; 3040 break;
2978 case XTerm_font: 3041 case XTerm_font:
2979 change_font (0, str); 3042 change_font (str);
2980 break; 3043 break;
3044#ifndef NO_FRILLS
3045 case XTerm_locale:
3046 if (str[0] == '?' && !str[1])
3047 tt_printf ("%-.250s\n", locale);
3048 else
3049 {
3050 set_locale (str);
3051# ifdef USE_XIM
3052 im_cb ();
3053# endif
3054 // TODO: call selection_make with the right values set
3055 // to re-fresh the selection.
3056 if (display->selection_owner == this)
3057 display->set_selection_owner (0);
3058 }
3059 break;
3060#endif
2981#if 0 3061#if 0
2982 case XTerm_dumpscreen: /* no error notices */ 3062 case XTerm_dumpscreen: /* no error notices */
2983 { 3063 {
2984 int fd; 3064 int fd;
2985 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2986 scr_dump (fd); 3066 {
2987 close(fd); 3067 scr_dump (fd);
2988 } 3068 close (fd);
2989 } 3069 }
2990 break; 3070 }
3071 break;
2991#endif 3072#endif
3073
2992 } 3074 }
2993} 3075}
2994/*----------------------------------------------------------------------*/ 3076/*----------------------------------------------------------------------*/
2995 3077
2996/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3004 * so no need for fancy checking 3086 * so no need for fancy checking
3005 */ 3087 */
3006int 3088int
3007rxvt_term::privcases (int mode, unsigned long bit) 3089rxvt_term::privcases (int mode, unsigned long bit)
3008{ 3090{
3009 int state; 3091 int state;
3010 3092
3011 if (mode == 's') { 3093 if (mode == 's')
3094 {
3012 SavedModes |= (PrivateModes & bit); 3095 SavedModes |= (PrivateModes & bit);
3013 return -1; 3096 return -1;
3014 } else { 3097 }
3098 else
3099 {
3015 if (mode == 'r') 3100 if (mode == 'r')
3016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3017 else 3102 else
3018 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3019 PrivMode(state, bit); 3104 PrivMode (state, bit);
3020 } 3105 }
3021 return state; 3106 return state;
3022} 3107}
3023 3108
3024/* we're not using priv _yet_ */ 3109/* we're not using priv _yet_ */
3025void 3110void
3026rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3027{ 3112{
3028 unsigned int i, j; 3113 unsigned int i, j;
3029 int state; 3114 int state;
3030 static const struct { 3115 static const struct
3116 {
3031 const int argval; 3117 const int argval;
3032 const unsigned long bit; 3118 const unsigned long bit;
3119 }
3033 } argtopriv[] = { 3120 argtopriv[] = {
3034 { 1, PrivMode_aplCUR }, 3121 { 1, PrivMode_aplCUR },
3035 { 2, PrivMode_vt52 }, 3122 { 2, PrivMode_vt52 },
3036 { 3, PrivMode_132 }, 3123 { 3, PrivMode_132 },
3037 { 4, PrivMode_smoothScroll }, 3124 { 4, PrivMode_smoothScroll },
3038 { 5, PrivMode_rVideo }, 3125 { 5, PrivMode_rVideo },
3039 { 6, PrivMode_relOrigin }, 3126 { 6, PrivMode_relOrigin },
3040 { 7, PrivMode_Autowrap }, 3127 { 7, PrivMode_Autowrap },
3041 { 9, PrivMode_MouseX10 }, 3128 { 9, PrivMode_MouseX10 },
3042#ifdef menuBar_esc 3129#ifdef menuBar_esc
3043 { menuBar_esc, PrivMode_menuBar }, 3130 { menuBar_esc, PrivMode_menuBar },
3044#endif 3131#endif
3045#ifdef scrollBar_esc 3132#ifdef scrollBar_esc
3046 { scrollBar_esc, PrivMode_scrollBar }, 3133 { scrollBar_esc, PrivMode_scrollBar },
3047#endif 3134#endif
3048 { 25, PrivMode_VisibleCursor }, 3135 { 25, PrivMode_VisibleCursor },
3049 { 35, PrivMode_ShiftKeys }, 3136 { 35, PrivMode_ShiftKeys },
3050 { 40, PrivMode_132OK }, 3137 { 40, PrivMode_132OK },
3051 { 47, PrivMode_Screen }, 3138 { 47, PrivMode_Screen },
3052 { 66, PrivMode_aplKP }, 3139 { 66, PrivMode_aplKP },
3053#ifndef NO_BACKSPACE_KEY 3140#ifndef NO_BACKSPACE_KEY
3054 { 67, PrivMode_BackSpace }, 3141 { 67, PrivMode_BackSpace },
3055#endif 3142#endif
3056 { 1000, PrivMode_MouseX11 }, 3143 { 1000, PrivMode_MouseX11 },
3057 { 1010, PrivMode_TtyOutputInh }, 3144 { 1010, PrivMode_TtyOutputInh },
3058 { 1011, PrivMode_Keypress }, 3145 { 1011, PrivMode_Keypress },
3059 { 1047, PrivMode_Screen }, 3146 { 1047, PrivMode_Screen },
3060 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3061 }; 3148 };
3062 3149
3063 if (nargs == 0) 3150 if (nargs == 0)
3064 return; 3151 return;
3065 3152
3066/* make lo/hi boolean */ 3153 /* make lo/hi boolean */
3067 if (mode == 'l') 3154 if (mode == 'l')
3068 mode = 0; /* reset */ 3155 mode = 0; /* reset */
3069 else if (mode == 'h') 3156 else if (mode == 'h')
3070 mode = 1; /* set */ 3157 mode = 1; /* set */
3071 3158
3072 for (i = 0; i < nargs; i++) { 3159 for (i = 0; i < nargs; i++)
3160 {
3073 state = -1; 3161 state = -1;
3074 3162
3075 /* basic handling */ 3163 /* basic handling */
3076 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3164 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3077 if (argtopriv[j].argval == arg[i]) { 3165 if (argtopriv[j].argval == arg[i])
3166 {
3078 state = privcases (mode, argtopriv[j].bit); 3167 state = privcases (mode, argtopriv[j].bit);
3079 break; 3168 break;
3080 } 3169 }
3081 3170
3082 /* extra handling for values with state unkept */ 3171 /* extra handling for values with state unkept */
3083 if (state == -1) 3172 if (state == -1)
3084 switch (arg[i]) { 3173 switch (arg[i])
3174 {
3085 case 1048: /* alternative cursor save */ 3175 case 1048: /* alternative cursor save */
3086 if (mode == 0) 3176 if (mode == 0)
3087 scr_cursor (RESTORE); 3177 scr_cursor (RESTORE);
3088 else if (mode == 1) 3178 else if (mode == 1)
3089 scr_cursor (SAVE); 3179 scr_cursor (SAVE);
3090 /* FALLTHROUGH */ 3180 /* FALLTHROUGH */
3091 default: 3181 default:
3092 continue; /* for(;i;) */ 3182 continue; /* for (;i;) */
3093 } 3183 }
3094 3184
3095 /* extra handling for values with valid 0 or 1 state */ 3185 /* extra handling for values with valid 0 or 1 state */
3096 switch (arg[i]) { 3186 switch (arg[i])
3187 {
3097 /* case 1: - application cursor keys */ 3188 /* case 1: - application cursor keys */
3098 case 2: /* VT52 mode */ 3189 case 2: /* VT52 mode */
3099 /* oddball mode. should be set regardless of set/reset 3190 /* oddball mode. should be set regardless of set/reset
3100 * parameter. Return from VT52 mode with an ESC < from 3191 * parameter. Return from VT52 mode with an ESC < from
3101 * within VT52 mode 3192 * within VT52 mode
3102 */ 3193 */
3103 PrivMode(1, PrivMode_vt52); 3194 PrivMode (1, PrivMode_vt52);
3104 break; 3195 break;
3105 case 3: /* 80/132 */ 3196 case 3: /* 80/132 */
3106 if (PrivateModes & PrivMode_132OK) 3197 if (PrivateModes & PrivMode_132OK)
3107 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3108 (unsigned int)TermWin.height); 3199 (unsigned int)TermWin.height);
3109 break; 3200 break;
3110 case 4: /* smooth scrolling */ 3201 case 4: /* smooth scrolling */
3111 if (state) 3202 if (state)
3112 Options &= ~Opt_jumpScroll; 3203 Options &= ~Opt_jumpScroll;
3113 else 3204 else
3114 Options |= Opt_jumpScroll; 3205 Options |= Opt_jumpScroll;
3115 break; 3206 break;
3116 case 5: /* reverse video */ 3207 case 5: /* reverse video */
3117 scr_rvideo_mode (state); 3208 scr_rvideo_mode (state);
3118 break; 3209 break;
3119 case 6: /* relative/absolute origins */ 3210 case 6: /* relative/absolute origins */
3120 scr_relative_origin (state); 3211 scr_relative_origin (state);
3121 break; 3212 break;
3122 case 7: /* autowrap */ 3213 case 7: /* autowrap */
3123 scr_autowrap (state); 3214 scr_autowrap (state);
3124 break; 3215 break;
3125 /* case 8: - auto repeat, can't do on a per window basis */ 3216 /* case 8: - auto repeat, can't do on a per window basis */
3126 case 9: /* X10 mouse reporting */ 3217 case 9: /* X10 mouse reporting */
3127 if (state) /* orthogonal */ 3218 if (state) /* orthogonal */
3128 PrivateModes &= ~(PrivMode_MouseX11); 3219 PrivateModes &= ~ (PrivMode_MouseX11);
3129 break; 3220 break;
3130#ifdef menuBar_esc 3221#ifdef menuBar_esc
3131 case menuBar_esc: 3222 case menuBar_esc:
3132#ifdef MENUBAR 3223#ifdef MENUBAR
3133 map_menuBar (state); 3224 map_menuBar (state);
3134#endif 3225#endif
3135 break; 3226 break;
3136#endif 3227#endif
3137#ifdef scrollBar_esc 3228#ifdef scrollBar_esc
3138 case scrollBar_esc: 3229 case scrollBar_esc:
3139 if (scrollbar_mapping (state)) { 3230 if (scrollbar_mapping (state))
3231 {
3140 resize_all_windows (0, 0, 0); 3232 resize_all_windows (0, 0, 0);
3141 scr_touch (true); 3233 scr_touch (true);
3142 } 3234 }
3143 break; 3235 break;
3144#endif 3236#endif
3145 case 25: /* visible/invisible cursor */ 3237 case 25: /* visible/invisible cursor */
3146 scr_cursor_visible (state); 3238 scr_cursor_visible (state);
3147 break; 3239 break;
3148 /* case 35: - shift keys */ 3240 /* case 35: - shift keys */
3149 /* case 40: - 80 <--> 132 mode */ 3241 /* case 40: - 80 <--> 132 mode */
3150 case 47: /* secondary screen */ 3242 case 47: /* secondary screen */
3151 scr_change_screen (state); 3243 scr_change_screen (state);
3152 break; 3244 break;
3153 /* case 66: - application key pad */ 3245 /* case 66: - application key pad */
3154 /* case 67: - backspace key */ 3246 /* case 67: - backspace key */
3155 case 1000: /* X11 mouse reporting */ 3247 case 1000: /* X11 mouse reporting */
3156 if (state) /* orthogonal */ 3248 if (state) /* orthogonal */
3157 PrivateModes &= ~(PrivMode_MouseX10); 3249 PrivateModes &= ~ (PrivMode_MouseX10);
3158 break; 3250 break;
3159#if 0 3251#if 0
3160 case 1001: 3252 case 1001:
3161 break; /* X11 mouse highlighting */ 3253 break; /* X11 mouse highlighting */
3162#endif 3254#endif
3163 case 1010: /* scroll to bottom on TTY output inhibit */ 3255 case 1010: /* scroll to bottom on TTY output inhibit */
3164 if (state) 3256 if (state)
3165 Options &= ~Opt_scrollTtyOutput; 3257 Options &= ~Opt_scrollTtyOutput;
3166 else 3258 else
3167 Options |= Opt_scrollTtyOutput; 3259 Options |= Opt_scrollTtyOutput;
3168 break; 3260 break;
3169 case 1011: /* scroll to bottom on key press */ 3261 case 1011: /* scroll to bottom on key press */
3170 if (state) 3262 if (state)
3171 Options |= Opt_scrollTtyKeypress; 3263 Options |= Opt_scrollTtyKeypress;
3172 else 3264 else
3173 Options &= ~Opt_scrollTtyKeypress; 3265 Options &= ~Opt_scrollTtyKeypress;
3174 break; 3266 break;
3175 case 1047: /* secondary screen w/ clearing */ 3267 case 1047: /* secondary screen w/ clearing */
3176 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3177 if (current_screen != PRIMARY) 3269 if (current_screen != PRIMARY)
3178 scr_erase_screen (2); 3270 scr_erase_screen (2);
3179 scr_change_screen (state); 3271 scr_change_screen (state);
3180 /* FALLTHROUGH */ 3272 /* FALLTHROUGH */
3181 default: 3273 default:
3182 break; 3274 break;
3183 } 3275 }
3184 } 3276 }
3185} 3277}
3186/*}}} */ 3278/*}}} */
3187 3279
3188/*{{{ process sgr sequences */ 3280/*{{{ process sgr sequences */
3189void 3281void
3190rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3191{ 3283{
3192 unsigned int i; 3284 unsigned int i;
3193 short rendset; 3285 short rendset;
3194 int rendstyle; 3286 int rendstyle;
3195 3287
3196 if (nargs == 0) { 3288 if (nargs == 0)
3289 {
3197 scr_rendition (0, ~RS_None); 3290 scr_rendition (0, ~RS_None);
3198 return; 3291 return;
3199 } 3292 }
3200 for (i = 0; i < nargs; i++) { 3293 for (i = 0; i < nargs; i++)
3294 {
3201 rendset = -1; 3295 rendset = -1;
3202 switch (arg[i]) { 3296 switch (arg[i])
3203 case 0: 3297 {
3298 case 0:
3204 rendset = 0, rendstyle = ~RS_None; 3299 rendset = 0, rendstyle = ~RS_None;
3205 break; 3300 break;
3206 case 1: 3301 case 1:
3207 rendset = 1, rendstyle = RS_Bold; 3302 rendset = 1, rendstyle = RS_Bold;
3208 break; 3303 break;
3209 case 4: 3304 case 4:
3210 rendset = 1, rendstyle = RS_Uline; 3305 rendset = 1, rendstyle = RS_Uline;
3211 break; 3306 break;
3212 case 5: 3307 case 5:
3213 rendset = 1, rendstyle = RS_Blink; 3308 rendset = 1, rendstyle = RS_Blink;
3214 break; 3309 break;
3215 case 7: 3310 case 7:
3216 rendset = 1, rendstyle = RS_RVid; 3311 rendset = 1, rendstyle = RS_RVid;
3217 break; 3312 break;
3218 case 22: 3313 case 22:
3219 rendset = 0, rendstyle = RS_Bold; 3314 rendset = 0, rendstyle = RS_Bold;
3220 break; 3315 break;
3221 case 24: 3316 case 24:
3222 rendset = 0, rendstyle = RS_Uline; 3317 rendset = 0, rendstyle = RS_Uline;
3223 break; 3318 break;
3224 case 25: 3319 case 25:
3225 rendset = 0, rendstyle = RS_Blink; 3320 rendset = 0, rendstyle = RS_Blink;
3226 break; 3321 break;
3227 case 27: 3322 case 27:
3228 rendset = 0, rendstyle = RS_RVid; 3323 rendset = 0, rendstyle = RS_RVid;
3229 break; 3324 break;
3230 } 3325 }
3231 if (rendset != -1) { 3326 if (rendset != -1)
3327 {
3232 scr_rendition (rendset, rendstyle); 3328 scr_rendition (rendset, rendstyle);
3233 continue; /* for(;i;) */ 3329 continue; /* for (;i;) */
3234 } 3330 }
3235 3331
3236 switch (arg[i]) { 3332 switch (arg[i])
3237 case 30: 3333 {
3334 case 30:
3238 case 31: /* set fg color */ 3335 case 31: /* set fg color */
3239 case 32: 3336 case 32:
3240 case 33: 3337 case 33:
3241 case 34: 3338 case 34:
3242 case 35: 3339 case 35:
3243 case 36: 3340 case 36:
3244 case 37: 3341 case 37:
3245 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3246 Color_fg); 3343 Color_fg);
3247 break; 3344 break;
3248#ifdef TTY_256COLOR 3345#ifdef TTY_256COLOR
3249 case 38: 3346 case 38:
3250 if (nargs > i + 2 && arg[i + 1] == 5) { 3347 if (nargs > i + 2 && arg[i + 1] == 5)
3348 {
3251 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3252 Color_fg); 3350 Color_fg);
3253 i += 2; 3351 i += 2;
3254 } 3352 }
3255 break; 3353 break;
3256#endif 3354#endif
3257 case 39: /* default fg */ 3355 case 39: /* default fg */
3258 scr_color (Color_fg, Color_fg); 3356 scr_color (Color_fg, Color_fg);
3259 break; 3357 break;
3260 3358
3261 case 40: 3359 case 40:
3262 case 41: /* set bg color */ 3360 case 41: /* set bg color */
3263 case 42: 3361 case 42:
3264 case 43: 3362 case 43:
3265 case 44: 3363 case 44:
3266 case 45: 3364 case 45:
3267 case 46: 3365 case 46:
3268 case 47: 3366 case 47:
3269 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3270 Color_bg); 3368 Color_bg);
3271 break; 3369 break;
3272#ifdef TTY_256COLOR 3370#ifdef TTY_256COLOR
3273 case 48: 3371 case 48:
3274 if (nargs > i + 2 && arg[i + 1] == 5) { 3372 if (nargs > i + 2 && arg[i + 1] == 5)
3373 {
3275 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3276 Color_bg); 3375 Color_bg);
3277 i += 2; 3376 i += 2;
3278 } 3377 }
3279 break; 3378 break;
3280#endif 3379#endif
3281 case 49: /* default bg */ 3380 case 49: /* default bg */
3282 scr_color (Color_bg, Color_bg); 3381 scr_color (Color_bg, Color_bg);
3283 break; 3382 break;
3284 3383
3285#ifndef NO_BRIGHTCOLOR 3384#ifndef NO_BRIGHTCOLOR
3286 case 90: 3385 case 90:
3287 case 91: /* set bright fg color */ 3386 case 91: /* set bright fg color */
3288 case 92: 3387 case 92:
3289 case 93: 3388 case 93:
3290 case 94: 3389 case 94:
3291 case 95: 3390 case 95:
3292 case 96: 3391 case 96:
3293 case 97: 3392 case 97:
3294 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3295 Color_fg); 3394 Color_fg);
3296 break; 3395 break;
3297 case 100: 3396 case 100:
3298 case 101: /* set bright bg color */ 3397 case 101: /* set bright bg color */
3299 case 102: 3398 case 102:
3300 case 103: 3399 case 103:
3301 case 104: 3400 case 104:
3302 case 105: 3401 case 105:
3303 case 106: 3402 case 106:
3304 case 107: 3403 case 107:
3305 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3306 Color_bg); 3405 Color_bg);
3307 break; 3406 break;
3308#endif 3407#endif
3309 } 3408
3409 }
3310 } 3410 }
3311} 3411}
3312/*}}} */ 3412/*}}} */
3313 3413
3314/*{{{ process Rob Nation's own graphics mode sequences */ 3414/*{{{ process Rob Nation's own graphics mode sequences */
3315void 3415void
3316rxvt_term::process_graphics () 3416rxvt_term::process_graphics ()
3317{ 3417{
3318 unsigned char ch, cmd = cmd_getc (); 3418 unsigned char ch, cmd = cmd_getc ();
3319 3419
3320#ifndef RXVT_GRAPHICS 3420 if (cmd == 'Q')
3321 if (cmd == 'Q') { /* query graphics */ 3421 { /* query graphics */
3322 tt_printf("\033G0\n"); /* no graphics */ 3422 tt_printf ("\033G0\n"); /* no graphics */
3323 return; 3423 return;
3324 } 3424 }
3325/* swallow other graphics sequences until terminating ':' */ 3425 /* swallow other graphics sequences until terminating ':' */
3326 do 3426 do
3327 ch = cmd_getc ();
3328 while (ch != ':');
3329#else
3330 unsigned int nargs;
3331 int args[NGRX_PTS];
3332 unsigned char *text = NULL;
3333
3334 if (cmd == 'Q') { /* query graphics */
3335 tt_printf("\033G1\n"); /* yes, graphics (color) */
3336 return;
3337 }
3338 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3339 int neg;
3340
3341 ch = cmd_getc ();
3342 neg = (ch == '-');
3343 if (neg || ch == '+')
3344 ch = cmd_getc (); 3427 ch = cmd_getc ();
3345 3428 while (ch != ':');
3346 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3347 args[nargs] = args[nargs] * 10 + (ch - '0');
3348 if (neg)
3349 args[nargs] = -args[nargs];
3350
3351 nargs++;
3352 args[nargs] = 0;
3353 if (ch != ';')
3354 break;
3355 }
3356
3357 if ((cmd == 'T') && (nargs >= 5)) {
3358 int i, len = args[4];
3359
3360 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3361
3362 if (text != NULL) {
3363 for (i = 0; i < len; i++)
3364 text[i] = cmd_getc ();
3365 text[len] = '\0';
3366 }
3367 }
3368 Gr_do_graphics (cmd, nargs, args, text);
3369#endif
3370} 3429}
3371/*}}} */ 3430/*}}} */
3372 3431
3373/* ------------------------------------------------------------------------- */ 3432/* ------------------------------------------------------------------------- */
3374 3433
3375/* 3434/*
3376 * Send printf() formatted output to the command. 3435 * Send printf () formatted output to the command.
3377 * Only use for small amounts of data. 3436 * Only use for small amounts of data.
3378 */ 3437 */
3379void 3438void
3380rxvt_term::tt_printf (const char *fmt,...) 3439rxvt_term::tt_printf (const char *fmt,...)
3381{ 3440{

Diff Legend

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