Commit dc0b9c80 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

gdk/linux-fb/gdkdrawable-fb2.c update to latest Pango API

Sat Nov 24 13:39:51 2001  Manish Singh  <yosh@gimp.org>

        * gdk/linux-fb/gdkdrawable-fb2.c
        * gdk/linux-fb/gdkpango-fb.c: update to latest Pango API

        * gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised

        * gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
        set_family

        * gdk/linux-fb/gdkfbswitch.c: minor cleanups
parent 51eb87f3
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
Sat Nov 24 13:39:51 2001 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkdrawable-fb2.c
* gdk/linux-fb/gdkpango-fb.c: update to latest Pango API
* gdk/linux-fb/gdkwindow-fb.c: implement gdk_window_show_unraised
* gdk/linux-fb/gdkfont-fb.c (gdk_font_load): plug memleak on
set_family
* gdk/linux-fb/gdkfbswitch.c: minor cleanups
Sat Nov 24 22:05:27 2001 Kristian Rietveld <kristian@planet.nl>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't
......
......@@ -6,3 +6,5 @@ _libs
.libs
libgdk-x11.la
gxid
gdkfbmanager
gdkfbswitch
......@@ -1185,7 +1185,6 @@ _gdk_fb_draw_glyphs (GdkDrawable *drawable,
{
GdkFBDrawingContext fbdc;
GdkPixmapFBData pixmap;
PangoFT2Subfont subfont_index;
PangoGlyphInfo *gi;
FT_Face face;
FT_UInt glyph_index;
......@@ -1211,9 +1210,8 @@ _gdk_fb_draw_glyphs (GdkDrawable *drawable,
{
if (gi->glyph)
{
glyph_index = PANGO_FT2_GLYPH_INDEX (gi->glyph);
subfont_index = PANGO_FT2_GLYPH_SUBFONT (gi->glyph);
face = pango_ft2_get_face (font, subfont_index);
glyph_index = gi->glyph;
face = pango_ft2_font_get_face (font);
if (face)
{
......
#include <glib.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>
#include "gdkfbmanager.h"
......@@ -72,4 +74,6 @@ main (int argc, char *argv[])
/* Request a switch-to */
send (fd, &init_msg, sizeof (init_msg), 0);
g_print ("requested a switch to pid %d\n", init_msg.data);
return 0;
}
......@@ -182,7 +182,7 @@ gdk_font_load (const gchar *font_name)
break;
if (strcmp (pieces[2], "*")!=0)
pango_font_description_set_family (desc, g_strdup (pieces[2]));
pango_font_description_set_family (desc, pieces[2]);
if (!pieces[3])
break;
......@@ -212,7 +212,7 @@ gdk_font_load (const gchar *font_name)
break;
if (strcmp (pieces[7], "*")!=0)
pango_font_description_set_size (desc, atoi (pieces[7]) * PANGO_SCALE);
pango_font_description_set_size (desc, atoi (pieces[7]) * PANGO_SCALE);
if (pango_font_description_get_size (desc) == 0)
pango_font_description_set_size (desc, 12 * PANGO_SCALE);
......@@ -224,7 +224,7 @@ gdk_font_load (const gchar *font_name)
gdk_font_hash_insert (GDK_FONT_FONT, font);
g_strfreev(pieces);
g_strfreev (pieces);
pango_font_description_free (desc);
......
......@@ -7,5 +7,5 @@
PangoContext *
gdk_pango_context_get (void)
{
return pango_ft2_get_context ();
return pango_ft2_get_context (75.0, 75.0);
}
......@@ -739,8 +739,9 @@ gdk_fb_window_send_crossing_events (GdkWindow *src,
}
}
void
gdk_window_show (GdkWindow *window)
static void
show_window_internal (GdkWindow *window,
gboolean raise)
{
GdkWindowObject *private;
GdkWindow *mousewin;
......@@ -752,7 +753,9 @@ gdk_window_show (GdkWindow *window)
if (!private->destroyed && !GDK_WINDOW_IS_MAPPED (private))
{
private->state = 0;
gdk_fb_window_raise (window);
if (raise)
gdk_fb_window_raise (window);
if (all_parents_shown ((GdkWindowObject *)private->parent))
{
......@@ -779,6 +782,22 @@ gdk_window_show (GdkWindow *window)
}
}
void
gdk_window_show_unraised (GdkWindow *window)
{
g_return_if_fail (window != NULL);
show_window_internal (window, FALSE);
}
void
gdk_window_show (GdkWindow *window)
{
g_return_if_fail (window != NULL);
show_window_internal (window, TRUE);
}
void
gdk_window_hide (GdkWindow *window)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment