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.18 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.41 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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