aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--widgets/misc/e-colors.c47
-rw-r--r--widgets/misc/e-colors.h17
-rw-r--r--widgets/misc/e-cursors.c174
-rw-r--r--widgets/misc/e-cursors.h50
4 files changed, 191 insertions, 97 deletions
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
index ba86538dab..0a376262a4 100644
--- a/widgets/misc/e-colors.c
+++ b/widgets/misc/e-colors.c
@@ -1,74 +1,75 @@
/*
- * color.c: Color allocation on the Gnumeric spreadsheet
+ * e_color.c: General color allocation utilities
*
* Author:
* Miguel de Icaza (miguel@kernel.org)
*
* We keep our own color context, as the color allocation might take place
- * before any of our Canvases are realized.
+ * before things are realized.
*/
#include <config.h>
#include <gnome.h>
-#include "color.h"
+#include "e-colors.h"
-static int color_inited;
-static GdkColorContext *gnumeric_color_context;
+static gboolean e_color_inited;
+static GdkColorContext *e_color_context;
-/* Public colors: shared by all of our items in Gnumeric */
-GdkColor gs_white, gs_black, gs_light_gray, gs_dark_gray, gs_red, gs_lavender;
+GdkColor gs_white, gs_dark_gray, gs_black;
int
-color_alloc (gushort red, gushort green, gushort blue)
+e_color_alloc (gushort red, gushort green, gushort blue)
{
int failed;
- if (!color_inited)
- color_init ();
+ if (!e_color_inited)
+ e_color_init ();
- return gdk_color_context_get_pixel (gnumeric_color_context,
+ return gdk_color_context_get_pixel (e_color_context,
red, green, blue, &failed);
}
void
-color_alloc_gdk (GdkColor *c)
+e_color_alloc_gdk (GdkColor *c)
{
int failed;
g_return_if_fail (c != NULL);
- c->pixel = gdk_color_context_get_pixel (gnumeric_color_context, c->red, c->green, c->blue, &failed);
+ if (!e_color_inited)
+ e_color_init ();
+
+ c->pixel = gdk_color_context_get_pixel (e_color_context, c->red, c->green, c->blue, &failed);
}
void
-color_alloc_name (const char *name, GdkColor *c)
+e_color_alloc_name (const char *name, GdkColor *c)
{
int failed;
g_return_if_fail (name != NULL);
g_return_if_fail (c != NULL);
+ if (!e_color_inited)
+ e_color_init ();
+
gdk_color_parse (name, c);
c->pixel = 0;
- c->pixel = gdk_color_context_get_pixel (gnumeric_color_context, c->red, c->green, c->blue, &failed);
+ c->pixel = gdk_color_context_get_pixel (e_color_context, c->red, c->green, c->blue, &failed);
}
void
-color_init (void)
+e_color_init (void)
{
GdkColormap *colormap = gtk_widget_get_default_colormap ();
/* Initialize the color context */
- gnumeric_color_context = gdk_color_context_new (
+ e_color_context = gdk_color_context_new (
gtk_widget_get_default_visual (), colormap);
/* Allocate the default colors */
gdk_color_white (colormap, &gs_white);
gdk_color_black (colormap, &gs_black);
+ e_color_alloc_name ("gray20", &gs_dark_gray);
- color_alloc_name ("gray78", &gs_light_gray);
- color_alloc_name ("gray20", &gs_dark_gray);
- color_alloc_name ("red", &gs_red);
- color_alloc_name ("lavender",&gs_lavender);
-
- color_inited = 1;
+ e_color_inited = TRUE;
}
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
index 4a2cb74c73..08fa67dd67 100644
--- a/widgets/misc/e-colors.h
+++ b/widgets/misc/e-colors.h
@@ -1,14 +1,13 @@
-#ifndef GNUMERIC_COLOR_H
-#define GNUMERIC_COLOR_H
+#ifndef GNOME_APP_LIBS_COLOR_H
+#define GNOME_APP_LIBS_COLOR_H
-void color_init (void);
+void e_color_init (void);
/* Return the pixel value for the given red, green and blue */
-int color_alloc (gushort red, gushort green, gushort blue);
-void color_alloc_name (const char *name, GdkColor *color);
-void color_alloc_gdk (GdkColor *color);
+int e_color_alloc (gushort red, gushort green, gushort blue);
+void e_color_alloc_name (const char *name, GdkColor *color);
+void e_color_alloc_gdk (GdkColor *color);
-/* Colors used by any GnumericSheet item */
-extern GdkColor gs_white, gs_light_gray, gs_dark_gray, gs_black, gs_red, gs_lavender;
+extern GdkColor e_white, e_dark_gray, e_black;
-#endif /* GNUMERIC_COLOR_H */
+#endif /* GNOME_APP_LIBS_COLOR_H */
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index 79447247c8..c10e0e6490 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -1,40 +1,134 @@
-#ifndef GNUMERIC_CURSORS_H
-#define GNUMERIC_CURSORS_H
-
-#include <gdk/gdk.h>
-
-typedef enum {
- GNUMERIC_CURSOR_FAT_CROSS,
- GNUMERIC_CURSOR_THIN_CROSS,
- GNUMERIC_CURSOR_ARROW,
- GNUMERIC_CURSOR_MOVE,
- GNUMERIC_CURSOR_ZOOM_IN,
- GNUMERIC_CURSOR_ZOOM_OUT,
- GNUMERIC_CURSOR_SIZE_X,
- GNUMERIC_CURSOR_SIZE_Y,
- GNUMERIC_CURSOR_SIZE_TL,
- GNUMERIC_CURSOR_SIZE_TR,
- GNUMERIC_CURSOR_PRESS,
- GNUMERIC_CURSOR_HAND_OPEN,
- GNUMERIC_CURSOR_HAND_CLOSED,
- GNUMERIC_CURSOR_NUM_CURSORS
-} CursorType;
-
-void cursors_init (void);
-void cursors_shutdown (void);
-
-#define cursor_set(win, c) \
-G_STMT_START { \
- if (win) \
- gdk_window_set_cursor (win, cursor_get (c)); \
-} G_STMT_END
-
-#define cursor_set_widget(w, c) \
-G_STMT_START { \
- if (GTK_WIDGET (w)->window) \
- gdk_window_set_cursor (GTK_WIDGET (w)->window, cursor_get (c)); \
-} G_STMT_END
-
-GdkCursor *cursor_get (CursorType type);
-
-#endif /* GNUMERIC_CURSORS_H */
+/*
+ * cursors.c: cursor handling for Gnumeric
+ *
+ * Authors:
+ * Miguel de Icaza (miguel@gnu.org)
+ */
+#include <config.h>
+#include <gnome.h>
+#include "e-colors.h"
+#include "e-cursors.h"
+#include "pixmaps/cursor_cross.xpm"
+#include "pixmaps/cursor_zoom_in.xpm"
+#include "pixmaps/cursor_zoom_out.xpm"
+#include "pixmaps/cursor_hand_open.xpm"
+#include "pixmaps/cursor_hand_closed.xpm"
+
+#define GDK_INTERNAL_CURSOR -1
+
+typedef struct {
+ GdkCursor *cursor;
+ int hot_x, hot_y;
+ char **xpm;
+} CursorDef;
+
+static CursorDef cursors [] = {
+ { NULL, 17, 17, cursor_cross_xpm },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_CROSSHAIR, NULL },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_ARROW, NULL },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_FLEUR, NULL },
+ { NULL, 24, 24, cursor_zoom_in_xpm },
+ { NULL, 24, 24, cursor_zoom_out_xpm },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_SB_H_DOUBLE_ARROW, NULL },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_SB_V_DOUBLE_ARROW, NULL },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_SIZING, NULL },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_SIZING, NULL },
+ { NULL, GDK_INTERNAL_CURSOR, GDK_HAND2, NULL },
+ { NULL, 10, 10, cursor_hand_open_xpm },
+ { NULL, 10, 10, cursor_hand_closed_xpm },
+ { NULL, 0, 0, NULL }
+};
+
+
+static void
+create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
+{
+ int height, width, colors;
+ char pixmap_buffer [(32 * 32)/8];
+ char mask_buffer [(32 * 32)/8];
+ int x, y, pix, yofs;
+ int transparent_color, black_color;
+
+ sscanf (xpm [0], "%d %d %d %d", &height, &width, &colors, &pix);
+
+ g_assert (height == 32);
+ g_assert (width == 32);
+ g_assert (colors <= 3);
+
+ transparent_color = ' ';
+ black_color = '.';
+
+ yofs = colors + 1;
+ for (y = 0; y < 32; y++){
+ for (x = 0; x < 32;){
+ char value = 0, maskv = 0;
+
+ for (pix = 0; pix < 8; pix++, x++){
+ if (xpm [y + yofs][x] != transparent_color){
+ maskv |= 1 << pix;
+
+ /*
+ * Invert the colours here because it seems
+ * to workaround a bug the Matrox G100 Xserver?
+ * We reverse the foreground & background in the next
+ * routine to compensate.
+ */
+ if (xpm [y + yofs][x] == black_color){
+ value |= 1 << pix;
+ }
+ }
+ }
+ pixmap_buffer [(y * 4 + x/8)-1] = value;
+ mask_buffer [(y * 4 + x/8)-1] = maskv;
+ }
+ }
+ *bitmap = gdk_bitmap_create_from_data (NULL, pixmap_buffer, 32, 32);
+ *mask = gdk_bitmap_create_from_data (NULL, mask_buffer, 32, 32);
+}
+
+void
+e_cursors_init (void)
+{
+ int i;
+
+ for (i = 0; cursors [i].hot_x; i++){
+ GdkBitmap *bitmap, *mask;
+
+ if (cursors [i].hot_x < 0)
+ cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y);
+ else {
+ create_bitmap_and_mask_from_xpm (&bitmap, &mask, cursors [i].xpm);
+
+ /* The foreground and background colours are reversed.
+ * See comment above for explanation.
+ */
+ cursors [i].cursor =
+ gdk_cursor_new_from_pixmap (
+ bitmap, mask,
+ &e_black, &e_white,
+ cursors [i].hot_x,
+ cursors [i].hot_y);
+ }
+ }
+
+ g_assert (i == E_CURSOR_NUM_CURSORS);
+}
+
+void
+e_cursors_shutdown (void)
+{
+ int i;
+
+ for (i = 0; cursors [i].hot_x; i++)
+ gdk_cursor_destroy (cursors [i].cursor);
+}
+
+
+/* Returns a cursor given its type */
+GdkCursor *
+e_cursor_get (ECursorType type)
+{
+ g_return_val_if_fail (type >= 0 && type < E_CURSOR_NUM_CURSORS, NULL);
+
+ return cursors [type].cursor;
+}
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index 79447247c8..5373c942bb 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -1,40 +1,40 @@
-#ifndef GNUMERIC_CURSORS_H
-#define GNUMERIC_CURSORS_H
+#ifndef GNOME_APP_LIB_CURSORS_H
+#define GNOME_APP_LIB_CURSORS_H
#include <gdk/gdk.h>
typedef enum {
- GNUMERIC_CURSOR_FAT_CROSS,
- GNUMERIC_CURSOR_THIN_CROSS,
- GNUMERIC_CURSOR_ARROW,
- GNUMERIC_CURSOR_MOVE,
- GNUMERIC_CURSOR_ZOOM_IN,
- GNUMERIC_CURSOR_ZOOM_OUT,
- GNUMERIC_CURSOR_SIZE_X,
- GNUMERIC_CURSOR_SIZE_Y,
- GNUMERIC_CURSOR_SIZE_TL,
- GNUMERIC_CURSOR_SIZE_TR,
- GNUMERIC_CURSOR_PRESS,
- GNUMERIC_CURSOR_HAND_OPEN,
- GNUMERIC_CURSOR_HAND_CLOSED,
- GNUMERIC_CURSOR_NUM_CURSORS
-} CursorType;
+ E_CURSOR_FAT_CROSS,
+ E_CURSOR_THIN_CROSS,
+ E_CURSOR_ARROW,
+ E_CURSOR_MOVE,
+ E_CURSOR_ZOOM_IN,
+ E_CURSOR_ZOOM_OUT,
+ E_CURSOR_SIZE_X,
+ E_CURSOR_SIZE_Y,
+ E_CURSOR_SIZE_TL,
+ E_CURSOR_SIZE_TR,
+ E_CURSOR_PRESS,
+ E_CURSOR_HAND_OPEN,
+ E_CURSOR_HAND_CLOSED,
+ E_CURSOR_NUM_CURSORS
+} ECursorType;
-void cursors_init (void);
-void cursors_shutdown (void);
+void e_cursors_init (void);
+void e_cursors_shutdown (void);
-#define cursor_set(win, c) \
+#define e_cursor_set(win, c) \
G_STMT_START { \
if (win) \
- gdk_window_set_cursor (win, cursor_get (c)); \
+ gdk_window_set_cursor (win, e_cursor_get (c)); \
} G_STMT_END
-#define cursor_set_widget(w, c) \
+#define e_cursor_set_widget(w, c) \
G_STMT_START { \
if (GTK_WIDGET (w)->window) \
- gdk_window_set_cursor (GTK_WIDGET (w)->window, cursor_get (c)); \
+ gdk_window_set_cursor (GTK_WIDGET (w)->window, e_cursor_get (c)); \
} G_STMT_END
-GdkCursor *cursor_get (CursorType type);
+GdkCursor *e_cursor_get (ECursorType type);
-#endif /* GNUMERIC_CURSORS_H */
+#endif /* GNOME_APP_LIB_CURSORS_H */
generated by cgit (git 2.34.1) at 2024-11-17 06:14:31 +0800