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.26 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.81 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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