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.36 by pcg, Sat Feb 21 20:33:40 2004 UTC vs.
Revision 1.46 by pcg, Tue Feb 24 22:28:42 2004 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
79 vt_ev (this, &rxvt_term::x_cb), 80 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 81#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 82 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 83#endif
83#ifdef MENUBAR 84#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 85 menubar_ev (this, &rxvt_term::x_cb),
85#endif 86#endif
86#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 89#endif
89#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
… …
116#endif 117#endif
117 118
118 delete TermWin.fontset; 119 delete TermWin.fontset;
119 120
120 if (display) 121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
121 if (TermWin.parent[0]) 130 if (TermWin.parent[0])
122 XDestroyWindow (display->display, TermWin.parent[0]); 131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
123 133
124 // TODO: free pixcolours, colours should become part of rxvt_display 134 // TODO: free pixcolours, colours should become part of rxvt_display
125 135
126 delete PixColors; 136 delete PixColors;
127 137
… …
248 258
249 const char **cmd_argv = init_resources (argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
250 260
251 set_locale (""); 261 set_locale ("");
252 262
253#if (MENUBAR_MAX) 263#if MENUBAR_MAX
254 menubar_read (rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
255#endif 265#endif
256#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
257 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
258 scrollBar.setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
… …
261 create_windows (argc, argv); 271 create_windows (argc, argv);
262 272
263 init_xlocale (); 273 init_xlocale ();
264 274
265 scr_reset (); /* initialize screen */ 275 scr_reset (); /* initialize screen */
266#ifdef RXVT_GRAPHICS
267 Gr_reset (); /* reset graphics */
268#endif
269 276
270#if 1 277#if 0
271 XSynchronize (display->display, True); 278 XSynchronize (display->display, True);
272#endif 279#endif
273 280
274#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
275 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
276 resize_scrollbar (); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
277#endif 284#endif
278#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
279 if (menubar_visible (r)) 286 if (menubar_visible ())
280 XMapWindow (display->display, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
281#endif 288#endif
282#ifdef TRANSPARENT 289#ifdef TRANSPARENT
283 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
284 { 291 {
… …
717 * init = 1 - initialize 724 * init = 1 - initialize
718 * 725 *
719 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
720 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
721 */ 728 */
722void 729bool
723rxvt_term::change_font (int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
724{} 731{
732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
725 743
726void 744 if (fs && fs->populate (fontname ? fontname : "fixed"))
745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
727rxvt_term::font_up_down (int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
728{} 768{
769 return false;
770}
729 771
730/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
731/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
732/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
733void 775void
734rxvt_term::set_title (const char *str) 776rxvt_term::set_title (const char *str)
735{ 777{
736#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
737 XStoreName (display->display, TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
738#else 780#else
739 char *name; 781 char *name;
740 782
741 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
742 name = NULL; 784 name = NULL;
743 if (name == NULL || STRCMP (name, str)) 785 if (name == NULL || STRCMP (name, str))
744 XStoreName (display->display, TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
… …
751rxvt_term::set_iconName (const char *str) 793rxvt_term::set_iconName (const char *str)
752{ 794{
753#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
754 XSetIconName (display->display, TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
755#else 797#else
756 char *name; 798 char *name;
757 799
758 if (XGetIconName (display->display, TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
759 name = NULL; 801 name = NULL;
760 if (name == NULL || STRCMP (name, str)) 802 if (name == NULL || STRCMP (name, str))
761 XSetIconName (display->display, TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
… …
766 808
767#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
768void 810void
769rxvt_term::set_window_color (int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
770{ 812{
771 rxvt_color xcol; 813 rxvt_color xcol;
772 int i; 814 int i;
773 815
774 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
775 return; 817 return;
776 818
777 /* handle color aliases */ 819 /* handle color aliases */
… …
994 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
995 1037
996 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
997 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
998 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
999#ifdef RXVT_GRAPHICS
1000 if (old_height)
1001 Gr_Resize (old_width - szHint.base_width,
1002 old_height - szHint.base_height);
1003#endif
1004 scr_clear (); 1041 scr_clear ();
1005#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1006 resize_pixmap (); 1043 resize_pixmap ();
1007#endif 1044#endif
1008 1045
… …
1314 if (Input_Context) 1351 if (Input_Context)
1315 return; 1352 return;
1316 1353
1317#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318 if (rs[Rs_imLocale]) 1355 if (rs[Rs_imLocale])
1319 rxvt_set_locale (rs[Rs_imLocale]); 1356 SET_LOCALE (rs[Rs_imLocale]);
1320#endif 1357#endif
1321 1358
1322 p = rs[Rs_inputMethod]; 1359 p = rs[Rs_inputMethod];
1323 if (p && *p) 1360 if (p && *p)
1324 { 1361 {
… …
1355 goto done; 1392 goto done;
1356 1393
1357done: 1394done:
1358#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359 if (rs[Rs_imLocale]) 1396 if (rs[Rs_imLocale])
1360 rxvt_set_locale (locale); 1397 SET_LOCALE (locale);
1361#endif 1398#endif
1362} 1399}
1363 1400
1364void 1401void
1365rxvt_term::IMSetStatusPosition () 1402rxvt_term::IMSetStatusPosition ()

Diff Legend

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