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.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.60 by pcg, Fri Feb 27 02:52:51 2004 UTC

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

Diff Legend

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