ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.13 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.43 by pcg, Tue Feb 24 00:02:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.13 2003/12/17 09:00:35 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 102 incr_ev (this, &rxvt_term::incr_cb)
74{ 103{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
76} 105}
77 106
78rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
79{ 108{
80 scr_release ();
81
82#ifndef NO_SETOWNER_TTYDEV
83 rxvt_privileged_ttydev (this, RESTORE);
84#endif
85#ifdef UTMP_SUPPORT
86 rxvt_privileged_utmp (this, RESTORE);
87#endif
88#ifdef USE_XIM
89 if (Input_Context != NULL)
90 {
91 XDestroyIC (Input_Context);
92 Input_Context = NULL;
93 }
94#endif
95
96 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
97 close (cmd_fd); 110 close (cmd_fd);
98 111
99 if (Xfd >= 0) 112#ifndef NO_SETOWNER_TTYDEV
100 XCloseDisplay (Xdisplay); 113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
101 126
102 delete PixColors; 127 delete PixColors;
128
129 displays.put (display);
130
131 scr_release ();
132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
137 free (locale);
138 free (codeset);
139
140 delete envv;
141 delete argv;
103} 142}
104 143
105void 144void
106rxvt_term::destroy () 145rxvt_term::destroy ()
107{ 146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 }
163
108 check_ev.stop (); 164 check_ev.stop ();
109 pty_ev.stop (); 165 pty_ev.stop ();
110 x_ev.stop ();
111#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
112 blink_ev.stop (); 170 text_blink_ev.stop ();
113#endif 171#endif
114#ifdef POINTER_BLANK 172#ifdef POINTER_BLANK
115 pointer_ev.stop (); 173 pointer_ev.stop ();
116#endif 174#endif
117 175
125 183
126 delete this; 184 delete this;
127} 185}
128 186
129/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
130/* rxvt_init() */ 188/* rxvt_init () */
131/* LIBPROTO */ 189/* LIBPROTO */
132rxvt_t 190rxvt_t
133rxvt_init (int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
134{ 192{
135 SET_R (new rxvt_term); 193 SET_R (new rxvt_term);
136 dR;
137 194
138 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
139 { 196 {
140 delete R; 197 delete GET_R;
141 return NULL; 198 SET_R (0);
142 } 199 }
143 200
144 return R; 201 return GET_R;
145} 202}
146 203
147/* EXTPROTO */ 204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
148void 206void
149rxvt_init_signals () 207rxvt_init_signals ()
150{ 208{
151/* install exit handler for cleanup */ 209 /* install exit handler for cleanup */
152#if 0 210#if 0
153#ifdef HAVE_ATEXIT 211#ifdef HAVE_ATEXIT
154 atexit(rxvt_clean_exit); 212 atexit (rxvt_clean_exit);
155#else 213#else
156#endif 214#endif
157#endif 215#endif
158 216
159 struct sigaction sa; 217 struct sigaction sa;
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
167 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
168 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
169 227
170/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
171/* signal (SIGURG, SIG_DFL); */ 229 /* signal (SIGURG, SIG_DFL); */
172 230
173 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
174 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
175} 233}
176 234
177bool 235bool
178rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
179{ 237{
180 dR;//TODO (scrollbar, setidle)
181
182 /* 238 /*
183 * Save and then give up any super-user privileges 239 * Save and then give up any super-user privileges
184 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
185 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
186 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
187 * 2. chown tty on some systems 243 * 2. chown tty on some systems
188 */ 244 */
189 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
190 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
191 247
192 rxvt_init_secondary (this); 248 init_secondary ();
193 249
194 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
251
252 set_locale ("");
195 253
196#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
197 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
198#endif 256#endif
199#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
200 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
201 scrollbar_setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
202#endif 260#endif
203 261
204 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
205 263
206 rxvt_init_xlocale (this); 264 init_xlocale ();
207 265
208 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
209#ifdef RXVT_GRAPHICS
210 rxvt_Gr_reset (this); /* reset graphics */
211#endif
212 267
213#if 0 268#if 0
214#ifdef DEBUG_X
215 XSynchronize(Xdisplay, True); 269 XSynchronize (display->display, True);
216#endif
217#endif 270#endif
218 271
219#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
220 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
221 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
222#endif 275#endif
223#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
224 if (menubar_visible(r)) 277 if (menubar_visible ())
225 XMapWindow (Xdisplay, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
226#endif 279#endif
227#ifdef TRANSPARENT 280#ifdef TRANSPARENT
228 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
229 { 282 {
230 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 283 XSelectInput (display->display, display->root, PropertyChangeMask);
231 rxvt_check_our_parents (this); 284 check_our_parents ();
232 } 285 }
233#endif 286#endif
287
288 rootwin_ev.start (display, display->root);
289
234 XMapWindow (Xdisplay, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
235 XMapWindow (Xdisplay, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
236 292
237 rxvt_init_env (this);
238 rxvt_init_command (this, cmd_argv); 293 init_command (cmd_argv);
239 294
240 x_ev.start (Xfd, EVENT_READ);
241 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
242 296
243 check_ev.start (); 297 check_ev.start ();
244
245 process_x_events ();
246 298
247 return true; 299 return true;
248} 300}
249 301
250/* ------------------------------------------------------------------------- * 302/* ------------------------------------------------------------------------- *
254 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
255 */ 307 */
256/* ARGSUSED */ 308/* ARGSUSED */
257/* EXTPROTO */ 309/* EXTPROTO */
258RETSIGTYPE 310RETSIGTYPE
259rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
260{ 312{
261 int pid, save_errno = errno; 313 int pid, save_errno = errno;
262 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
263 ; 315 ;
264 errno = save_errno; 316 errno = save_errno;
265 317
266#if 0 318#if 0
267 if (pid == R->cmd_pid) 319 if (pid == cmd_pid)
268 exit (EXIT_SUCCESS); 320 exit (EXIT_SUCCESS);
269#endif 321#endif
270} 322}
271 323
272/* 324/*
273 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
274 */ 326 */
275/* EXTPROTO */ 327/* EXTPROTO */
276RETSIGTYPE 328RETSIGTYPE
277rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
278{ 330{
279 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
280#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
281 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
282#endif 334#endif
283 rxvt_clean_exit(); 335 rxvt_clean_exit ();
284 kill(getpid(), sig); 336 kill (getpid (), sig);
285} 337}
286 338
287/* ARGSUSED */
288/* INTPROTO */ 339/* INTPROTO */
289int 340int
290rxvt_xerror_handler(const Display * display 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
291 __attribute__ ((unused)), const XErrorEvent * event)
292{ 342{
293 dR;
294
295 if (R->allowedxerror == -1) 343 if (GET_R->allowedxerror == -1)
296 R->allowedxerror = event->error_code; 344 GET_R->allowedxerror = event->error_code;
297 else 345 else
298 { 346 {
299 rxvt_print_error("XError: Request: %d . %d, Error: %d", 347 old_xerror_handler (display, event);
300 event->request_code, event->minor_code,
301 event->error_code);
302
303 R->destroy (); 348 GET_R->destroy ();
304 } 349 }
305 350
306 return 0; 351 return 0;
307} 352}
308 353
313 */ 358 */
314/* EXTPROTO */ 359/* EXTPROTO */
315void 360void
316rxvt_clean_exit () 361rxvt_clean_exit ()
317{ 362{
318 dR; 363 // TODO: rxvtd should clean up all ressources
319 364 if (GET_R)
320 R->destroy (); 365 GET_R->destroy ();
321} 366}
322 367
323/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
324 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
325 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
326/* EXTPROTO */ 371/* EXTPROTO */
327void * 372void *
328rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
329{ 374{
330 void *p; 375 void *p;
331 376
332 p = malloc(size); 377 p = malloc (size);
333 if (p) 378 if (p)
334 return p; 379 return p;
335 380
336 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
337 rxvt_clean_exit(); 382 rxvt_clean_exit ();
338 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
339/* NOTREACHED */ 384 /* NOTREACHED */
340} 385}
341 386
342/* EXTPROTO */ 387/* EXTPROTO */
343void * 388void *
344rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
345{ 390{
346 void *p; 391 void *p;
347 392
348 p = calloc(number, size); 393 p = calloc (number, size);
349 if (p) 394 if (p)
350 return p; 395 return p;
351 396
352 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
353 rxvt_clean_exit(); 398 rxvt_clean_exit ();
354 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
355/* NOTREACHED */ 400 /* NOTREACHED */
356} 401}
357 402
358/* EXTPROTO */ 403/* EXTPROTO */
359void * 404void *
360rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
361{ 406{
362 void *p; 407 void *p;
363 408
364 if (ptr) 409 if (ptr)
365 p = realloc(ptr, size); 410 p = realloc (ptr, size);
366 else 411 else
367 p = malloc(size); 412 p = malloc (size);
368 if (p) 413 if (p)
369 return p; 414 return p;
370 415
371 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
372 rxvt_clean_exit(); 417 rxvt_clean_exit ();
373 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
374/* NOTREACHED */ 419 /* NOTREACHED */
375} 420}
376 421
377/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
378 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
379 * ------------------------------------------------------------------------- */ 424 * ------------------------------------------------------------------------- */
380/* take care of suid/sgid super-user (root) privileges */ 425/* take care of suid/sgid super-user (root) privileges */
381/* INTPROTO */
382void 426void
383rxvt_privileges(pR_ int mode) 427rxvt_term::privileges (int mode)
384{ 428{
385#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
386# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
387/* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
388# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
389# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
390# define HAVE_SETEUID 434# define HAVE_SETEUID
391# endif 435# endif
392# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
393 switch (mode) { 437 switch (mode)
438 {
394 case IGNORE: 439 case IGNORE:
395 /* 440 /*
396 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
397 * back to root later, as required 442 * back to root later, as required
398 */ 443 */
399 seteuid(getuid()); 444 seteuid (getuid ());
400 setegid(getgid()); 445 setegid (getgid ());
401 break; 446 break;
402 case SAVE: 447 case SAVE:
403 R->euid = geteuid(); 448 euid = geteuid ();
404 R->egid = getegid(); 449 egid = getegid ();
405 break; 450 break;
406 case RESTORE: 451 case RESTORE:
407 seteuid(R->euid); 452 seteuid (euid);
408 setegid(R->egid); 453 setegid (egid);
409 break; 454 break;
410 } 455 }
411# else 456# else
412 switch (mode) { 457 switch (mode)
458 {
413 case IGNORE: 459 case IGNORE:
414 setuid(getuid()); 460 setuid (getuid ());
415 setgid(getgid()); 461 setgid (getgid ());
416 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
417 case SAVE: 463 case SAVE:
418 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
419 case RESTORE: 465 case RESTORE:
420 break; 466 break;
421 } 467 }
422# endif 468# endif
423#endif 469#endif
424} 470}
425 471
426#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
427/* EXTPROTO */
428void 473void
429rxvt_privileged_utmp(pR_ char action) 474rxvt_term::privileged_utmp (char action)
430{ 475{
431 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
432 action, R->next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
433 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
434 || (R->Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
435 || R->ttydev == NULL || *R->ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
436 return; 481 return;
437 482
438 rxvt_privileges(aR_ RESTORE); 483 privileges (RESTORE);
439 if (action == SAVE) { 484 if (action == SAVE)
485 {
440 R->next_utmp_action = RESTORE; 486 next_utmp_action = RESTORE;
441 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 487 makeutent (ttydev, rs[Rs_display_name]);
488 }
489 else
442 } else { /* action == RESTORE */ 490 { /* action == RESTORE */
443 R->next_utmp_action = IGNORE; 491 next_utmp_action = IGNORE;
444 rxvt_cleanutent(aR); 492 cleanutent ();
445 } 493 }
446 rxvt_privileges(aR_ IGNORE); 494 privileges (IGNORE);
447} 495}
448#endif 496#endif
449 497
450#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
451/* EXTPROTO */
452void 499void
453rxvt_privileged_ttydev(pR_ char action) 500rxvt_term::privileged_ttydev (char action)
454{ 501{
455 D_MAIN((stderr, 502 D_MAIN ((stderr,
456 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
457 action, R->next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
458 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
459 || R->ttydev == NULL || *R->ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
460 return; 507 return;
461 508
462 rxvt_privileges(aR_ RESTORE); 509 privileges (RESTORE);
463 510
464 if (action == SAVE) { 511 if (action == SAVE)
512 {
465 R->next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
466# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
467/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
468 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
469 R->next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
470 else 518 else
471# endif 519# endif
520
472 { 521 {
473 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
474 chmod(R->ttydev, R->ttymode); 523 chmod (ttydev, ttymode);
475# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
476 revoke(R->ttydev); 525 revoke (ttydev);
477# endif 526# endif
527
478 } 528 }
529 }
530 else
479 } else { /* action == RESTORE */ 531 { /* action == RESTORE */
480 R->next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
481# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
482 chmod(R->ttydev, R->ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
483 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
484# else 536# else
485 chmod(R->ttydev, 537 chmod (ttydev,
486 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
487 chown(R->ttydev, 0, 0); 539 chown (ttydev, 0, 0);
488# endif 540# endif
489 }
490 541
542 }
543
491 rxvt_privileges(aR_ IGNORE); 544 privileges (IGNORE);
492 545
493# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
494 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
495 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
496 SAVE ? "Saving" : 549 SAVE ? "Saving" :
497 "UNKNOWN ERROR for"), R->ttydev, 550 "UNKNOWN ERROR for"), ttydev,
498 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
499 R->ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
500# endif 553# endif
501} 554}
502#endif 555#endif
503 556
504/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
505/* 558/*
506 * window size/position calculcations for XSizeHint and other storage. 559 * window size/position calculcations for XSizeHint and other storage.
507 * if width/height are non-zero then override calculated width/height 560 * if width/height are non-zero then override calculated width/height
508 */ 561 */
509/* EXTPROTO */
510void 562void
511rxvt_window_calc(pR_ unsigned int width, unsigned int height) 563rxvt_term::window_calc (unsigned int width, unsigned int height)
512{ 564{
513 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
514 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
515 unsigned int w, h; 567 unsigned int w, h;
516 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
517 569
518 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
519 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
520 R->szHint.height)); 572 szHint.height));
521 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
522 R->szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
523/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
524 576
525 recalc_x = recalc_y = 0; 577 recalc_x = recalc_y = 0;
526 flags = 0; 578 flags = 0;
527 if (!R->parsed_geometry) { 579 if (!parsed_geometry)
580 {
528 R->parsed_geometry = 1; 581 parsed_geometry = 1;
529 if (R->rs[Rs_geometry]) 582 if (rs[Rs_geometry])
530 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
531 if (flags & WidthValue) { 584 if (flags & WidthValue)
585 {
532 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
533 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
534 } 588 }
535 if (flags & HeightValue) { 589 if (flags & HeightValue)
590 {
536 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
537 R->szHint.flags |= USSize; 592 szHint.flags |= USSize;
538 } 593 }
539 if (flags & XValue) { 594 if (flags & XValue)
595 {
540 R->szHint.x = x; 596 szHint.x = x;
541 R->szHint.flags |= USPosition; 597 szHint.flags |= USPosition;
542 if (flags & XNegative) { 598 if (flags & XNegative)
599 {
543 recalc_x = 1; 600 recalc_x = 1;
544 R->szHint.win_gravity = NorthEastGravity; 601 szHint.win_gravity = NorthEastGravity;
545 } 602 }
546 } 603 }
547 if (flags & YValue) { 604 if (flags & YValue)
605 {
548 R->szHint.y = y; 606 szHint.y = y;
549 R->szHint.flags |= USPosition; 607 szHint.flags |= USPosition;
550 if (flags & YNegative) { 608 if (flags & YNegative)
609 {
551 recalc_y = 1; 610 recalc_y = 1;
552 if (R->szHint.win_gravity == NorthEastGravity) 611 if (szHint.win_gravity == NorthEastGravity)
553 R->szHint.win_gravity = SouthEastGravity; 612 szHint.win_gravity = SouthEastGravity;
554 else 613 else
555 R->szHint.win_gravity = SouthWestGravity; 614 szHint.win_gravity = SouthWestGravity;
556 } 615 }
557 } 616 }
558 } 617 }
559/* TODO: BOUNDS */ 618 /* TODO: BOUNDS */
560 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 619 TermWin.width = TermWin.ncol * TermWin.fwidth;
561 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 620 TermWin.height = TermWin.nrow * TermWin.fheight;
562 max_width = MAX_COLS * R->TermWin.fwidth; 621 max_width = MAX_COLS * TermWin.fwidth;
563 max_height = MAX_ROWS * R->TermWin.fheight; 622 max_height = MAX_ROWS * TermWin.fheight;
564 623
565 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
566 625
567 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
568 R->window_vt_x = R->window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
569 if (scrollbar_visible(R)) { 628 if (scrollbar_visible ())
629 {
570 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
571 R->szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
572 if (!(R->Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
573 R->window_vt_x = sb_w; 633 window_vt_x = sb_w;
574 } 634 }
575 if (menubar_visible(R)) { 635 if (menubar_visible ())
636 {
576 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
577 R->szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
578 R->window_vt_y = mb_h; 639 window_vt_y = mb_h;
579 } 640 }
580 R->szHint.width_inc = R->TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
581 R->szHint.height_inc = R->TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
582 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 643 szHint.min_width = szHint.base_width + szHint.width_inc;
583 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 644 szHint.min_height = szHint.base_height + szHint.height_inc;
584 645
585 if (width && width - R->szHint.base_width < max_width) { 646 if (width && width - szHint.base_width < max_width)
647 {
586 R->szHint.width = width; 648 szHint.width = width;
587 R->TermWin.width = width - R->szHint.base_width; 649 TermWin.width = width - szHint.base_width;
588 } else { 650 }
651 else
652 {
589 MIN_IT(R->TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
590 R->szHint.width = R->szHint.base_width + R->TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
591 } 655 }
592 if (height && height - R->szHint.base_height < max_height) { 656 if (height && height - szHint.base_height < max_height)
657 {
593 R->szHint.height = height; 658 szHint.height = height;
594 R->TermWin.height = height - R->szHint.base_height; 659 TermWin.height = height - szHint.base_height;
595 } else { 660 }
661 else
662 {
596 MIN_IT(R->TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
597 R->szHint.height = R->szHint.base_height + R->TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
598 } 665 }
599 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
600 R->window_sb_x = R->szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
601 668
602 if (recalc_x) 669 if (recalc_x)
603 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
604 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 671 - szHint.width - 2 * TermWin.ext_bwidth);
605 if (recalc_y) 672 if (recalc_y)
606 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
607 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
608 675
609 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
610 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
611 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
612 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
613 R->szHint.height)); 680 szHint.height));
614 return; 681 return;
615} 682}
616 683
617/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
618/* 685/*
619 * Tell the teletype handler what size the window is. 686 * Tell the teletype handler what size the window is.
620 * Called after a window size change. 687 * Called after a window size change.
621 */ 688 */
622void 689void
623rxvt_term::tt_winch () 690rxvt_term::tt_winch ()
624{ 691{
625 struct winsize ws; 692 struct winsize ws;
626 693
627 if (cmd_fd < 0) 694 if (cmd_fd < 0)
628 return; 695 return;
629 696
630 ws.ws_col = TermWin.ncol; 697 ws.ws_col = TermWin.ncol;
632 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
633#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
634 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
635#else 702#else
636 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
637 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
638# ifdef SIGWINCH 705# ifdef SIGWINCH
639 else if (cmd_pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
640 kill (cmd_pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
641# endif 708# endif
642#endif 709#endif
643} 710}
644 711
645/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
646/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
647/* 714/*
648 * init = 1 - initialize 715 * init = 1 - initialize
649 * 716 *
650 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
651 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
652 */ 719 */
653/* EXTPROTO */ 720bool
654void
655rxvt_change_font(pR_ int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
656{ 722{
657} 723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
658 734
659/* INTPROTO */ 735 if (fs && fs->populate (fontname))
660void 736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0])
746 {
747 resize_all_windows (0, 0, 0);
748 scr_remap_chars ();
749 scr_touch (true);
750 }
751
752 return true;
753 }
754 }
755
756 return false;
757}
758
759bool
661rxvt_font_up_down(pR_ int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
662{ 761{
762 return false;
663} 763}
664 764
665/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
666/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
667/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
668/* EXTPROTO */
669void 768void
670rxvt_set_title(pR_ const char *str) 769rxvt_term::set_title (const char *str)
671{ 770{
672#ifndef SMART_WINDOW_TITLE 771#ifndef SMART_WINDOW_TITLE
673 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
674#else 773#else
675 char *name; 774 char *name;
676 775
677 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
678 name = NULL; 777 name = NULL;
679 if (name == NULL || STRCMP(name, str)) 778 if (name == NULL || STRCMP (name, str))
680 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
681 if (name) 780 if (name)
682 XFree(name); 781 XFree (name);
683#endif 782#endif
684} 783}
685 784
686/* EXTPROTO */
687void 785void
688rxvt_set_iconName(pR_ const char *str) 786rxvt_term::set_iconName (const char *str)
689{ 787{
690#ifndef SMART_WINDOW_TITLE 788#ifndef SMART_WINDOW_TITLE
691 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
692#else 790#else
693 char *name; 791 char *name;
694 792
695 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 793 if (XGetIconName (display->display, TermWin.parent[0], &name))
696 name = NULL; 794 name = NULL;
697 if (name == NULL || STRCMP(name, str)) 795 if (name == NULL || STRCMP (name, str))
698 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
699 if (name) 797 if (name)
700 XFree(name); 798 XFree (name);
701#endif 799#endif
702} 800}
703 801
704#ifdef XTERM_COLOR_CHANGE 802#ifdef XTERM_COLOR_CHANGE
705/* EXTPROTO */
706void 803void
707rxvt_set_window_color(pR_ int idx, const char *color) 804rxvt_term::set_window_color (int idx, const char *color)
708{ 805{
709 rxvt_color xcol; 806 rxvt_color xcol;
710 int i; 807 int i;
711 808
712 if (color == NULL || *color == '\0') 809 if (color == NULL || *color == '\0')
713 return; 810 return;
714 811
715/* handle color aliases */ 812 /* handle color aliases */
716 if (isdigit(*color)) { 813 if (isdigit (*color))
814 {
717 i = atoi(color); 815 i = atoi (color);
816 if (i >= 8 && i <= 15)
718 if (i >= 8 && i <= 15) { /* bright colors */ 817 { /* bright colors */
719 i -= 8; 818 i -= 8;
720# ifndef NO_BRIGHTCOLOR 819# ifndef NO_BRIGHTCOLOR
721 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 820 PixColors[idx] = PixColors[minBrightCOLOR + i];
722 SET_PIXCOLOR(R, idx); 821 SET_PIXCOLOR (idx);
723 goto Done; 822 goto Done;
724# endif 823# endif
824
725 } 825 }
726 if (i >= 0 && i <= 7) { /* normal colors */ 826 if (i >= 0 && i <= 7)
827 { /* normal colors */
727 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 828 PixColors[idx] = PixColors[minCOLOR + i];
728 SET_PIXCOLOR(R, idx); 829 SET_PIXCOLOR (idx);
729 goto Done; 830 goto Done;
730 } 831 }
731 } 832 }
732 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 833 if (!rXParseAllocColor (& xcol, color))
733 return; 834 return;
734/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 835 /* XStoreColor (display->display, XCMAP, XColor*); */
735 836
736/* 837 /*
737 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
738 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
739 */ 840 */
740# if 0 841# if 0
741 for (i = Color_Black; i <= Color_White; i++) 842 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[idx] == R->PixColors[i]) 843 if (PixColors[idx] == PixColors[i])
743 break; 844 break;
744 if (i > Color_White) { 845 if (i > Color_White)
846 {
745 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
746 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
747 DisplayPlanes(R->Xdisplay, Xscreen)); 849 DisplayPlanes (display->display, display->screen));
748 } 850 }
749# endif 851# endif
750 852
751 R->PixColors[idx] = xcol; 853 PixColors[idx] = xcol;
752 SET_PIXCOLOR(R, idx); 854 SET_PIXCOLOR (idx);
753 855
754/* XSetWindowAttributes attr; */ 856 /* XSetWindowAttributes attr; */
755/* Cursor cursor; */ 857 /* Cursor cursor; */
756 Done: 858Done:
757 if (idx == Color_bg && !(R->Options & Opt_transparent)) 859 if (idx == Color_bg && ! (Options & Opt_transparent))
758 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 860 XSetWindowBackground (display->display, TermWin.vt,
759 R->PixColors[Color_bg]); 861 PixColors[Color_bg]);
760 862
761/* handle Color_BD, scrollbar background, etc. */ 863 /* handle Color_BD, scrollbar background, etc. */
762 864
763 rxvt_set_colorfgbg(aR); 865 set_colorfgbg ();
764 rxvt_recolour_cursor(aR); 866 recolour_cursor ();
765/* the only reasonable way to enforce a clean update */ 867 /* the only reasonable way to enforce a clean update */
766 rxvt_scr_poweron(aR); 868 scr_poweron ();
767} 869}
768 870
769#else 871#else
770# define rxvt_set_window_color(aR_ idx,color) ((void)0) 872# define set_window_color (idx,color) ((void)0)
771#endif /* XTERM_COLOR_CHANGE */ 873#endif /* XTERM_COLOR_CHANGE */
772 874
773/* EXTPROTO */
774void 875void
775rxvt_recolour_cursor(pR) 876rxvt_term::recolour_cursor ()
776{ 877{
777 rxvt_color xcol[2];
778
779#if TODO 878#if TODO
879 rxvt_color xcol[2];
880
780 xcol[0] = R->PixColors[Color_pointer]; 881 xcol[0] = PixColors[Color_pointer];
781 xcol[1] = R->PixColors[Color_bg]; 882 xcol[1] = PixColors[Color_bg];
782 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 883 XQueryColors (display->display, XCMAP, xcol, 2);
783 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
784#endif 885#endif
785} 886}
786 887
787/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
788/* 889/*
789 * find if fg/bg matches any of the normal (low-intensity) colors 890 * find if fg/bg matches any of the normal (low-intensity) colors
790 */ 891 */
791/* INTPROTO */
792void 892void
793rxvt_set_colorfgbg(pR) 893rxvt_term::set_colorfgbg ()
794{ 894{
795 unsigned int i; 895 unsigned int i;
796 const char *xpmb = "\0"; 896 const char *xpmb = "\0";
797 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 897 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
798 898
799 R->env_colorfgbg = 899 env_colorfgbg =
800 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 900 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
801 STRCPY(fstr, "default"); 901 STRCPY (fstr, "default");
802 STRCPY(bstr, "default"); 902 STRCPY (bstr, "default");
803 for (i = Color_Black; i <= Color_White; i++) 903 for (i = Color_Black; i <= Color_White; i++)
804 if (R->PixColors[Color_fg] == R->PixColors[i]) { 904 if (PixColors[Color_fg] == PixColors[i])
905 {
805 sprintf(fstr, "%d", (i - Color_Black)); 906 sprintf (fstr, "%d", (i - Color_Black));
806 break; 907 break;
807 } 908 }
808 for (i = Color_Black; i <= Color_White; i++) 909 for (i = Color_Black; i <= Color_White; i++)
809 if (R->PixColors[Color_bg] == R->PixColors[i]) { 910 if (PixColors[Color_bg] == PixColors[i])
911 {
810 sprintf(bstr, "%d", (i - Color_Black)); 912 sprintf (bstr, "%d", (i - Color_Black));
811#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
812 xpmb = "default;"; 914 xpmb = "default;";
813#endif 915#endif
814 break; 916 break;
815 } 917 }
918
816 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
817 putenv(R->env_colorfgbg);
818 920
819#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
820 R->colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
821 for (i = minCOLOR; i <= maxCOLOR; i++) { 923 for (i = minCOLOR; i <= maxCOLOR; i++)
924 {
822 if (R->PixColors[Color_fg] == R->PixColors[i]) 925 if (PixColors[Color_fg] == PixColors[i])
823 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 926 colorfgbg = SET_FGCOLOR (colorfgbg, i);
824 if (R->PixColors[Color_bg] == R->PixColors[i]) 927 if (PixColors[Color_bg] == PixColors[i])
825 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 928 colorfgbg = SET_BGCOLOR (colorfgbg, i);
826 } 929 }
827#endif 930#endif
828} 931}
829 932
830/*----------------------------------------------------------------------*/ 933/*----------------------------------------------------------------------*/
831/* 934/*
832 * Colour determination for low colour displays, routine from 935 * Colour determination for low colour displays, routine from
833 * Hans de Goede <hans@highrise.nl> 936 * Hans de Goede <hans@highrise.nl>
834 */ 937 */
835 938
836/* EXTPROTO */
837int 939int
838rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
839{ 941{
840 screen_in_out->set(aR_ colour);
841
842 if (!screen_in_out->set(aR_ colour)) { 942 if (!screen_in_out->set (display, colour))
943 {
843 rxvt_print_error("can't allocate colour: %s", colour); 944 rxvt_print_error ("can't allocate colour: %s", colour);
844 return false; 945 return false;
845 } 946 }
846 947
847 return true; 948 return true;
848} 949}
849 950
850/* -------------------------------------------------------------------- * 951/* -------------------------------------------------------------------- *
851 * - WINDOW RESIZING - * 952 * - WINDOW RESIZING - *
852 * -------------------------------------------------------------------- */ 953 * -------------------------------------------------------------------- */
853/* EXTPROTO */
854void 954void
855rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 955rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
856 int ignoreparent)
857{ 956{
858 int fix_screen; 957 int fix_screen;
859 958
860#ifdef SMART_RESIZE 959#ifdef SMART_RESIZE
861 int old_width = R->szHint.width, old_height = R->szHint.height; 960 int old_width = szHint.width, old_height = szHint.height;
862#endif 961#endif
863 962
864 rxvt_window_calc(aR_ width, height); 963 window_calc (width, height);
865 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
866 if (!ignoreparent) { 965 if (!ignoreparent)
966 {
867#ifdef SMART_RESIZE 967#ifdef SMART_RESIZE
868/* 968 /*
869 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
870 * reposition window on resize depending on placement on screen 970 * reposition window on resize depending on placement on screen
871 */ 971 */
872 int x, y, x1, y1; 972 int x, y, x1, y1;
873 int dx, dy; 973 int dx, dy;
874 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 974 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
875 Window unused_cr; 975 Window unused_cr;
876 976
877 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 977 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
878 0, 0, &x, &y, &unused_cr); 978 0, 0, &x, &y, &unused_cr);
879 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 979 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
880 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 980 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
881 /* 981 /*
882 * if Xroot isn't the parent window, a WM will probably have offset 982 * if display->root isn't the parent window, a WM will probably have offset
883 * our position for handles and decorations. Counter it 983 * our position for handles and decorations. Counter it
884 */ 984 */
885 if (x1 != x || y1 != y) { 985 if (x1 != x || y1 != y)
986 {
886 x -= x1; 987 x -= x1;
887 y -= y1; 988 y -= y1;
888 } 989 }
889 990
890 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 991 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
891 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 992 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
892 dx = old_width - R->szHint.width; 993 dx = old_width - szHint.width;
893 dy = old_height - R->szHint.height; 994 dy = old_height - szHint.height;
894 995
895 /* Check position of the center of the window */ 996 /* Check position of the center of the window */
896 if (x < x1) /* left half */ 997 if (x < x1) /* left half */
897 dx = 0; 998 dx = 0;
898 else if (x == x1) /* exact center */ 999 else if (x == x1) /* exact center */
899 dx /= 2; 1000 dx /= 2;
900 if (y < y1) /* top half */ 1001 if (y < y1) /* top half */
901 dy = 0; 1002 dy = 0;
902 else if (y == y1) /* exact center */ 1003 else if (y == y1) /* exact center */
903 dy /= 2; 1004 dy /= 2;
904 1005
905 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
906 R->szHint.width, R->szHint.height); 1007 szHint.width, szHint.height);
907#else 1008#else
908 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
909 R->szHint.height); 1010 szHint.height);
910#endif 1011#endif
911 }
912 1012
1013 }
1014
913 fix_screen = (R->TermWin.ncol != R->prev_ncol 1015 fix_screen = (TermWin.ncol != prev_ncol
914 || R->TermWin.nrow != R->prev_nrow); 1016 || TermWin.nrow != prev_nrow);
1017
915 if (fix_screen || width != R->old_width || height != R->old_height) { 1018 if (fix_screen || width != old_width || height != old_height)
1019 {
916 if (scrollbar_visible(R)) { 1020 if (scrollbar_visible ())
1021 {
917 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
918 0, scrollbar_TotalWidth(), R->szHint.height); 1023 0, scrollbar_TotalWidth (), szHint.height);
919 rxvt_Resize_scrollBar(aR); 1024 resize_scrollbar ();
920 } 1025 }
1026
921 if (menubar_visible(R)) 1027 if (menubar_visible ())
922 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
923 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1030
924 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
925 R->window_vt_y, TermWin_TotalWidth(), 1032 window_vt_y, TermWin_TotalWidth (),
926 TermWin_TotalHeight()); 1033 TermWin_TotalHeight ());
927#ifdef RXVT_GRAPHICS
928 if (R->old_height)
929 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
930 R->old_height - R->szHint.base_height);
931#endif
932 rxvt_scr_clear(aR); 1034 scr_clear ();
933#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
934 rxvt_resize_pixmap(aR); 1036 resize_pixmap ();
935#endif 1037#endif
936 }
937 1038
1039 }
1040
938 if (fix_screen || R->old_height == 0) { 1041 if (fix_screen || old_height == 0)
1042 {
939 int curr_screen = -1; 1043 int curr_screen = -1;
940 uint16_t old_ncol = R->prev_ncol; 1044 int old_ncol = prev_ncol;
941 1045
942 /* scr_reset only works on the primary screen */ 1046 /* scr_reset only works on the primary screen */
943 if (R->old_height) /* this is not the first time through */ 1047 if (old_height) /* this is not the first time through */
1048 {
1049 unsigned int ncol = TermWin.ncol;
1050 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
944 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1051 curr_screen = scr_change_screen (PRIMARY);
945 1052 TermWin.ncol = ncol;
946 R->scr_reset();
947
948 if (curr_screen >= 0) { /* this is not the first time through */
949 rxvt_scr_change_screen(aR_ curr_screen);
950 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
951 } 1053 }
952 }
953 1054
1055 scr_reset ();
1056
1057 if (curr_screen >= 0) /* this is not the first time through */
1058 {
1059 scr_change_screen (curr_screen);
1060 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1061 }
1062 }
1063
954 R->old_width = R->szHint.width; 1064 old_width = szHint.width;
955 R->old_height = R->szHint.height; 1065 old_height = szHint.height;
956 1066
957#ifdef USE_XIM 1067#ifdef USE_XIM
958 rxvt_IMSetStatusPosition(aR); 1068 IMSetStatusPosition ();
959#endif 1069#endif
960} 1070}
961 1071
962/* 1072/*
963 * Set the width/height of the vt window in characters. Units are pixels. 1073 * Set the width/height of the vt window in characters. Units are pixels.
964 * good for toggling 80/132 columns 1074 * good for toggling 80/132 columns
965 */ 1075 */
966/* EXTPROTO */
967void 1076void
968rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1077rxvt_term::set_widthheight (unsigned int width, unsigned int height)
969{ 1078{
970 XWindowAttributes wattr; 1079 XWindowAttributes wattr;
971 1080
972 if (width == 0 || height == 0) { 1081 if (width == 0 || height == 0)
1082 {
973 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1083 XGetWindowAttributes (display->display, display->root, &wattr);
974 if (width == 0) 1084 if (width == 0)
975 width = wattr.width - R->szHint.base_width; 1085 width = wattr.width - szHint.base_width;
976 if (height == 0) 1086 if (height == 0)
977 height = wattr.height - R->szHint.base_height; 1087 height = wattr.height - szHint.base_height;
978 } 1088 }
979 if (width != R->TermWin.width || height != R->TermWin.height) { 1089 if (width != TermWin.width || height != TermWin.height)
1090 {
980 width += R->szHint.base_width; 1091 width += szHint.base_width;
981 height += R->szHint.base_height; 1092 height += szHint.base_height;
982 rxvt_resize_all_windows(aR_ width, height, 0); 1093 resize_all_windows (width, height, 0);
983 } 1094 }
984} 1095}
985 1096
986/* -------------------------------------------------------------------- * 1097/* -------------------------------------------------------------------- *
987 * - X INPUT METHOD ROUTINES - * 1098 * - X INPUT METHOD ROUTINES - *
988 * -------------------------------------------------------------------- */ 1099 * -------------------------------------------------------------------- */
989#ifdef USE_XIM 1100#ifdef USE_XIM
990/* INTPROTO */ 1101
991void 1102void
992rxvt_setSize(pR_ XRectangle * size) 1103rxvt_term::im_set_size (XRectangle *size)
993{ 1104{
994 size->x = R->TermWin.int_bwidth; 1105 size->x = TermWin.int_bwidth;
995 size->y = R->TermWin.int_bwidth; 1106 size->y = TermWin.int_bwidth;
996 size->width = Width2Pixel(R->TermWin.ncol); 1107 size->width = Width2Pixel (TermWin.ncol);
997 size->height = Height2Pixel(R->TermWin.nrow); 1108 size->height = Height2Pixel (TermWin.nrow);
998} 1109}
999 1110
1000/* INTPROTO */
1001void 1111void
1002rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1112rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1003{ 1113{
1004 *fg = R->PixColors[Color_fg]; 1114 *fg = PixColors[Color_fg];
1005 *bg = R->PixColors[Color_bg]; 1115 *bg = PixColors[Color_bg];
1006} 1116}
1007 1117
1008/* Checking whether input method is running. */ 1118/* Checking whether input method is running. */
1009/* INTPROTO */
1010Bool 1119bool
1011rxvt_IMisRunning(pR) 1120rxvt_term::IMisRunning ()
1012{ 1121{
1013 char *p; 1122 char *p;
1014 Atom atom; 1123 Atom atom;
1015 Window win; 1124 Window win;
1016 char server[IMBUFSIZ]; 1125 char server[IMBUFSIZ];
1017 1126
1018/* get current locale modifier */ 1127 /* get current locale modifier */
1019 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1128 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1129 {
1020 STRCPY(server, "@server="); 1130 STRCPY (server, "@server=");
1021 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1131 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1022 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1132 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1023 *p = '\0'; 1133 *p = '\0';
1024 1134
1025 atom = XInternAtom(R->Xdisplay, server, False); 1135 atom = XInternAtom (display->display, server, False);
1026 win = XGetSelectionOwner(R->Xdisplay, atom); 1136 win = XGetSelectionOwner (display->display, atom);
1027 if (win != None) 1137 if (win != None)
1028 return True; 1138 return True;
1029 } 1139 }
1030 return False; 1140 return False;
1031} 1141}
1032 1142
1033/* EXTPROTO */
1034void 1143void
1035rxvt_IMSendSpot(pR) 1144rxvt_term::IMSendSpot ()
1036{ 1145{
1037 XPoint spot; 1146 XPoint spot;
1038 XVaNestedList preedit_attr; 1147 XVaNestedList preedit_attr;
1039 1148
1040 if (R->Input_Context == NULL 1149 if (Input_Context == NULL
1041 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1150 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1042 || !(R->event_type == KeyPress 1151 || ! (event_type == KeyPress
1043 || R->event_type == Expose 1152 || event_type == Expose
1044 || R->event_type == NoExpose 1153 || event_type == NoExpose
1045 || R->event_type == SelectionNotify 1154 || event_type == SelectionNotify
1046 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1155 || event_type == ButtonRelease || event_type == FocusIn)
1047 || !rxvt_IMisRunning(aR)) 1156 || !IMisRunning ())
1048 return; 1157 return;
1049 1158
1050 rxvt_setPosition(aR_ & spot); 1159 im_set_position (&spot);
1051 1160
1052 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1161 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1053 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1162 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1054 XFree(preedit_attr); 1163 XFree (preedit_attr);
1055} 1164}
1056 1165
1057/* EXTPROTO */
1058void 1166void
1059rxvt_setTermFontSet(pR_ int idx)
1060{
1061 char *string;
1062 long length;
1063 int success = 0;
1064
1065 if (idx < 0 || idx >= MAX_NFONTS)
1066 return;
1067}
1068
1069/* INTPROTO */
1070void
1071rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1167rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1072 XRectangle * needed_rect) 1168 XRectangle * needed_rect)
1073{ 1169{
1074 int mbh, vtx = 0; 1170 int mbh, vtx = 0;
1075 1171
1076 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1172 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1077 vtx = scrollbar_TotalWidth(); 1173 vtx = scrollbar_TotalWidth ();
1174
1078 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1175 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1079 mbh -= R->TermWin.lineSpace; 1176 mbh -= TermWin.lineSpace;
1080 1177
1081 preedit_rect->x = needed_rect->width + vtx; 1178 preedit_rect->x = needed_rect->width + vtx;
1082 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1179 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1083 1180
1084 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1181 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1085 + vtx;
1086 preedit_rect->height = Height2Pixel(1); 1182 preedit_rect->height = Height2Pixel (1);
1087 1183
1088 status_rect->x = vtx; 1184 status_rect->x = vtx;
1089 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1185 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1090 1186
1091 status_rect->width = needed_rect->width ? needed_rect->width 1187 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1092 : Width2Pixel(R->TermWin.ncol + 1);
1093 status_rect->height = Height2Pixel(1); 1188 status_rect->height = Height2Pixel (1);
1094} 1189}
1095 1190
1096/* ARGSUSED */
1097/* INTPROTO */
1098void 1191void
1099rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1192rxvt_term::im_destroy ()
1100 __attribute__ ((unused)), XPointer call_data
1101 __attribute__ ((unused)))
1102{ 1193{
1103 dR; 1194 if (Input_Context)
1104 1195 {
1196 XDestroyIC (Input_Context);
1105 R->Input_Context = NULL; 1197 Input_Context = NULL;
1106/* To avoid Segmentation Fault in C locale: Solaris only? */ 1198 }
1107 if (STRCMP(R->locale, "C")) 1199
1108 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1200 if (input_method)
1109 rxvt_IMInstantiateCallback, NULL); 1201 {
1202 display->put_xim (input_method);
1203 input_method = 0;
1204 }
1110} 1205}
1111 1206
1112/* 1207/*
1113 * X manual pages and include files don't match on some systems: 1208 * Try to open a XIM with the current modifiers, then see if we can
1114 * some think this is an XIDProc and others an XIMProc so we can't 1209 * open a suitable preedit type
1115 * use the first argument - need to update this to be nice for
1116 * both types via some sort of configure detection
1117 */ 1210 */
1118/* ARGSUSED */ 1211bool
1119/* EXTPROTO */ 1212rxvt_term::IM_get_IC (const char *modifiers)
1120void
1121rxvt_IMInstantiateCallback(Display * unused
1122 __attribute__ ((unused)), XPointer client_data
1123 __attribute__ ((unused)), XPointer call_data
1124 __attribute__ ((unused)))
1125{ 1213{
1126 dR; 1214 int i, j, found;
1215 XIM xim;
1216 XPoint spot;
1217 XRectangle rect, status_rect, needed_rect;
1218 unsigned long fg, bg;
1219 const char *p;
1220 char **s;
1221 XIMStyles *xim_styles;
1222 XVaNestedList preedit_attr, status_attr;
1223
1224 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1225 return false;
1226
1227 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1228 input_method = display->get_xim (locale, modifiers);
1229 if (input_method == NULL)
1230 return false;
1231
1232 xim = input_method->xim;
1233
1234 xim_styles = NULL;
1235 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1236 || !xim_styles || !xim_styles->count_styles)
1237 {
1238 display->put_xim (input_method);
1239 return false;
1240 }
1241
1242 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1243 s = rxvt_splitcommastring (p);
1244 for (i = found = 0; !found && s[i]; i++)
1245 {
1246 if (!STRCMP (s[i], "OverTheSpot"))
1247 input_style = (XIMPreeditPosition | XIMStatusNothing);
1248 else if (!STRCMP (s[i], "OffTheSpot"))
1249 input_style = (XIMPreeditArea | XIMStatusArea);
1250 else if (!STRCMP (s[i], "Root"))
1251 input_style = (XIMPreeditNothing | XIMStatusNothing);
1252
1253 for (j = 0; j < xim_styles->count_styles; j++)
1254 if (input_style == xim_styles->supported_styles[j])
1255 {
1256 found = 1;
1257 break;
1258 }
1259 }
1260
1261 for (i = 0; s[i]; i++)
1262 free (s[i]);
1263
1264 free (s);
1265 XFree (xim_styles);
1266
1267 if (!found)
1268 {
1269 display->put_xim (input_method);
1270 return false;
1271 }
1272
1273 preedit_attr = status_attr = NULL;
1274
1275 if (input_style & XIMPreeditPosition)
1276 {
1277 im_set_size (&rect);
1278 im_set_position (&spot);
1279 im_set_color (&fg, &bg);
1280
1281 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1282 XNSpotLocation, &spot,
1283 XNForeground, fg, XNBackground, bg,
1284 //XNFontSet, TermWin.fontset,
1285 NULL);
1286 }
1287 else if (input_style & XIMPreeditArea)
1288 {
1289 im_set_color (&fg, &bg);
1290
1291 /*
1292 * The necessary width of preedit area is unknown
1293 * until create input context.
1294 */
1295 needed_rect.width = 0;
1296
1297 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1298
1299 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1300 XNForeground, fg, XNBackground, bg,
1301 //XNFontSet, TermWin.fontset,
1302 NULL);
1303 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1304 XNForeground, fg, XNBackground, bg,
1305 //XNFontSet, TermWin.fontset,
1306 NULL);
1307 }
1308
1309 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1310 XNClientWindow, TermWin.parent[0],
1311 XNFocusWindow, TermWin.parent[0],
1312 preedit_attr ? XNPreeditAttributes : NULL,
1313 preedit_attr,
1314 status_attr ? XNStatusAttributes : NULL,
1315 status_attr, NULL);
1316 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr);
1318
1319 if (Input_Context == NULL)
1320 {
1321 rxvt_print_error ("failed to create input context");
1322 display->put_xim (input_method);
1323 return false;
1324 }
1325
1326 if (input_style & XIMPreeditArea)
1327 IMSetStatusPosition ();
1328
1329 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1330 return true;
1331}
1332
1333void
1334rxvt_term::im_cb ()
1335{
1127 int i, found, had_im; 1336 int i, found, had_im;
1128 const char *p; 1337 const char *p;
1129 char **s; 1338 char **s;
1130 char buf[IMBUFSIZ]; 1339 char buf[IMBUFSIZ];
1131 1340
1341 im_destroy ();
1342
1132 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1343 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1133 if (R->Input_Context) 1344 if (Input_Context)
1134 return; 1345 return;
1135 1346
1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1348 if (rs[Rs_imLocale])
1349 SET_LOCALE (rs[Rs_imLocale]);
1350#endif
1351
1136 p = R->rs[Rs_inputMethod]; 1352 p = rs[Rs_inputMethod];
1137 if (p && *p) 1353 if (p && *p)
1138 { 1354 {
1139 bool found = false; 1355 bool found = false;
1140 1356
1141 s = rxvt_splitcommastring (p); 1357 s = rxvt_splitcommastring (p);
1143 { 1359 {
1144 if (*s[i]) 1360 if (*s[i])
1145 { 1361 {
1146 STRCPY (buf, "@im="); 1362 STRCPY (buf, "@im=");
1147 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1363 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1148 if ((p = XSetLocaleModifiers (buf)) && *p 1364 if (IM_get_IC (buf))
1149 && rxvt_IM_get_IC (aR))
1150 { 1365 {
1151 found = true; 1366 found = true;
1152 break; 1367 break;
1153 } 1368 }
1154 } 1369 }
1155 } 1370 }
1156 for (i = 0; s[i]; i++) 1371 for (i = 0; s[i]; i++)
1157 free(s[i]); 1372 free (s[i]);
1158 free(s); 1373 free (s);
1159 1374
1160 if (found) 1375 if (found)
1161 return; 1376 goto done;
1162 } 1377 }
1163 1378
1164/* try with XMODIFIERS env. var. */ 1379 /* try with XMODIFIERS env. var. */
1165 if ((p = XSetLocaleModifiers ("")) && *p 1380 if (IM_get_IC (""))
1166 && rxvt_IM_get_IC (aR)) 1381 goto done;
1382
1383 /* try with no modifiers base IF the user didn't specify an IM */
1384 if (IM_get_IC ("@im=none"))
1385 goto done;
1386
1387done:
1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1389 if (rs[Rs_imLocale])
1390 SET_LOCALE (locale);
1391#endif
1392}
1393
1394void
1395rxvt_term::IMSetStatusPosition ()
1396{
1397 XRectangle preedit_rect, status_rect, *needed_rect;
1398 XVaNestedList preedit_attr, status_attr;
1399
1400 if (Input_Context == NULL
1401 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1402 || !IMisRunning ())
1167 return; 1403 return;
1168 1404
1169/* try with no modifiers base IF the user didn't specify an IM */
1170 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1171 && rxvt_IM_get_IC (aR) == True)
1172 return;
1173}
1174
1175/*
1176 * Try to open a XIM with the current modifiers, then see if we can
1177 * open a suitable preedit type
1178 */
1179/* INTPROTO */
1180Bool
1181rxvt_IM_get_IC(pR)
1182{
1183 int i, j, found;
1184 XIM xim;
1185 XPoint spot;
1186 XRectangle rect, status_rect, needed_rect;
1187 unsigned long fg, bg;
1188 const char *p;
1189 char **s;
1190 XIMStyles *xim_styles;
1191 XVaNestedList preedit_attr, status_attr;
1192 XIMCallback ximcallback;
1193
1194 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1195 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1196 if (xim == NULL)
1197 return False;
1198
1199 xim_styles = NULL;
1200 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1201 || !xim_styles || !xim_styles->count_styles) {
1202 XCloseIM(xim);
1203 return False;
1204 }
1205
1206 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1207 : "OverTheSpot,OffTheSpot,Root";
1208 s = rxvt_splitcommastring(p);
1209 for (i = found = 0; !found && s[i]; i++) {
1210 if (!STRCMP(s[i], "OverTheSpot"))
1211 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1212 else if (!STRCMP(s[i], "OffTheSpot"))
1213 R->input_style = (XIMPreeditArea | XIMStatusArea);
1214 else if (!STRCMP(s[i], "Root"))
1215 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1216
1217 for (j = 0; j < xim_styles->count_styles; j++)
1218 if (R->input_style == xim_styles->supported_styles[j]) {
1219 found = 1;
1220 break;
1221 }
1222 }
1223 for (i = 0; s[i]; i++)
1224 free(s[i]);
1225 free(s);
1226 XFree(xim_styles);
1227
1228 if (!found) {
1229 XCloseIM(xim);
1230 return False;
1231 }
1232
1233 ximcallback.callback = rxvt_IMDestroyCallback;
1234
1235/* XXX: not sure why we need this (as well as IC one below) */
1236 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1237
1238 preedit_attr = status_attr = NULL;
1239
1240 if (R->input_style & XIMPreeditPosition) {
1241 rxvt_setSize(aR_ & rect);
1242 rxvt_setPosition(aR_ & spot);
1243 rxvt_setColor(aR_ & fg, &bg);
1244
1245 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1246 XNSpotLocation, &spot,
1247 XNForeground, fg, XNBackground, bg,
1248 //XNFontSet, R->TermWin.fontset,
1249 NULL);
1250 } else if (R->input_style & XIMPreeditArea) {
1251 rxvt_setColor(aR_ & fg, &bg);
1252
1253 /*
1254 * The necessary width of preedit area is unknown
1255 * until create input context.
1256 */
1257 needed_rect.width = 0;
1258
1259 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1260
1261 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1262 XNForeground, fg, XNBackground, bg,
1263 //XNFontSet, R->TermWin.fontset,
1264 NULL);
1265 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1266 XNForeground, fg, XNBackground, bg,
1267 //XNFontSet, R->TermWin.fontset,
1268 NULL);
1269 }
1270 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1271 XNClientWindow, R->TermWin.parent[0],
1272 XNFocusWindow, R->TermWin.parent[0],
1273 XNDestroyCallback, &ximcallback,
1274 preedit_attr ? XNPreeditAttributes : NULL,
1275 preedit_attr,
1276 status_attr ? XNStatusAttributes : NULL,
1277 status_attr, NULL);
1278 if (preedit_attr)
1279 XFree(preedit_attr);
1280 if (status_attr)
1281 XFree(status_attr);
1282 if (R->Input_Context == NULL) {
1283 rxvt_print_error("failed to create input context");
1284 XCloseIM(xim);
1285 return False;
1286 }
1287 if (R->input_style & XIMPreeditArea)
1288 rxvt_IMSetStatusPosition(aR);
1289 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1290 return True;
1291}
1292
1293/* EXTPROTO */
1294void
1295rxvt_IMSetStatusPosition(pR)
1296{
1297 XRectangle preedit_rect, status_rect, *needed_rect;
1298 XVaNestedList preedit_attr, status_attr;
1299
1300 if (R->Input_Context == NULL
1301 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea)
1302 || !rxvt_IMisRunning(aR))
1303 return;
1304
1305/* Getting the necessary width of preedit area */ 1405 /* Getting the necessary width of preedit area */
1306 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1307 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1407 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1308 XFree(status_attr); 1408 XFree (status_attr);
1309 1409
1310 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1410 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1311 1411
1312 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1412 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1313 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1314 1414
1315 XSetICValues(R->Input_Context, 1415 XSetICValues (Input_Context,
1316 XNPreeditAttributes, preedit_attr, 1416 XNPreeditAttributes, preedit_attr,
1317 XNStatusAttributes, status_attr, NULL); 1417 XNStatusAttributes, status_attr, NULL);
1318 1418
1319 XFree(preedit_attr); 1419 XFree (preedit_attr);
1320 XFree(status_attr); 1420 XFree (status_attr);
1321} 1421}
1322#endif /* USE_XIM */ 1422#endif /* USE_XIM */
1323 1423
1324/*----------------------------------------------------------------------*/ 1424/*----------------------------------------------------------------------*/
1325rxvt_t rxvt_current_term; 1425rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines