… | |
… | |
56 | STRNCPY (curlocale, locale, 128); |
56 | STRNCPY (curlocale, locale, 128); |
57 | setlocale (LC_CTYPE, curlocale); |
57 | setlocale (LC_CTYPE, curlocale); |
58 | } |
58 | } |
59 | } |
59 | } |
60 | |
60 | |
|
|
61 | #if ENABLE_COMBINING |
|
|
62 | class rxvt_composite_vec rxvt_composite; |
|
|
63 | |
|
|
64 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
|
|
65 | { |
|
|
66 | compose_char *cc; |
|
|
67 | |
|
|
68 | // break compose chains, as stupid readline really likes to duplicate |
|
|
69 | // composing characters for some reason near the end of a line. |
|
|
70 | cc = (*this)[c1]; |
|
|
71 | while (cc) |
|
|
72 | { |
|
|
73 | if (cc->c2 == c2) return c1; |
|
|
74 | cc = (*this)[cc->c1]; |
|
|
75 | } |
|
|
76 | |
|
|
77 | // check to see wether this combination already exists otherwise |
|
|
78 | for (cc = v.end (); cc-- > v.begin (); ) |
|
|
79 | { |
|
|
80 | if (cc->c1 == c1 && cc->c2 == c2) |
|
|
81 | return COMPOSE_LO + (cc - v.begin ()); |
|
|
82 | } |
|
|
83 | |
|
|
84 | // allocate a new combination |
|
|
85 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
|
|
86 | { |
|
|
87 | static int seen; |
|
|
88 | |
|
|
89 | if (!seen++) |
|
|
90 | fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); |
|
|
91 | |
|
|
92 | return REPLACEMENT_CHAR; |
|
|
93 | } |
|
|
94 | |
|
|
95 | v.push_back (compose_char (c1, c2)); |
|
|
96 | |
|
|
97 | return v.size () - 1 + COMPOSE_LO; |
|
|
98 | } |
|
|
99 | |
|
|
100 | int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) |
|
|
101 | { |
|
|
102 | compose_char *cc = (*this)[c]; |
|
|
103 | |
|
|
104 | if (!cc) |
|
|
105 | { |
|
|
106 | if (r) *r = c; |
|
|
107 | return 1; |
|
|
108 | } |
|
|
109 | |
|
|
110 | int len = expand (cc->c1, r); |
|
|
111 | |
|
|
112 | if (r) r += len; |
|
|
113 | |
|
|
114 | if (cc->c2 != NOCHAR) |
|
|
115 | { |
|
|
116 | len++; |
|
|
117 | if (r) *r++ = cc->c2; |
|
|
118 | } |
|
|
119 | |
|
|
120 | return len; |
|
|
121 | |
|
|
122 | } |
|
|
123 | #endif |
|
|
124 | |
61 | void * |
125 | void * |
62 | rxvt_term::operator new (size_t s) |
126 | rxvt_term::operator new (size_t s) |
63 | { |
127 | { |
64 | void *p = malloc (s); |
128 | void *p = malloc (s); |
65 | |
129 | |
… | |
… | |
80 | vt_ev (this, &rxvt_term::x_cb), |
144 | vt_ev (this, &rxvt_term::x_cb), |
81 | #ifdef HAVE_SCROLLBARS |
145 | #ifdef HAVE_SCROLLBARS |
82 | scrollbar_ev (this, &rxvt_term::x_cb), |
146 | scrollbar_ev (this, &rxvt_term::x_cb), |
83 | #endif |
147 | #endif |
84 | #ifdef MENUBAR |
148 | #ifdef MENUBAR |
85 | menubar_ev (this, &rxvt_term::x_cb), fixme |
149 | menubar_ev (this, &rxvt_term::x_cb), |
86 | #endif |
150 | #endif |
87 | #ifdef CURSOR_BLINK |
151 | #ifdef CURSOR_BLINK |
88 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
152 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
89 | #endif |
153 | #endif |
90 | #ifdef TEXT_BLINK |
154 | #ifdef TEXT_BLINK |
… | |
… | |
117 | #endif |
181 | #endif |
118 | |
182 | |
119 | delete TermWin.fontset; |
183 | delete TermWin.fontset; |
120 | |
184 | |
121 | if (display) |
185 | if (display) |
|
|
186 | { |
|
|
187 | selection_clear (); |
|
|
188 | |
|
|
189 | #ifdef MENUBAR |
|
|
190 | if (menubarGC) XFreeGC (display->display, menubarGC); |
|
|
191 | #endif |
|
|
192 | #ifdef XTERM_SCROLLBAR |
|
|
193 | if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); |
|
|
194 | if (ShadowGC) XFreeGC (display->display, ShadowGC); |
|
|
195 | #endif |
|
|
196 | #ifdef PLAIN_SCROLLBAR |
|
|
197 | if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); |
|
|
198 | #endif |
|
|
199 | #ifdef NEXT_SCROLLBAR |
|
|
200 | if (blackGC) XFreeGC (display->display, blackGC); |
|
|
201 | if (whiteGC) XFreeGC (display->display, whiteGC); |
|
|
202 | if (grayGC) XFreeGC (display->display, grayGC); |
|
|
203 | if (darkGC) XFreeGC (display->display, darkGC); |
|
|
204 | if (stippleGC) XFreeGC (display->display, stippleGC); |
|
|
205 | if (dimple) XFreePixmap (display->display, dimple); |
|
|
206 | if (upArrow) XFreePixmap (display->display, upArrow); |
|
|
207 | if (downArrow) XFreePixmap (display->display, downArrow); |
|
|
208 | if (upArrowHi) XFreePixmap (display->display, upArrowHi); |
|
|
209 | if (downArrowHi) XFreePixmap (display->display, downArrowHi); |
|
|
210 | #endif |
|
|
211 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
|
|
212 | if (topShadowGC) XFreeGC (display->display, topShadowGC); |
|
|
213 | if (botShadowGC) XFreeGC (display->display, botShadowGC); |
|
|
214 | if (scrollbarGC) XFreeGC (display->display, scrollbarGC); |
|
|
215 | #endif |
|
|
216 | if (TermWin.gc) XFreeGC (display->display, TermWin.gc); |
|
|
217 | |
|
|
218 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
219 | delete menuBar.drawable; |
|
|
220 | //if (menuBar.win) |
|
|
221 | // XDestroyWindow (display->display, menuBar.win); |
|
|
222 | #endif |
|
|
223 | delete TermWin.drawable; |
|
|
224 | // destroy all windows |
122 | if (TermWin.parent[0]) |
225 | if (TermWin.parent[0]) |
123 | XDestroyWindow (display->display, TermWin.parent[0]); |
226 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
227 | } |
124 | |
228 | |
125 | // TODO: free pixcolours, colours should become part of rxvt_display |
229 | // TODO: free pixcolours, colours should become part of rxvt_display |
126 | |
230 | |
127 | delete PixColors; |
231 | delete PixColors; |
128 | |
232 | |
129 | displays.put (display); |
233 | displays.put (display); |
130 | |
234 | |
131 | scr_release (); |
235 | scr_release (); |
132 | |
236 | |
|
|
237 | /* clear all resources */ |
|
|
238 | for (int i = 0; i < allocated.size (); i++) |
|
|
239 | free (allocated[i]); |
|
|
240 | |
|
|
241 | free (selection.text); |
|
|
242 | // TODO: manage env vars in child only(!) |
133 | free (env_windowid); |
243 | free (env_windowid); |
134 | free (env_display); |
244 | free (env_display); |
135 | free (env_term); |
245 | free (env_term); |
136 | free (env_colorfgbg); |
246 | free (env_colorfgbg); |
137 | free (locale); |
247 | free (locale); |
|
|
248 | #if 0 |
138 | free (codeset); |
249 | free (codeset); |
|
|
250 | #endif |
139 | |
251 | |
140 | delete envv; |
252 | delete envv; |
141 | delete argv; |
253 | delete argv; |
142 | } |
254 | } |
143 | |
255 | |
… | |
… | |
184 | delete this; |
296 | delete this; |
185 | } |
297 | } |
186 | |
298 | |
187 | /*----------------------------------------------------------------------*/ |
299 | /*----------------------------------------------------------------------*/ |
188 | /* rxvt_init () */ |
300 | /* rxvt_init () */ |
189 | /* LIBPROTO */ |
|
|
190 | rxvt_t |
|
|
191 | rxvt_init (int argc, const char *const *argv) |
|
|
192 | { |
|
|
193 | SET_R (new rxvt_term); |
|
|
194 | |
|
|
195 | if (!GET_R->init_vars () || !GET_R->init (argc, argv)) |
|
|
196 | { |
|
|
197 | delete GET_R; |
|
|
198 | SET_R (0); |
|
|
199 | } |
|
|
200 | |
|
|
201 | return GET_R; |
|
|
202 | } |
|
|
203 | |
|
|
204 | static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); |
|
|
205 | |
|
|
206 | void |
|
|
207 | rxvt_init_signals () |
|
|
208 | { |
|
|
209 | /* install exit handler for cleanup */ |
|
|
210 | #if 0 |
|
|
211 | #ifdef HAVE_ATEXIT |
|
|
212 | atexit (rxvt_clean_exit); |
|
|
213 | #else |
|
|
214 | #endif |
|
|
215 | #endif |
|
|
216 | |
|
|
217 | struct sigaction sa; |
|
|
218 | |
|
|
219 | sigfillset (&sa.sa_mask); |
|
|
220 | sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; |
|
|
221 | sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); |
|
|
222 | sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0); |
|
|
223 | sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); |
|
|
224 | sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); |
|
|
225 | sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); |
|
|
226 | sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); |
|
|
227 | |
|
|
228 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
|
|
229 | /* signal (SIGURG, SIG_DFL); */ |
|
|
230 | |
|
|
231 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
|
|
232 | //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); |
|
|
233 | } |
|
|
234 | |
|
|
235 | bool |
301 | bool |
236 | rxvt_term::init (int argc, const char *const *argv) |
302 | rxvt_term::init (int argc, const char *const *argv) |
237 | { |
303 | { |
|
|
304 | SET_R (this); |
|
|
305 | |
|
|
306 | if (!init_vars ()) |
|
|
307 | return false; |
|
|
308 | |
238 | /* |
309 | /* |
239 | * Save and then give up any super-user privileges |
310 | * Save and then give up any super-user privileges |
240 | * If we need privileges in any area then we must specifically request it. |
311 | * If we need privileges in any area then we must specifically request it. |
241 | * We should only need to be root in these cases: |
312 | * We should only need to be root in these cases: |
242 | * 1. write utmp entries on some systems |
313 | * 1. write utmp entries on some systems |
… | |
… | |
249 | |
320 | |
250 | const char **cmd_argv = init_resources (argc, argv); |
321 | const char **cmd_argv = init_resources (argc, argv); |
251 | |
322 | |
252 | set_locale (""); |
323 | set_locale (""); |
253 | |
324 | |
254 | #if (MENUBAR_MAX) |
325 | #if MENUBAR_MAX |
255 | menubar_read (rs[Rs_menu]); |
326 | menubar_read (rs[Rs_menu]); |
256 | #endif |
327 | #endif |
257 | #ifdef HAVE_SCROLLBARS |
328 | #ifdef HAVE_SCROLLBARS |
258 | if (Options & Opt_scrollBar) |
329 | if (Options & Opt_scrollBar) |
259 | scrollBar.setIdle (); /* set existence for size calculations */ |
330 | scrollBar.setIdle (); /* set existence for size calculations */ |
… | |
… | |
262 | create_windows (argc, argv); |
333 | create_windows (argc, argv); |
263 | |
334 | |
264 | init_xlocale (); |
335 | init_xlocale (); |
265 | |
336 | |
266 | scr_reset (); /* initialize screen */ |
337 | scr_reset (); /* initialize screen */ |
267 | #ifdef RXVT_GRAPHICS |
|
|
268 | Gr_reset (); /* reset graphics */ |
|
|
269 | #endif |
|
|
270 | |
338 | |
271 | #if 0 |
339 | #if 0 |
272 | XSynchronize (display->display, True); |
340 | XSynchronize (display->display, True); |
273 | #endif |
341 | #endif |
274 | |
342 | |
275 | #ifdef HAVE_SCROLLBARS |
343 | #ifdef HAVE_SCROLLBARS |
276 | if (Options & Opt_scrollBar) |
344 | if (Options & Opt_scrollBar) |
277 | resize_scrollbar (); /* create and map scrollbar */ |
345 | resize_scrollbar (); /* create and map scrollbar */ |
278 | #endif |
346 | #endif |
279 | #if (MENUBAR_MAX) |
347 | #if (MENUBAR_MAX) |
280 | if (menubar_visible (r)) |
348 | if (menubar_visible ()) |
281 | XMapWindow (display->display, menuBar.win); |
349 | XMapWindow (display->display, menuBar.win); |
282 | #endif |
350 | #endif |
283 | #ifdef TRANSPARENT |
351 | #ifdef TRANSPARENT |
284 | if (Options & Opt_transparent) |
352 | if (Options & Opt_transparent) |
285 | { |
353 | { |
… | |
… | |
298 | pty_ev.start (cmd_fd, EVENT_READ); |
366 | pty_ev.start (cmd_fd, EVENT_READ); |
299 | |
367 | |
300 | check_ev.start (); |
368 | check_ev.start (); |
301 | |
369 | |
302 | return true; |
370 | return true; |
|
|
371 | } |
|
|
372 | |
|
|
373 | static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); |
|
|
374 | |
|
|
375 | void |
|
|
376 | rxvt_init_signals () |
|
|
377 | { |
|
|
378 | /* install exit handler for cleanup */ |
|
|
379 | #if 0 |
|
|
380 | #ifdef HAVE_ATEXIT |
|
|
381 | atexit (rxvt_clean_exit); |
|
|
382 | #else |
|
|
383 | #endif |
|
|
384 | #endif |
|
|
385 | |
|
|
386 | struct sigaction sa; |
|
|
387 | |
|
|
388 | sigfillset (&sa.sa_mask); |
|
|
389 | sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; |
|
|
390 | sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); |
|
|
391 | sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0); |
|
|
392 | sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); |
|
|
393 | sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); |
|
|
394 | sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); |
|
|
395 | sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); |
|
|
396 | |
|
|
397 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
|
|
398 | /* signal (SIGURG, SIG_DFL); */ |
|
|
399 | |
|
|
400 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
|
|
401 | //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); |
303 | } |
402 | } |
304 | |
403 | |
305 | /* ------------------------------------------------------------------------- * |
404 | /* ------------------------------------------------------------------------- * |
306 | * SIGNAL HANDLING & EXIT HANDLER * |
405 | * SIGNAL HANDLING & EXIT HANDLER * |
307 | * ------------------------------------------------------------------------- */ |
406 | * ------------------------------------------------------------------------- */ |
… | |
… | |
331 | RETSIGTYPE |
430 | RETSIGTYPE |
332 | rxvt_Exit_signal (int sig) |
431 | rxvt_Exit_signal (int sig) |
333 | { |
432 | { |
334 | signal (sig, SIG_DFL); |
433 | signal (sig, SIG_DFL); |
335 | #ifdef DEBUG_CMD |
434 | #ifdef DEBUG_CMD |
336 | rxvt_print_error ("signal %d", sig); |
435 | rxvt_warn ("caught signal %d, exiting.\n", sig); |
337 | #endif |
436 | #endif |
338 | rxvt_clean_exit (); |
437 | rxvt_clean_exit (); |
339 | kill (getpid (), sig); |
438 | kill (getpid (), sig); |
340 | } |
439 | } |
341 | |
440 | |
… | |
… | |
379 | |
478 | |
380 | p = malloc (size); |
479 | p = malloc (size); |
381 | if (p) |
480 | if (p) |
382 | return p; |
481 | return p; |
383 | |
482 | |
384 | fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); |
483 | fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); |
385 | rxvt_clean_exit (); |
484 | rxvt_clean_exit (); |
386 | exit (EXIT_FAILURE); |
485 | exit (EXIT_FAILURE); |
387 | /* NOTREACHED */ |
486 | /* NOTREACHED */ |
388 | } |
487 | } |
389 | |
488 | |
… | |
… | |
395 | |
494 | |
396 | p = calloc (number, size); |
495 | p = calloc (number, size); |
397 | if (p) |
496 | if (p) |
398 | return p; |
497 | return p; |
399 | |
498 | |
400 | fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); |
499 | fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); |
401 | rxvt_clean_exit (); |
500 | rxvt_clean_exit (); |
402 | exit (EXIT_FAILURE); |
501 | exit (EXIT_FAILURE); |
403 | /* NOTREACHED */ |
502 | /* NOTREACHED */ |
404 | } |
503 | } |
405 | |
504 | |
… | |
… | |
414 | else |
513 | else |
415 | p = malloc (size); |
514 | p = malloc (size); |
416 | if (p) |
515 | if (p) |
417 | return p; |
516 | return p; |
418 | |
517 | |
419 | fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); |
518 | fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); |
420 | rxvt_clean_exit (); |
519 | rxvt_clean_exit (); |
421 | exit (EXIT_FAILURE); |
520 | exit (EXIT_FAILURE); |
422 | /* NOTREACHED */ |
521 | /* NOTREACHED */ |
423 | } |
522 | } |
424 | |
523 | |
… | |
… | |
616 | else |
715 | else |
617 | szHint.win_gravity = SouthWestGravity; |
716 | szHint.win_gravity = SouthWestGravity; |
618 | } |
717 | } |
619 | } |
718 | } |
620 | } |
719 | } |
|
|
720 | |
621 | /* TODO: BOUNDS */ |
721 | /* TODO: BOUNDS */ |
622 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
722 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
623 | TermWin.height = TermWin.nrow * TermWin.fheight; |
723 | TermWin.height = TermWin.nrow * TermWin.fheight; |
624 | max_width = MAX_COLS * TermWin.fwidth; |
724 | max_width = MAX_COLS * TermWin.fwidth; |
625 | max_height = MAX_ROWS * TermWin.fheight; |
725 | max_height = MAX_ROWS * TermWin.fheight; |
… | |
… | |
718 | * init = 1 - initialize |
818 | * init = 1 - initialize |
719 | * |
819 | * |
720 | * fontname == FONT_UP - switch to bigger font |
820 | * fontname == FONT_UP - switch to bigger font |
721 | * fontname == FONT_DN - switch to smaller font |
821 | * fontname == FONT_DN - switch to smaller font |
722 | */ |
822 | */ |
723 | void |
823 | bool |
724 | rxvt_term::change_font (int init, const char *fontname) |
824 | rxvt_term::change_font (const char *fontname) |
725 | {} |
825 | { |
|
|
826 | if (fontname == FONT_UP) |
|
|
827 | { |
|
|
828 | // TODO |
|
|
829 | } |
|
|
830 | else if (fontname == FONT_DN) |
|
|
831 | { |
|
|
832 | // TODO |
|
|
833 | } |
|
|
834 | else |
|
|
835 | { |
|
|
836 | rxvt_fontset *fs = new rxvt_fontset (this); |
726 | |
837 | |
727 | void |
838 | if (fs && fs->populate (fontname ? fontname : "fixed")) |
|
|
839 | { |
|
|
840 | delete TermWin.fontset; |
|
|
841 | TermWin.fontset = fs; |
|
|
842 | TermWin.fwidth = fs->base_font ()->width; |
|
|
843 | TermWin.fheight = fs->base_font ()->height; |
|
|
844 | TermWin.fbase = fs->base_font ()->ascent; |
|
|
845 | |
|
|
846 | if (TermWin.parent[0]) |
|
|
847 | { |
|
|
848 | resize_all_windows (0, 0, 0); |
|
|
849 | scr_remap_chars (); |
|
|
850 | scr_touch (true); |
|
|
851 | } |
|
|
852 | |
|
|
853 | return true; |
|
|
854 | } |
|
|
855 | } |
|
|
856 | |
|
|
857 | return false; |
|
|
858 | } |
|
|
859 | |
|
|
860 | bool |
728 | rxvt_term::font_up_down (int n, int direction) |
861 | rxvt_term::font_up_down (int n, int direction) |
729 | {} |
862 | { |
|
|
863 | return false; |
|
|
864 | } |
730 | |
865 | |
731 | /*----------------------------------------------------------------------*/ |
866 | /*----------------------------------------------------------------------*/ |
732 | /*----------------------------------------------------------------------*/ |
867 | /*----------------------------------------------------------------------*/ |
733 | /* xterm sequences - title, iconName, color (exptl) */ |
868 | /* xterm sequences - title, iconName, color (exptl) */ |
734 | void |
869 | void |
735 | rxvt_term::set_title (const char *str) |
870 | rxvt_term::set_title (const char *str) |
736 | { |
871 | { |
737 | #ifndef SMART_WINDOW_TITLE |
872 | #ifndef SMART_WINDOW_TITLE |
738 | XStoreName (display->display, TermWin.parent[0], str); |
873 | XStoreName (display->display, TermWin.parent[0], str); |
739 | #else |
874 | #else |
740 | char *name; |
875 | char *name; |
741 | |
876 | |
742 | if (XFetchName (display->display, TermWin.parent[0], &name) == 0) |
877 | if (!XFetchName (display->display, TermWin.parent[0], &name)) |
743 | name = NULL; |
878 | name = NULL; |
|
|
879 | |
744 | if (name == NULL || STRCMP (name, str)) |
880 | if (name == NULL || STRCMP (name, str)) |
745 | XStoreName (display->display, TermWin.parent[0], str); |
881 | XStoreName (display->display, TermWin.parent[0], str); |
|
|
882 | |
746 | if (name) |
883 | if (name) |
747 | XFree (name); |
884 | XFree (name); |
748 | #endif |
885 | #endif |
749 | } |
886 | } |
750 | |
887 | |
751 | void |
888 | void |
752 | rxvt_term::set_iconName (const char *str) |
889 | rxvt_term::set_icon_name (const char *str) |
753 | { |
890 | { |
754 | #ifndef SMART_WINDOW_TITLE |
891 | #ifndef SMART_WINDOW_TITLE |
755 | XSetIconName (display->display, TermWin.parent[0], str); |
892 | XSetIconName (display->display, TermWin.parent[0], str); |
756 | #else |
893 | #else |
757 | char *name; |
894 | char *name; |
758 | |
895 | |
759 | if (XGetIconName (display->display, TermWin.parent[0], &name)) |
896 | if (!XGetIconName (display->display, TermWin.parent[0], &name)) |
760 | name = NULL; |
897 | name = NULL; |
|
|
898 | |
761 | if (name == NULL || STRCMP (name, str)) |
899 | if (name == NULL || STRCMP (name, str)) |
762 | XSetIconName (display->display, TermWin.parent[0], str); |
900 | XSetIconName (display->display, TermWin.parent[0], str); |
|
|
901 | |
763 | if (name) |
902 | if (name) |
764 | XFree (name); |
903 | XFree (name); |
765 | #endif |
904 | #endif |
766 | } |
905 | } |
767 | |
906 | |
768 | #ifdef XTERM_COLOR_CHANGE |
907 | #ifdef XTERM_COLOR_CHANGE |
769 | void |
908 | void |
770 | rxvt_term::set_window_color (int idx, const char *color) |
909 | rxvt_term::set_window_color (int idx, const char *color) |
771 | { |
910 | { |
772 | rxvt_color xcol; |
911 | rxvt_color xcol; |
773 | int i; |
912 | int i; |
774 | |
913 | |
775 | if (color == NULL || *color == '\0') |
914 | if (color == NULL || *color == '\0') |
776 | return; |
915 | return; |
777 | |
916 | |
778 | /* handle color aliases */ |
917 | /* handle color aliases */ |
… | |
… | |
905 | int |
1044 | int |
906 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1045 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
907 | { |
1046 | { |
908 | if (!screen_in_out->set (display, colour)) |
1047 | if (!screen_in_out->set (display, colour)) |
909 | { |
1048 | { |
910 | rxvt_print_error ("can't allocate colour: %s", colour); |
1049 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
911 | return false; |
1050 | return false; |
912 | } |
1051 | } |
913 | |
1052 | |
914 | return true; |
1053 | return true; |
915 | } |
1054 | } |
… | |
… | |
995 | 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1134 | 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); |
996 | |
1135 | |
997 | XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, |
1136 | XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, |
998 | window_vt_y, TermWin_TotalWidth (), |
1137 | window_vt_y, TermWin_TotalWidth (), |
999 | TermWin_TotalHeight ()); |
1138 | TermWin_TotalHeight ()); |
1000 | #ifdef RXVT_GRAPHICS |
1139 | scr_clear (height != old_height); |
1001 | if (old_height) |
|
|
1002 | Gr_Resize (old_width - szHint.base_width, |
|
|
1003 | old_height - szHint.base_height); |
|
|
1004 | #endif |
|
|
1005 | scr_clear (); |
|
|
1006 | #ifdef XPM_BACKGROUND |
1140 | #ifdef XPM_BACKGROUND |
1007 | resize_pixmap (); |
1141 | resize_pixmap (); |
1008 | #endif |
1142 | #endif |
1009 | |
1143 | |
1010 | } |
1144 | } |
… | |
… | |
1287 | if (preedit_attr) XFree (preedit_attr); |
1421 | if (preedit_attr) XFree (preedit_attr); |
1288 | if (status_attr) XFree (status_attr); |
1422 | if (status_attr) XFree (status_attr); |
1289 | |
1423 | |
1290 | if (Input_Context == NULL) |
1424 | if (Input_Context == NULL) |
1291 | { |
1425 | { |
1292 | rxvt_print_error ("failed to create input context"); |
1426 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1293 | display->put_xim (input_method); |
1427 | display->put_xim (input_method); |
1294 | return false; |
1428 | return false; |
1295 | } |
1429 | } |
1296 | |
1430 | |
1297 | if (input_style & XIMPreeditArea) |
1431 | if (input_style & XIMPreeditArea) |