[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.40 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

     vt_ev (this, &rxvt_term::x_cb),
 #ifdef HAVE_SCROLLBARS
     scrollbar_ev (this, &rxvt_term::x_cb),
 #endif
 #ifdef MENUBAR
-    menubar_ev (this, &rxvt_term::x_cb), fixme
+    menubar_ev (this, &rxvt_term::x_cb),
 #endif
 #ifdef CURSOR_BLINK
     cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
 #endif
 #ifdef TEXT_BLINK
 #endif
   delete TermWin.fontset;
   if (display)
+    {
-    if (TermWin.parent[0])
+      if (TermWin.parent[0])
-      XDestroyWindow (display->display, TermWin.parent[0]);
+        XDestroyWindow (display->display, TermWin.parent[0]);
+#if defined(MENUBAR) && (MENUBAR_MAX > 1)
+      if (menuBar.win)
+        XDestroyWindow (display->display, menuBar.win);
+      delete menuBar.drawable;
+#endif
+    }
   // TODO: free pixcolours, colours should become part of rxvt_display
   delete PixColors;
   const char **cmd_argv = init_resources (argc, argv);
   set_locale ("");
-#if (MENUBAR_MAX)
+#if MENUBAR_MAX
   menubar_read (rs[Rs_menu]);
 #endif
 #ifdef HAVE_SCROLLBARS
   if (Options & Opt_scrollBar)
     scrollBar.setIdle ();    /* set existence for size calculations */
 #ifdef HAVE_SCROLLBARS
   if (Options & Opt_scrollBar)
     resize_scrollbar ();      /* create and map scrollbar */
 #endif
 #if (MENUBAR_MAX)
-  if (menubar_visible (r))
+  if (menubar_visible ())
     XMapWindow (display->display, menuBar.win);
 #endif
 #ifdef TRANSPARENT
   if (Options & Opt_transparent)
     {
  * init = 1   - initialize
  *
  * fontname == FONT_UP  - switch to bigger font
  * fontname == FONT_DN  - switch to smaller font
  */
-void
+bool
-rxvt_term::change_font (int init, const char *fontname)
+rxvt_term::change_font (const char *fontname)
-{}
+{
+  if (fontname == FONT_UP)
+    {
+      // TODO
+    }
+  else if (fontname == FONT_DN)
+    {
+      // TODO
+    }
+  else
+    {
+      rxvt_fontset *fs = new rxvt_fontset (this);
-void
+      if (fs && fs->populate (fontname))
+        {
+          delete TermWin.fontset;
+          TermWin.fontset = fs;
+          TermWin.fwidth  = fs->base_font ()->width;
+          TermWin.fheight = fs->base_font ()->height;
+          TermWin.fbase   = fs->base_font ()->ascent;
+          // TODO: screen needs to be told about new fonts
+          if (TermWin.parent[0])
+            {
+              resize_all_windows (0, 0, 0);
+              scr_remap_chars ();
+              scr_touch (true);
+            }
+          return true;
+        }
+    }
+  return false;
+}
+bool
 rxvt_term::font_up_down (int n, int direction)
-{}
+{
+  return false;
+}
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 /* xterm sequences - title, iconName, color (exptl) */
 void

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.40 by pcg, Sun Feb 22 08:09:38 2004 UTC vs. Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.40 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC