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.30 by pcg, Thu Jan 29 21:35:58 2004 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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