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.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC

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

Diff Legend

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