Commit c6bf7f0c authored by Elliot Lee's avatar Elliot Lee

Warning fixes.

parent 08b87727
...@@ -306,6 +306,10 @@ gdk_fb_fill_span(GdkDrawable *drawable, GdkGC *gc, GdkSegment *cur, GdkColor *co ...@@ -306,6 +306,10 @@ gdk_fb_fill_span(GdkDrawable *drawable, GdkGC *gc, GdkSegment *cur, GdkColor *co
GdkFunction func = GDK_GC_FBDATA(gc)->values.function; GdkFunction func = GDK_GC_FBDATA(gc)->values.function;
cmask = GDK_GC_FBDATA(gc)->values.clip_mask; cmask = GDK_GC_FBDATA(gc)->values.clip_mask;
clipxoff = clipyoff = tsxoff = tsyoff = 0;
mask_rowstride = 0;
solid_stipple = FALSE;
clipmem = NULL;
if(cmask) if(cmask)
{ {
clipmem = GDK_DRAWABLE_IMPL_FBDATA(cmask)->mem; clipmem = GDK_DRAWABLE_IMPL_FBDATA(cmask)->mem;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "gdkfont.h" #include "gdkfont.h"
#include "gdkprivate-fb.h" #include "gdkprivate-fb.h"
#include "gdkpango.h" #include "gdkpango.h"
......
#include <string.h>
#include <stdlib.h>
#include "gdkprivate-fb.h" #include "gdkprivate-fb.h"
#include "gdkgc.h" #include "gdkgc.h"
#include "gdkfb.h" #include "gdkfb.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <string.h>
#include "gdk.h" #include "gdk.h"
#include "gdkimage.h" #include "gdkimage.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <sys/kd.h> #include <sys/kd.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
/* /*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
...@@ -483,10 +484,14 @@ handle_input(GIOChannel *gioc, GIOCondition cond, gpointer data) ...@@ -483,10 +484,14 @@ handle_input(GIOChannel *gioc, GIOCondition cond, gpointer data)
int n, left, dx=0, dy=0; int n, left, dx=0, dy=0;
PS2Mouse *mouse = data; PS2Mouse *mouse = data;
gboolean new_button1, new_button2, new_button3; gboolean new_button1, new_button2, new_button3;
time_t the_time = g_latest_time.tv_sec; time_t the_time;
GTimeVal curtime;
GdkWindow *mousewin; GdkWindow *mousewin;
gboolean got_motion = FALSE; gboolean got_motion = FALSE;
g_get_current_time(&curtime);
the_time = curtime.tv_usec;
while(1) /* Go through as many mouse events as we can */ while(1) /* Go through as many mouse events as we can */
{ {
for(left = sizeof(buf); left > 0; ) for(left = sizeof(buf); left > 0; )
...@@ -1036,13 +1041,15 @@ handle_keyboard_input(GIOChannel *gioc, GIOCondition cond, gpointer data) ...@@ -1036,13 +1041,15 @@ handle_keyboard_input(GIOChannel *gioc, GIOCondition cond, gpointer data)
int i, n; int i, n;
Keyboard *k = data; Keyboard *k = data;
time_t now; time_t now;
GTimeVal curtime;
n = read(k->fd, buf, sizeof(buf)); n = read(k->fd, buf, sizeof(buf));
if(n <= 0) if(n <= 0)
g_error("Nothing from keyboard!"); g_error("Nothing from keyboard!");
/* Now turn this into a keyboard event */ /* Now turn this into a keyboard event */
now = g_latest_time.tv_sec; g_get_current_time(&curtime);
now = curtime.tv_sec;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
{ {
......
...@@ -571,7 +571,15 @@ gdk_event_make(GdkWindow *window, GdkEventType type, gboolean append_to_queue) ...@@ -571,7 +571,15 @@ gdk_event_make(GdkWindow *window, GdkEventType type, gboolean append_to_queue)
if(evmask & type_masks[type]) if(evmask & type_masks[type])
{ {
GdkEvent *event = gdk_event_new(); GdkEvent *event = gdk_event_new();
#if 0
guint32 the_time = g_latest_time.tv_sec * 1000 + g_latest_time.tv_usec / 1000; guint32 the_time = g_latest_time.tv_sec * 1000 + g_latest_time.tv_usec / 1000;
#else
guint32 the_time;
GTimeVal gcurtime;
g_get_current_time(&gcurtime);
the_time = gcurtime.tv_sec * 1000 + gcurtime.tv_usec / 1000;
#endif
event->any.type = type; event->any.type = type;
event->any.window = gdk_window_ref(window); event->any.window = gdk_window_ref(window);
......
...@@ -111,7 +111,7 @@ pango_fb_font_map_load_font(PangoFontMap *fontmap, ...@@ -111,7 +111,7 @@ pango_fb_font_map_load_font(PangoFontMap *fontmap,
{ {
PangoFBFontMap *fbfm = (PangoFBFontMap *)fontmap; PangoFBFontMap *fbfm = (PangoFBFontMap *)fontmap;
PangoFBFont *retval; PangoFBFont *retval;
PangoFBFontListing *fl; PangoFBFontListing *fl = NULL;
int i; int i;
PangoFontDescription d2; PangoFontDescription d2;
......
...@@ -145,7 +145,7 @@ gdk_property_change (GdkWindow *window, ...@@ -145,7 +145,7 @@ gdk_property_change (GdkWindow *window,
{ {
GdkWindowFBData *fbd = GDK_WINDOW_FBDATA(window); GdkWindowFBData *fbd = GDK_WINDOW_FBDATA(window);
GdkWindowProperty *prop, *new_prop; GdkWindowProperty *prop, *new_prop;
int new_size; int new_size = 0;
GdkEvent *event; GdkEvent *event;
g_return_if_fail (window != NULL); g_return_if_fail (window != NULL);
......
...@@ -784,7 +784,7 @@ gdk_fb_window_move_resize (GdkWindow *window, ...@@ -784,7 +784,7 @@ gdk_fb_window_move_resize (GdkWindow *window,
if (!private->destroyed) if (!private->destroyed)
{ {
GdkRegion *old_region; GdkRegion *old_region = NULL;
GdkRectangle old_rect; GdkRectangle old_rect;
if(private->input_only) if(private->input_only)
......
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