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.13 by pcg, Fri Dec 5 04:27:20 2003 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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