isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove almost-unused files. move the used parts of api.[ch] in here.

Browse Source 
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
This commit is contained in:
Thomas Thurman 2007-11-16 02:53:25 +00:00 committed by Thomas James Alexander Thurman
parent 386ffb4752
commit 14c046d18d
5 changed files with 24 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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> 2007-11-13 Peter Bloomfield <pbloomfield@bellsouth.net>
* src/window.c: (meta_window_save_user_rect): new helper, saves * src/window.c: (meta_window_save_user_rect): new helper, saves

55
src/api.c
View File

@ -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);
}

64
src/api.h
View File

@ -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

11
src/colors.c
View File

@ -23,6 +23,17 @@
#include "colors.h" #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 static void
visual_decompose_mask (gulong mask, visual_decompose_mask (gulong mask,

6
src/colors.h
View File

@ -24,13 +24,17 @@
#ifndef META_COLORS_H #ifndef META_COLORS_H
#define 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 /* This stuff will all just be XlibRGB eventually. Right now
* it has a stub implementation. * it has a stub implementation.
*/ */
#include "screen.h" #include "screen.h"
#include "util.h" #include "util.h"
#include "api.h"
gulong meta_screen_get_x_pixel (MetaScreen *screen, gulong meta_screen_get_x_pixel (MetaScreen *screen,
const PangoColor *color); const PangoColor *color);
void meta_screen_init_visual_info (MetaScreen *screen); void meta_screen_init_visual_info (MetaScreen *screen);