diff options
author | Thomas Thurman <thomas@thurman.org.uk> | 2007-11-16 02:53:25 +0000 |
---|---|---|
committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2007-11-16 02:53:25 +0000 |
commit | 14c046d18dad1dd112eafa4ed5f02e23405bc826 (patch) | |
tree | 7a4a7b911553b095110ff9ff84d84f0bbe402e40 | |
parent | 386ffb4752c4cae6ab55d623d262e801c2c0f274 (diff) | |
download | metacity-14c046d18dad1dd112eafa4ed5f02e23405bc826.tar.gz |
remove almost-unused files. move the used parts of api.[ch] in here.
2007-11-15 Thomas Thurman <thomas@thurman.org.uk>
* src/api.[ch]: remove almost-unused files.
* src/colors.[ch]: move the used parts of api.[ch] in here.
Closes #496947.
svn path=/trunk/; revision=3401
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | src/api.c | 55 | ||||
-rw-r--r-- | src/api.h | 64 | ||||
-rw-r--r-- | src/colors.c | 11 | ||||
-rw-r--r-- | src/colors.h | 6 |
5 files changed, 24 insertions, 122 deletions
@@ -1,9 +1,15 @@ +2007-11-15 Thomas Thurman <thomas@thurman.org.uk> + + * src/api.[ch]: remove almost-unused files. + * src/colors.[ch]: move the used parts of api.[ch] in here. + Closes #496947. + 2007-11-13 Peter Bloomfield <pbloomfield@bellsouth.net> * src/window.c: (meta_window_save_user_rect): new helper, saves - only unmaximized dimensions, and not when fullscreen. + only unmaximized dimensions, and not when fullscreen. (meta_window_move_resize_internal, - meta_window_move_resize_request): use it. (#461927) + meta_window_move_resize_request): use it. (#461927) 2007-11-11 Thomas Thurman <thomas@thurman.org.uk> diff --git a/src/api.c b/src/api.c deleted file mode 100644 index 5ce14618..00000000 --- a/src/api.c +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -/* Metacity misc. public entry points */ - -/* - * Copyright (C) 2001 Havoc Pennington - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#include "api.h" -#include "display.h" -#include "colors.h" - -PangoContext* -meta_get_pango_context (Screen *xscreen, - const PangoFontDescription *desc) -{ - MetaScreen *screen; - - screen = meta_screen_for_x_screen (xscreen); - - g_return_val_if_fail (screen != NULL, NULL); - - return meta_screen_get_pango_context (screen, - desc, - /* FIXME, from the frame window */ - PANGO_DIRECTION_LTR); -} - -gulong -meta_get_x_pixel (Screen *xscreen, const PangoColor *color) -{ - MetaScreen *screen; - - screen = meta_screen_for_x_screen (xscreen); - - g_return_val_if_fail (screen != NULL, 0); - - return meta_screen_get_x_pixel (screen, color); -} - diff --git a/src/api.h b/src/api.h deleted file mode 100644 index 6ad938b5..00000000 --- a/src/api.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -/* Metacity misc. public entry points */ - -/* - * Copyright (C) 2001 Havoc Pennington - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef META_API_H -#define META_API_H - -/* don't add any internal headers here; api.h is an installed/public - * header. Only theme.h is also installed. - */ -#include <X11/Xlib.h> -#include <pango/pangox.h> - -/* Colors/state stuff matches GTK since we get the info from - * the GTK UI slave - */ -typedef struct _MetaUIColors MetaUIColors; - -typedef enum -{ - META_STATE_NORMAL, - META_STATE_ACTIVE, - META_STATE_PRELIGHT, - META_STATE_SELECTED, - META_STATE_INSENSITIVE -} MetaUIState; - -struct _MetaUIColors -{ - PangoColor fg[5]; - PangoColor bg[5]; - PangoColor light[5]; - PangoColor dark[5]; - PangoColor mid[5]; - PangoColor text[5]; - PangoColor base[5]; - PangoColor text_aa[5]; -}; - -PangoContext* meta_get_pango_context (Screen *xscreen, - const PangoFontDescription *desc); -gulong meta_get_x_pixel (Screen *xscreen, - const PangoColor *color); - -#endif diff --git a/src/colors.c b/src/colors.c index 13340d5f..2110590a 100644 --- a/src/colors.c +++ b/src/colors.c @@ -23,6 +23,17 @@ #include "colors.h" +struct _MetaUIColors +{ + PangoColor fg[5]; + PangoColor bg[5]; + PangoColor light[5]; + PangoColor dark[5]; + PangoColor mid[5]; + PangoColor text[5]; + PangoColor base[5]; + PangoColor text_aa[5]; +}; static void visual_decompose_mask (gulong mask, diff --git a/src/colors.h b/src/colors.h index 41bde10b..1bf47355 100644 --- a/src/colors.h +++ b/src/colors.h @@ -24,13 +24,17 @@ #ifndef META_COLORS_H #define META_COLORS_H +/* Colors/state stuff matches GTK. + */ +typedef struct _MetaUIColors MetaUIColors; + /* This stuff will all just be XlibRGB eventually. Right now * it has a stub implementation. */ #include "screen.h" #include "util.h" -#include "api.h" + gulong meta_screen_get_x_pixel (MetaScreen *screen, const PangoColor *color); void meta_screen_init_visual_info (MetaScreen *screen); |