Commit 393ad738 authored by Eric Warmenhoven's avatar Eric Warmenhoven Committed by Eric Warmenhoven

Move gdk_keval_name and gdk_keyval_from_name to new gdkkeynames.c, share

Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>

	* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
	gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
	gdk_keyval_from_name to new gdkkeynames.c, share implementation for
	linux-fb and win32 (#94123)

	* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
	gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
	-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
	flags

	* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
	initialize

	* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes

	* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
parent afecb32d
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
gdk_keyval_from_name to new gdkkeynames.c, share implementation for
linux-fb and win32 (#94123)
* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
flags
* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
initialize
* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes
* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
Fri Sep 27 17:23:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Fix some signed/unsigned warnings.
......
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
gdk_keyval_from_name to new gdkkeynames.c, share implementation for
linux-fb and win32 (#94123)
* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
flags
* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
initialize
* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes
* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
Fri Sep 27 17:23:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Fix some signed/unsigned warnings.
......
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
gdk_keyval_from_name to new gdkkeynames.c, share implementation for
linux-fb and win32 (#94123)
* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
flags
* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
initialize
* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes
* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
Fri Sep 27 17:23:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Fix some signed/unsigned warnings.
......
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
gdk_keyval_from_name to new gdkkeynames.c, share implementation for
linux-fb and win32 (#94123)
* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
flags
* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
initialize
* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes
* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
Fri Sep 27 17:23:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Fix some signed/unsigned warnings.
......
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
gdk_keyval_from_name to new gdkkeynames.c, share implementation for
linux-fb and win32 (#94123)
* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
flags
* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
initialize
* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes
* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
Fri Sep 27 17:23:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Fix some signed/unsigned warnings.
......
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c
gdk/win32/gdkkeys-win32.c: Move gdk_keval_name and
gdk_keyval_from_name to new gdkkeynames.c, share implementation for
linux-fb and win32 (#94123)
* gdk/linux-fb/Makefile.am gdk/linux-fb/gdkkeyboard-fb.c
gdk/linux-fb/gdkmain-fb.c gdk/linux-fb/gdkmouse-fb.c: add
-DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile
flags
* gdk/linux-fb/gdkdisplay-fb.c: prevent segfault if display can't
initialize
* gdk/linux-fb/gdkkeyboard-fb.c: better parsing of keycodes
* gdk/linux-fb/gdkwindow-fb.c: add stubs for new functions
Fri Sep 27 17:23:31 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c: Fix some signed/unsigned warnings.
......
......@@ -163,10 +163,16 @@ gdk_c_sources = @STRIP_BEGIN@ \
gdkincludedir = $(includedir)/gtk-2.0/gdk
gdkinclude_HEADERS = $(gdk_headers)
# gdkmarshalers.c is commented out becuase it is currently an empty file
libgdk_x11_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c gdkmarshalers.h # gdkmarshalers.c
libgdk_linux_fb_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c gdkmarshalers.h # gdkmarshalers.c
libgdk_win32_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c # gdkmarshalers.c
# gdkmarshalers.c is not here becuase it is currently an empty file
common_sources = @STRIP_BEGIN@ \
$(gdk_c_sources) \
gdkenumtypes.c \
gdkmarshalers.h \
@STRIP_END@
libgdk_x11_2_0_la_SOURCES = $(common_sources)
libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la @GDK_DEP_LIBS@
libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
......
This diff is collapsed.
......@@ -15,6 +15,8 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GDK_DEP_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \
@STRIP_END@
......
......@@ -30,7 +30,7 @@
GdkDisplay *
gdk_display_open (const gchar *display_name)
{
if (_gdk_display != NULL)
if (gdk_display == NULL || _gdk_display != NULL)
return NULL; /* single display only */
_gdk_display = g_object_new (GDK_TYPE_DISPLAY, NULL);
......
......@@ -192,7 +192,7 @@ gdk_fb_keyboard_init (gboolean open_dev)
for (i = 0; i < G_N_ELEMENTS(keyb_devs); i++)
{
if (g_strcasecmp(keyb_type, keyb_devs[i].name)==0)
if (g_ascii_strcasecmp(keyb_type, keyb_devs[i].name)==0)
break;
}
......@@ -394,7 +394,8 @@ gdk_fb_handle_key (guint hw_keycode,
/* handle some magic keys */
if (key_up &&
(modifier_state & (GDK_CONTROL_MASK|GDK_MOD1_MASK)))
(modifier_state & GDK_CONTROL_MASK) &&
(modifier_state & GDK_MOD1_MASK))
{
if (keyval == GDK_BackSpace)
{
......@@ -783,7 +784,7 @@ xlate_io (GIOChannel *gioc,
if (n <= 0)
g_error ("Nothing from keyboard!");
for (i = 0; i < n; i++)
for (i = 0; i < n; )
{
handled = FALSE;
modifier = 0;
......
......@@ -209,9 +209,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "true")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "true")==0)
laced = 1;
else if (g_strcasecmp (scanner->value.v_identifier, "false")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "false")==0)
laced = 0;
else
{
......@@ -226,9 +226,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "true")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "true")==0)
extsync = 1;
else if (g_strcasecmp (scanner->value.v_identifier, "false")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "false")==0)
extsync = 0;
else
{
......@@ -243,9 +243,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "true")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "true")==0)
doublescan = 1;
else if (g_strcasecmp (scanner->value.v_identifier, "false")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "false")==0)
doublescan = 0;
else
{
......@@ -260,9 +260,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "high")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "high")==0)
vsync = 1;
else if (g_strcasecmp (scanner->value.v_identifier, "low")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "low")==0)
vsync = 0;
else
{
......@@ -277,9 +277,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "high")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "high")==0)
hsync = 1;
else if (g_strcasecmp (scanner->value.v_identifier, "low")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "low")==0)
hsync = 0;
else
{
......@@ -294,9 +294,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "high")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "high")==0)
csync = 1;
else if (g_strcasecmp (scanner->value.v_identifier, "low")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "low")==0)
csync = 0;
else
{
......@@ -311,9 +311,9 @@ fb_modes_parse_mode (GScanner *scanner,
g_free (modename);
return -1;
}
if (g_strcasecmp (scanner->value.v_identifier, "false")==0)
if (g_ascii_strcasecmp (scanner->value.v_identifier, "false")==0)
accel = 0;
else if (g_strcasecmp (scanner->value.v_identifier, "true")==0)
else if (g_ascii_strcasecmp (scanner->value.v_identifier, "true")==0)
accel = 1;
else
{
......@@ -691,7 +691,7 @@ gdk_fb_display_new ()
s = getenv("GDK_VT");
if (s)
{
if (g_strcasecmp ("new", s)==0)
if (g_ascii_strcasecmp ("new", s)==0)
{
n = ioctl (display->console_fd, VT_OPENQRY, &vt);
if (n < 0 || vt == -1)
......@@ -1272,18 +1272,6 @@ _gdk_windowing_exit (void)
gdk_display = NULL;
}
gchar*
gdk_keyval_name (guint keyval)
{
return NULL;
}
guint
gdk_keyval_from_name (const gchar *keyval_name)
{
return 0;
}
gchar *
gdk_get_display(void)
{
......
......@@ -324,7 +324,7 @@ gdk_fb_mouse_init (gboolean open_dev)
for (i=0;i<G_N_ELEMENTS(mouse_devs);i++)
{
if (g_strcasecmp(mouse_type, mouse_devs[i].name)==0)
if (g_ascii_strcasecmp(mouse_type, mouse_devs[i].name)==0)
break;
}
......
......@@ -2183,6 +2183,22 @@ gdk_window_deiconify (GdkWindow *window)
/* g_warning ("gdk_window_deiconify() not implemented.\n");*/
}
void
gdk_window_fullscreen (GdkWindow *window)
{
g_return_if_fail (GDK_IS_WINDOW (window));
g_warning ("gdk_window_fullscreen() not implemented.\n");
}
void
gdk_window_unfullscreen (GdkWindow *window)
{
g_return_if_fail (GDK_IS_WINDOW (window));
/* g_warning ("gdk_window_unfullscreen() not implemented.\n");*/
}
void
gdk_window_focus (GdkWindow *window,
guint32 timestamp)
......@@ -2207,6 +2223,20 @@ gdk_window_set_modal_hint (GdkWindow *window,
g_return_if_fail (GDK_IS_WINDOW (window));
}
void
gdk_window_set_skip_taskbar_hint (GdkWindow *window,
gboolean skips_taskbar)
{
g_return_if_fail (GDK_IS_WINDOW (window));
}
void
gdk_window_set_skip_pager_hint (GdkWindow *window,
gboolean skips_pager)
{
g_return_if_fail (GDK_IS_WINDOW (window));
}
void
gdk_window_begin_resize_drag (GdkWindow *window,
GdkWindowEdge edge,
......
This diff is collapsed.
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