2007-10-03 17:26:14 +02:00
|
|
|
/*
|
2007-09-12 14:29:51 +02:00
|
|
|
* draw.c - draw functions
|
2007-10-03 17:26:14 +02:00
|
|
|
*
|
2008-01-02 16:59:43 +01:00
|
|
|
* Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
|
2007-10-03 17:26:14 +02:00
|
|
|
*
|
|
|
|
* 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.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*
|
2007-09-12 14:29:51 +02:00
|
|
|
*/
|
2007-09-05 20:15:00 +02:00
|
|
|
|
2008-03-21 16:50:17 +01:00
|
|
|
#include <cairo-xcb.h>
|
|
|
|
|
2008-06-03 11:16:25 +02:00
|
|
|
#include "config.h"
|
2008-05-23 17:17:38 +02:00
|
|
|
#ifdef WITH_IMLIB2
|
2008-04-09 19:56:54 +02:00
|
|
|
#include <Imlib2.h>
|
|
|
|
#else
|
2008-06-13 23:24:07 +02:00
|
|
|
#include <gdk/gdkcairo.h>
|
2008-04-03 06:41:30 +02:00
|
|
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
|
|
|
#endif
|
2008-02-04 13:28:20 +01:00
|
|
|
|
2008-03-21 16:50:17 +01:00
|
|
|
#include <xcb/xcb.h>
|
|
|
|
#include <xcb/xcb_aux.h>
|
|
|
|
|
2008-02-04 13:28:20 +01:00
|
|
|
#include <langinfo.h>
|
|
|
|
#include <iconv.h>
|
|
|
|
#include <errno.h>
|
2008-03-21 16:50:17 +01:00
|
|
|
#include <string.h>
|
2008-04-25 15:50:36 +02:00
|
|
|
#include <ctype.h>
|
2007-10-11 17:06:55 +02:00
|
|
|
#include <math.h>
|
2008-02-04 13:28:20 +01:00
|
|
|
|
2008-06-23 00:14:42 +02:00
|
|
|
#include "common/tokenize.h"
|
2008-04-28 08:51:30 +02:00
|
|
|
#include "common/draw.h"
|
2008-04-28 11:22:47 +02:00
|
|
|
#include "common/markup.h"
|
2008-06-17 16:55:24 +02:00
|
|
|
#include "common/xutil.h"
|
2007-09-05 20:15:00 +02:00
|
|
|
|
2008-07-10 17:09:57 +02:00
|
|
|
void
|
|
|
|
draw_parser_data_init(draw_parser_data_t *pdata)
|
2008-06-23 15:21:29 +02:00
|
|
|
{
|
|
|
|
p_clear(pdata, 1);
|
|
|
|
buffer_init(&pdata->text);
|
|
|
|
}
|
|
|
|
|
2008-07-10 17:09:57 +02:00
|
|
|
void
|
|
|
|
draw_parser_data_wipe(draw_parser_data_t *pdata)
|
2008-06-23 15:21:29 +02:00
|
|
|
{
|
2008-07-10 17:09:57 +02:00
|
|
|
if(pdata)
|
|
|
|
{
|
|
|
|
buffer_wipe(&pdata->text);
|
|
|
|
draw_image_delete(&pdata->bg_image);
|
|
|
|
}
|
2008-06-23 15:21:29 +02:00
|
|
|
}
|
|
|
|
|
2008-07-09 08:48:51 +02:00
|
|
|
static iconv_t iso2utf8 = (iconv_t) -1;
|
|
|
|
|
2008-07-01 14:44:19 +02:00
|
|
|
/** Convert text from any charset to UTF-8 using iconv.
|
|
|
|
* \param iso The ISO string to convert.
|
|
|
|
* \param len The string size.
|
|
|
|
* \return NULL if error, otherwise pointer to the new converted string.
|
2008-02-27 09:32:45 +01:00
|
|
|
*/
|
2008-06-10 07:32:35 +02:00
|
|
|
char *
|
2008-07-01 14:44:19 +02:00
|
|
|
draw_iso2utf8(const char *iso, size_t len)
|
2008-02-04 13:28:20 +01:00
|
|
|
{
|
2008-07-01 14:44:19 +02:00
|
|
|
size_t utf8len;
|
2008-02-11 10:52:05 +01:00
|
|
|
char *utf8, *utf8p;
|
2008-02-04 13:28:20 +01:00
|
|
|
|
2008-07-01 14:44:19 +02:00
|
|
|
if(!len)
|
2008-02-04 13:28:20 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if(!a_strcmp(nl_langinfo(CODESET), "UTF-8"))
|
2008-02-11 09:21:09 +01:00
|
|
|
return NULL;
|
2008-02-04 13:28:20 +01:00
|
|
|
|
|
|
|
if(iso2utf8 == (iconv_t) -1)
|
|
|
|
{
|
2008-07-09 08:48:51 +02:00
|
|
|
iso2utf8 = iconv_open("UTF-8", nl_langinfo(CODESET));
|
|
|
|
if(iso2utf8 == (iconv_t) -1)
|
|
|
|
{
|
|
|
|
if(errno == EINVAL)
|
|
|
|
warn("unable to convert text from %s to UTF-8, not available",
|
|
|
|
nl_langinfo(CODESET));
|
|
|
|
else
|
|
|
|
warn("unable to convert text: %s", strerror(errno));
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-02-04 13:28:20 +01:00
|
|
|
}
|
|
|
|
|
2008-04-04 11:07:57 +02:00
|
|
|
utf8len = 2 * len + 1;
|
2008-02-11 10:52:05 +01:00
|
|
|
utf8 = utf8p = p_new(char, utf8len);
|
2008-02-04 13:28:20 +01:00
|
|
|
|
2008-04-25 15:50:36 +02:00
|
|
|
if(iconv(iso2utf8, (char **) &iso, &len, &utf8, &utf8len) == (size_t) -1)
|
2008-02-04 13:28:20 +01:00
|
|
|
{
|
2008-05-23 22:53:59 +02:00
|
|
|
warn("text conversion failed: %s", strerror(errno));
|
2008-02-11 10:52:05 +01:00
|
|
|
p_delete(&utf8p);
|
2008-02-04 13:28:20 +01:00
|
|
|
}
|
|
|
|
|
2008-02-11 10:52:05 +01:00
|
|
|
return utf8p;
|
2008-02-04 13:28:20 +01:00
|
|
|
}
|
|
|
|
|
2008-03-21 16:50:17 +01:00
|
|
|
static xcb_visualtype_t *
|
2008-04-09 13:26:02 +02:00
|
|
|
draw_screen_default_visual(xcb_screen_t *s)
|
2008-03-21 16:50:17 +01:00
|
|
|
{
|
|
|
|
xcb_depth_iterator_t depth_iter;
|
|
|
|
xcb_visualtype_iterator_t visual_iter;
|
|
|
|
|
|
|
|
if(!s)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for(depth_iter = xcb_screen_allowed_depths_iterator(s);
|
|
|
|
depth_iter.rem; xcb_depth_next (&depth_iter))
|
|
|
|
for(visual_iter = xcb_depth_visuals_iterator (depth_iter.data);
|
|
|
|
visual_iter.rem; xcb_visualtype_next (&visual_iter))
|
|
|
|
if (s->root_visual == visual_iter.data->visual_id)
|
|
|
|
return visual_iter.data;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-06-04 16:13:41 +02:00
|
|
|
/** Create a new draw context.
|
|
|
|
* \param conn Connection ref.
|
|
|
|
* \param phys_screen Physical screen id.
|
|
|
|
* \param width Width.
|
|
|
|
* \param height Height.
|
|
|
|
* \param px Pixmap object to store.
|
2008-06-02 12:18:17 +02:00
|
|
|
* \param fg Foreground color.
|
|
|
|
* \param bg Background color.
|
2008-06-04 16:13:41 +02:00
|
|
|
* \return A draw context pointer.
|
2007-12-30 15:11:37 +01:00
|
|
|
*/
|
2008-04-28 15:32:30 +02:00
|
|
|
draw_context_t *
|
2008-06-02 12:18:17 +02:00
|
|
|
draw_context_new(xcb_connection_t *conn, int phys_screen,
|
2008-06-04 16:13:41 +02:00
|
|
|
int width, int height, xcb_pixmap_t px,
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
const xcolor_t *fg, const xcolor_t *bg)
|
2007-12-15 00:12:17 +01:00
|
|
|
{
|
2008-04-28 15:32:30 +02:00
|
|
|
draw_context_t *d = p_new(draw_context_t, 1);
|
2008-06-17 16:55:24 +02:00
|
|
|
xcb_screen_t *s = xutil_screen_get(conn, phys_screen);
|
2007-12-30 12:26:11 +01:00
|
|
|
|
2008-03-21 16:50:17 +01:00
|
|
|
d->connection = conn;
|
2007-12-15 00:12:17 +01:00
|
|
|
d->phys_screen = phys_screen;
|
|
|
|
d->width = width;
|
|
|
|
d->height = height;
|
2008-03-21 16:50:17 +01:00
|
|
|
d->depth = s->root_depth;
|
2008-04-09 13:26:02 +02:00
|
|
|
d->visual = draw_screen_default_visual(s);
|
2008-06-04 16:13:41 +02:00
|
|
|
d->pixmap = px;
|
|
|
|
d->surface = cairo_xcb_surface_create(conn, px, d->visual, width, height);
|
2008-01-31 18:18:15 +01:00
|
|
|
d->cr = cairo_create(d->surface);
|
2008-03-17 12:38:49 +01:00
|
|
|
d->layout = pango_cairo_create_layout(d->cr);
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
d->fg = *fg;
|
|
|
|
d->bg = *bg;
|
2007-12-30 12:26:11 +01:00
|
|
|
|
2007-12-15 00:12:17 +01:00
|
|
|
return d;
|
|
|
|
};
|
|
|
|
|
2008-03-17 12:38:49 +01:00
|
|
|
/** Create a new Pango font
|
2008-03-21 16:50:17 +01:00
|
|
|
* \param conn Connection ref
|
2008-06-13 19:17:35 +02:00
|
|
|
* \param phys_screen The physical screen number.
|
2008-03-17 12:38:49 +01:00
|
|
|
* \param fontname Pango fontname (e.g. [FAMILY-LIST] [STYLE-OPTIONS] [SIZE])
|
2008-03-21 11:26:56 +01:00
|
|
|
* \return a new font
|
2008-03-17 12:38:49 +01:00
|
|
|
*/
|
|
|
|
font_t *
|
2008-05-20 15:39:47 +02:00
|
|
|
draw_font_new(xcb_connection_t *conn, int phys_screen, const char *fontname)
|
2008-03-17 12:38:49 +01:00
|
|
|
{
|
|
|
|
cairo_surface_t *surface;
|
2008-06-17 16:55:24 +02:00
|
|
|
xcb_screen_t *s = xutil_screen_get(conn, phys_screen);
|
2008-03-17 12:38:49 +01:00
|
|
|
cairo_t *cr;
|
|
|
|
PangoLayout *layout;
|
|
|
|
font_t *font = p_new(font_t, 1);
|
|
|
|
|
|
|
|
/* Create a dummy cairo surface, cairo context and pango layout in
|
|
|
|
* order to get font informations */
|
2008-03-21 16:50:17 +01:00
|
|
|
surface = cairo_xcb_surface_create(conn,
|
|
|
|
phys_screen,
|
2008-04-09 13:26:02 +02:00
|
|
|
draw_screen_default_visual(s),
|
2008-03-21 16:50:17 +01:00
|
|
|
s->width_in_pixels,
|
|
|
|
s->height_in_pixels);
|
2008-03-17 12:38:49 +01:00
|
|
|
|
|
|
|
cr = cairo_create(surface);
|
|
|
|
layout = pango_cairo_create_layout(cr);
|
|
|
|
|
|
|
|
/* Get the font description used to set text on a PangoLayout */
|
|
|
|
font->desc = pango_font_description_from_string(fontname);
|
|
|
|
pango_layout_set_font_description(layout, font->desc);
|
|
|
|
|
|
|
|
/* Get height */
|
|
|
|
pango_layout_get_pixel_size(layout, NULL, &font->height);
|
|
|
|
|
|
|
|
g_object_unref(layout);
|
|
|
|
cairo_destroy(cr);
|
|
|
|
cairo_surface_destroy(surface);
|
|
|
|
|
|
|
|
return font;
|
|
|
|
}
|
|
|
|
|
2008-06-17 09:37:19 +02:00
|
|
|
/** Delete a font.
|
|
|
|
* \param font Font to delete.
|
2008-03-17 12:38:49 +01:00
|
|
|
*/
|
|
|
|
void
|
2008-03-21 11:26:56 +01:00
|
|
|
draw_font_delete(font_t **font)
|
2008-03-17 12:38:49 +01:00
|
|
|
{
|
2008-05-21 17:02:22 +02:00
|
|
|
if(*font)
|
|
|
|
{
|
|
|
|
pango_font_description_free((*font)->desc);
|
|
|
|
p_delete(font);
|
|
|
|
}
|
2008-03-17 12:38:49 +01:00
|
|
|
}
|
|
|
|
|
2008-06-22 17:45:45 +02:00
|
|
|
static void
|
2008-06-23 13:32:22 +02:00
|
|
|
draw_markup_on_element(markup_parser_data_t *p, const char *elem,
|
|
|
|
const char **names, const char **values)
|
2008-06-22 17:45:45 +02:00
|
|
|
{
|
|
|
|
draw_parser_data_t *data = p->priv;
|
|
|
|
|
|
|
|
/* hack: markup.c validates tags so we can avoid strcmps here */
|
|
|
|
switch (*elem) {
|
2008-07-09 10:25:29 +02:00
|
|
|
case 'b':
|
|
|
|
if(elem[1] == 'g') /* bg */
|
|
|
|
for(; *names; names++, values++)
|
|
|
|
switch(a_tokenize(*names, -1))
|
|
|
|
{
|
|
|
|
case A_TK_COLOR:
|
2008-07-10 15:30:16 +02:00
|
|
|
data->has_bg_color = xcolor_init(&data->bg_color,
|
|
|
|
data->connection,
|
|
|
|
data->phys_screen,
|
|
|
|
*values,
|
|
|
|
a_strlen(*values));
|
2008-07-09 10:25:29 +02:00
|
|
|
break;
|
|
|
|
case A_TK_IMAGE:
|
|
|
|
if(data->bg_image)
|
|
|
|
draw_image_delete(&data->bg_image);
|
|
|
|
data->bg_image = draw_image_new(*values);
|
|
|
|
break;
|
|
|
|
case A_TK_ALIGN:
|
|
|
|
data->bg_align = draw_align_fromstr(*values, -1);
|
2008-07-09 10:38:39 +02:00
|
|
|
break;
|
2008-07-09 10:25:29 +02:00
|
|
|
case A_TK_RESIZE:
|
|
|
|
data->bg_resize = a_strtobool(*values, -1);
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else /* border */
|
|
|
|
for(; *names; names++, values++)
|
|
|
|
switch(a_tokenize(*names, -1))
|
|
|
|
{
|
|
|
|
case A_TK_COLOR:
|
2008-07-10 15:30:16 +02:00
|
|
|
xcolor_init(&data->border.color, data->connection,
|
|
|
|
data->phys_screen, *values, a_strlen(*values));
|
2008-07-09 10:25:29 +02:00
|
|
|
break;
|
|
|
|
case A_TK_WIDTH:
|
|
|
|
data->border.width = atoi(*values);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-06-22 17:45:45 +02:00
|
|
|
break;
|
|
|
|
case 't': /* text */
|
2008-06-23 13:39:47 +02:00
|
|
|
for(; *names; names++, values++)
|
2008-06-24 22:24:13 +02:00
|
|
|
switch(a_tokenize(*names, -1))
|
2008-06-23 13:39:47 +02:00
|
|
|
{
|
|
|
|
case A_TK_ALIGN:
|
2008-06-24 22:24:13 +02:00
|
|
|
data->align = draw_align_fromstr(*values, -1);
|
2008-06-23 13:39:47 +02:00
|
|
|
break;
|
|
|
|
case A_TK_SHADOW:
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
xcolor_init(&data->shadow.color, data->connection,
|
2008-07-10 15:30:16 +02:00
|
|
|
data->phys_screen, *values, a_strlen(*values));
|
2008-06-23 13:39:47 +02:00
|
|
|
break;
|
|
|
|
case A_TK_SHADOW_OFFSET:
|
2008-06-22 17:45:45 +02:00
|
|
|
data->shadow.offset = atoi(*values);
|
2008-06-23 13:39:47 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-06-22 17:45:45 +02:00
|
|
|
break;
|
|
|
|
case 'm': /* margin */
|
|
|
|
for (; *names; names++, values++)
|
2008-06-23 13:39:47 +02:00
|
|
|
switch(a_tokenize(*names, -1))
|
|
|
|
{
|
|
|
|
case A_TK_LEFT:
|
2008-06-22 17:45:45 +02:00
|
|
|
data->margin.left = atoi(*values);
|
2008-06-23 13:39:47 +02:00
|
|
|
break;
|
|
|
|
case A_TK_RIGHT:
|
2008-06-22 17:45:45 +02:00
|
|
|
data->margin.right = atoi(*values);
|
2008-06-23 13:39:47 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-06-22 17:45:45 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-10 17:09:57 +02:00
|
|
|
bool
|
2008-04-26 19:02:19 +02:00
|
|
|
draw_text_markup_expand(draw_parser_data_t *data,
|
|
|
|
const char *str, ssize_t slen)
|
|
|
|
{
|
2008-07-09 10:25:29 +02:00
|
|
|
static char const * const elements[] = { "bg", "text", "margin", "border", NULL };
|
2008-06-23 13:09:42 +02:00
|
|
|
markup_parser_data_t p =
|
|
|
|
{
|
2008-06-22 17:45:45 +02:00
|
|
|
.elements = elements,
|
|
|
|
.priv = data,
|
2008-06-23 13:32:22 +02:00
|
|
|
.on_element = &draw_markup_on_element,
|
2008-06-22 17:45:45 +02:00
|
|
|
};
|
2008-04-28 11:22:47 +02:00
|
|
|
|
2008-06-22 17:45:45 +02:00
|
|
|
markup_parser_data_init(&p);
|
2008-04-28 11:22:47 +02:00
|
|
|
|
2008-06-22 16:17:12 +02:00
|
|
|
if(!markup_parse(&p, str, slen))
|
2008-04-28 21:48:17 +02:00
|
|
|
{
|
2008-06-22 16:17:12 +02:00
|
|
|
markup_parser_data_wipe(&p);
|
2008-04-28 21:48:17 +02:00
|
|
|
return false;
|
|
|
|
}
|
2008-04-25 15:50:36 +02:00
|
|
|
|
2008-04-28 11:22:47 +02:00
|
|
|
/* stole text */
|
2008-06-23 15:21:29 +02:00
|
|
|
buffer_wipe(&data->text);
|
2008-06-22 16:17:12 +02:00
|
|
|
data->text = p.text;
|
|
|
|
buffer_init(&p.text);
|
|
|
|
markup_parser_data_wipe(&p);
|
2008-04-26 19:02:19 +02:00
|
|
|
|
|
|
|
return true;
|
2008-04-25 15:50:36 +02:00
|
|
|
}
|
|
|
|
|
2008-04-29 11:51:59 +02:00
|
|
|
/** Draw text into a draw context.
|
|
|
|
* \param ctx Draw context to draw to.
|
2008-06-13 19:17:35 +02:00
|
|
|
* \param font The font to use.
|
2008-04-29 11:51:59 +02:00
|
|
|
* \param area Area to draw to.
|
|
|
|
* \param text Text to draw.
|
2008-07-10 15:35:19 +02:00
|
|
|
* \param len Text to draw length.
|
2008-06-23 13:09:42 +02:00
|
|
|
* \param data Optional parser data.
|
2007-12-30 15:11:37 +01:00
|
|
|
*/
|
2007-09-15 15:16:53 +02:00
|
|
|
void
|
2008-05-20 15:39:47 +02:00
|
|
|
draw_text(draw_context_t *ctx, font_t *font,
|
2008-07-10 15:35:19 +02:00
|
|
|
area_t area, const char *text, ssize_t len, draw_parser_data_t *pdata)
|
2007-09-05 20:15:00 +02:00
|
|
|
{
|
2008-04-25 15:50:36 +02:00
|
|
|
int x, y;
|
|
|
|
PangoRectangle ext;
|
2008-04-26 19:02:19 +02:00
|
|
|
draw_parser_data_t parser_data;
|
2007-09-05 20:15:00 +02:00
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
if(!pdata)
|
|
|
|
{
|
2008-06-23 15:21:29 +02:00
|
|
|
draw_parser_data_init(&parser_data);
|
2008-06-23 13:09:42 +02:00
|
|
|
parser_data.connection = ctx->connection;
|
|
|
|
parser_data.phys_screen = ctx->phys_screen;
|
|
|
|
if(draw_text_markup_expand(&parser_data, text, len))
|
|
|
|
{
|
|
|
|
text = parser_data.text.s;
|
|
|
|
len = parser_data.text.len;
|
|
|
|
}
|
|
|
|
pdata = &parser_data;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
text = pdata->text.s;
|
|
|
|
len = pdata->text.len;
|
2008-06-22 15:27:06 +02:00
|
|
|
}
|
2008-02-04 13:28:20 +01:00
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
if(pdata->has_bg_color)
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
draw_rectangle(ctx, area, 1.0, true, &pdata->bg_color);
|
2007-10-16 01:20:03 +02:00
|
|
|
|
2008-07-09 10:25:29 +02:00
|
|
|
if(pdata->border.width > 0)
|
|
|
|
draw_rectangle(ctx, area, pdata->border.width, false, &pdata->border.color);
|
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
if(pdata->bg_image)
|
2008-06-17 09:37:19 +02:00
|
|
|
{
|
2008-06-23 18:01:15 +02:00
|
|
|
x = area.x;
|
|
|
|
y = area.y;
|
|
|
|
switch(pdata->bg_align)
|
|
|
|
{
|
|
|
|
case AlignCenter:
|
|
|
|
x += (area.width - pdata->bg_image->width) / 2;
|
|
|
|
break;
|
|
|
|
case AlignRight:
|
|
|
|
x += area.width- pdata->bg_image->width;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-06-26 16:46:25 +02:00
|
|
|
draw_image(ctx, x, y, pdata->bg_resize ? area.height : 0, pdata->bg_image);
|
2008-06-23 13:09:42 +02:00
|
|
|
draw_image_delete(&pdata->bg_image);
|
2008-06-17 09:37:19 +02:00
|
|
|
}
|
|
|
|
|
2008-04-28 14:53:32 +02:00
|
|
|
pango_layout_set_width(ctx->layout,
|
|
|
|
pango_units_from_double(area.width
|
2008-06-23 13:09:42 +02:00
|
|
|
- (pdata->margin.left
|
|
|
|
+ pdata->margin.right)));
|
2008-04-25 15:50:36 +02:00
|
|
|
pango_layout_set_ellipsize(ctx->layout, PANGO_ELLIPSIZE_END);
|
2008-06-22 15:20:55 +02:00
|
|
|
pango_layout_set_markup(ctx->layout, text, len);
|
2008-05-20 15:39:47 +02:00
|
|
|
pango_layout_set_font_description(ctx->layout, font->desc);
|
2008-04-25 15:50:36 +02:00
|
|
|
pango_layout_get_pixel_extents(ctx->layout, NULL, &ext);
|
2008-03-07 17:40:40 +01:00
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
x = area.x + pdata->margin.left;
|
2008-04-01 17:59:23 +02:00
|
|
|
/* + 1 is added for rounding, so that in any case of doubt we rather draw
|
|
|
|
* the text 1px lower than too high which usually results in a better type
|
|
|
|
* face */
|
2008-05-20 15:39:47 +02:00
|
|
|
y = area.y + (ctx->height - font->height + 1) / 2;
|
2008-02-09 16:23:16 +01:00
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
switch(pdata->align)
|
2008-01-04 19:17:20 +01:00
|
|
|
{
|
2008-03-07 17:40:40 +01:00
|
|
|
case AlignCenter:
|
2008-04-25 15:50:36 +02:00
|
|
|
x += (area.width - ext.width) / 2;
|
2008-01-04 19:17:20 +01:00
|
|
|
break;
|
|
|
|
case AlignRight:
|
2008-04-25 15:50:36 +02:00
|
|
|
x += area.width - ext.width;
|
2008-01-04 19:17:20 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-01-31 18:18:15 +01:00
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
if(pdata->shadow.offset)
|
2008-03-07 17:40:40 +01:00
|
|
|
{
|
2008-05-30 13:00:52 +02:00
|
|
|
cairo_set_source_rgba(ctx->cr,
|
2008-06-23 13:09:42 +02:00
|
|
|
pdata->shadow.color.red / 65535.0,
|
|
|
|
pdata->shadow.color.green / 65535.0,
|
|
|
|
pdata->shadow.color.blue / 65535.0,
|
|
|
|
pdata->shadow.color.alpha / 65535.0);
|
|
|
|
cairo_move_to(ctx->cr, x + pdata->shadow.offset, y + pdata->shadow.offset);
|
2008-07-09 15:23:47 +02:00
|
|
|
pango_cairo_layout_path(ctx->cr, ctx->layout);
|
|
|
|
cairo_stroke(ctx->cr);
|
2008-03-07 17:40:40 +01:00
|
|
|
}
|
|
|
|
|
2008-04-28 16:16:02 +02:00
|
|
|
cairo_move_to(ctx->cr, x, y);
|
|
|
|
|
2008-05-30 13:00:52 +02:00
|
|
|
cairo_set_source_rgba(ctx->cr,
|
2008-06-02 12:18:17 +02:00
|
|
|
ctx->fg.red / 65535.0,
|
|
|
|
ctx->fg.green / 65535.0,
|
|
|
|
ctx->fg.blue / 65535.0,
|
|
|
|
ctx->fg.alpha / 65535.0);
|
2008-03-17 12:38:49 +01:00
|
|
|
pango_cairo_update_layout(ctx->cr, ctx->layout);
|
|
|
|
pango_cairo_show_layout(ctx->cr, ctx->layout);
|
2008-02-11 10:40:38 +01:00
|
|
|
|
2008-06-23 15:21:29 +02:00
|
|
|
if (pdata == &parser_data)
|
|
|
|
draw_parser_data_wipe(&parser_data);
|
2007-09-05 20:15:00 +02:00
|
|
|
}
|
|
|
|
|
2008-06-12 15:23:53 +02:00
|
|
|
/** Setup color-source for cairo (gradient or mono).
|
|
|
|
* \param ctx Draw context.
|
2008-07-02 12:25:52 +02:00
|
|
|
* \param gradient_vector x, y to x + x_offset, y + y_offset.
|
|
|
|
* \param pcolor Color to use at start of gradient_vector.
|
|
|
|
* \param pcolor_center Color at center of gradient_vector.
|
|
|
|
* \param pcolor_end Color at end of gradient_vector.
|
2008-06-12 15:23:53 +02:00
|
|
|
* \return pat Pattern or NULL, needs to get cairo_pattern_destroy()'ed.
|
2008-02-05 15:33:42 +01:00
|
|
|
*/
|
2008-02-27 09:32:45 +01:00
|
|
|
static cairo_pattern_t *
|
2008-07-02 12:25:52 +02:00
|
|
|
draw_setup_cairo_color_source(draw_context_t *ctx, vector_t gradient_vector,
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
const xcolor_t *pcolor, const xcolor_t *pcolor_center,
|
|
|
|
const xcolor_t *pcolor_end)
|
2008-02-05 15:33:42 +01:00
|
|
|
{
|
2008-02-27 09:32:45 +01:00
|
|
|
cairo_pattern_t *pat = NULL;
|
2008-07-02 11:04:17 +02:00
|
|
|
bool has_center = pcolor_center->initialized;
|
|
|
|
bool has_end = pcolor_end->initialized;
|
2008-02-05 15:33:42 +01:00
|
|
|
|
2008-03-02 21:53:18 +01:00
|
|
|
/* no need for a real pattern: */
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
if(!has_end && !has_center)
|
2008-05-30 13:00:52 +02:00
|
|
|
cairo_set_source_rgba(ctx->cr,
|
|
|
|
pcolor->red / 65535.0,
|
|
|
|
pcolor->green / 65535.0,
|
|
|
|
pcolor->blue / 65535.0,
|
|
|
|
pcolor->alpha / 65535.0);
|
2008-03-02 13:13:12 +01:00
|
|
|
else
|
2008-02-05 15:33:42 +01:00
|
|
|
{
|
2008-07-02 12:25:52 +02:00
|
|
|
pat = cairo_pattern_create_linear(gradient_vector.x,
|
|
|
|
gradient_vector.y,
|
|
|
|
gradient_vector.x + gradient_vector.x_offset,
|
|
|
|
gradient_vector.y + gradient_vector.y_offset);
|
2008-02-05 15:33:42 +01:00
|
|
|
|
2008-03-02 21:53:18 +01:00
|
|
|
/* pcolor is always set (so far in awesome) */
|
2008-06-12 15:23:53 +02:00
|
|
|
cairo_pattern_add_color_stop_rgba(pat, 0.0,
|
|
|
|
pcolor->red / 65535.0,
|
|
|
|
pcolor->green / 65535.0,
|
|
|
|
pcolor->blue / 65535.0,
|
|
|
|
pcolor->alpha / 65535.0);
|
2008-03-02 21:53:18 +01:00
|
|
|
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
if(has_center)
|
2008-06-12 15:23:53 +02:00
|
|
|
cairo_pattern_add_color_stop_rgba(pat, 0.5,
|
|
|
|
pcolor_center->red / 65535.0,
|
|
|
|
pcolor_center->green / 65535.0,
|
|
|
|
pcolor_center->blue / 65535.0,
|
|
|
|
pcolor_center->alpha / 65535.0);
|
2008-03-02 21:53:18 +01:00
|
|
|
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
if(has_end)
|
2008-06-12 15:23:53 +02:00
|
|
|
cairo_pattern_add_color_stop_rgba(pat, 1.0,
|
|
|
|
pcolor_end->red / 65535.0,
|
|
|
|
pcolor_end->green / 65535.0,
|
|
|
|
pcolor_end->blue / 65535.0,
|
|
|
|
pcolor_end->alpha / 65535.0);
|
2008-02-05 15:33:42 +01:00
|
|
|
else
|
2008-06-12 15:23:53 +02:00
|
|
|
cairo_pattern_add_color_stop_rgba(pat, 1.0,
|
|
|
|
pcolor->red / 65535.0,
|
|
|
|
pcolor->green / 65535.0,
|
|
|
|
pcolor->blue / 65535.0,
|
|
|
|
pcolor->alpha / 65535.0);
|
2008-02-05 15:33:42 +01:00
|
|
|
cairo_set_source(ctx->cr, pat);
|
|
|
|
}
|
2008-02-27 09:32:45 +01:00
|
|
|
return pat;
|
2008-02-05 15:33:42 +01:00
|
|
|
}
|
|
|
|
|
2008-04-17 17:30:10 +02:00
|
|
|
/** Draw rectangle inside the coordinates
|
2008-01-12 23:38:31 +01:00
|
|
|
* \param ctx Draw context
|
|
|
|
* \param geometry geometry
|
2008-03-21 18:02:40 +01:00
|
|
|
* \param line_width line width
|
2008-02-27 09:32:45 +01:00
|
|
|
* \param filled fill rectangle?
|
2008-01-12 23:38:31 +01:00
|
|
|
* \param color color to use
|
|
|
|
*/
|
2007-09-15 15:16:53 +02:00
|
|
|
void
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
draw_rectangle(draw_context_t *ctx, area_t geometry,
|
|
|
|
float line_width, bool filled, const xcolor_t *color)
|
2007-09-05 20:15:00 +02:00
|
|
|
{
|
2008-01-31 18:18:15 +01:00
|
|
|
cairo_set_antialias(ctx->cr, CAIRO_ANTIALIAS_NONE);
|
2008-03-21 18:02:40 +01:00
|
|
|
cairo_set_line_width(ctx->cr, line_width);
|
2008-04-13 02:09:10 +02:00
|
|
|
cairo_set_miter_limit(ctx->cr, 10.0);
|
2008-03-26 03:18:21 +01:00
|
|
|
cairo_set_line_join(ctx->cr, CAIRO_LINE_JOIN_MITER);
|
2008-05-30 13:00:52 +02:00
|
|
|
cairo_set_source_rgba(ctx->cr,
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
color->red / 65535.0,
|
|
|
|
color->green / 65535.0,
|
|
|
|
color->blue / 65535.0,
|
|
|
|
color->alpha / 65535.0);
|
2007-09-05 20:15:00 +02:00
|
|
|
if(filled)
|
|
|
|
{
|
2008-03-21 11:26:56 +01:00
|
|
|
cairo_rectangle(ctx->cr, geometry.x, geometry.y,
|
|
|
|
geometry.width, geometry.height);
|
2008-01-31 18:18:15 +01:00
|
|
|
cairo_fill(ctx->cr);
|
2007-09-05 20:15:00 +02:00
|
|
|
}
|
2007-09-20 20:11:33 +02:00
|
|
|
else
|
2008-02-04 11:16:30 +01:00
|
|
|
{
|
2008-04-17 17:30:10 +02:00
|
|
|
cairo_rectangle(ctx->cr, geometry.x + line_width / 2.0, geometry.y + line_width / 2.0,
|
|
|
|
geometry.width - line_width, geometry.height - line_width);
|
2008-02-04 11:16:30 +01:00
|
|
|
cairo_stroke(ctx->cr);
|
|
|
|
}
|
|
|
|
}
|
2008-03-21 11:26:56 +01:00
|
|
|
|
2008-02-05 01:27:39 +01:00
|
|
|
/** Draw rectangle with gradient colors
|
2008-07-02 12:25:52 +02:00
|
|
|
* \param ctx Draw context.
|
|
|
|
* \param geometry Geometry.
|
|
|
|
* \param line_width Line width.
|
|
|
|
* \param filled Filled rectangle?
|
|
|
|
* \param gradient_vector Color-gradient course.
|
|
|
|
* \param pcolor Color at start of gradient_vector.
|
|
|
|
* \param pcolor_center Color in the center.
|
|
|
|
* \param pcolor_end Color at end of gradient_vector.
|
2008-02-05 01:27:39 +01:00
|
|
|
*/
|
2008-02-04 11:16:30 +01:00
|
|
|
void
|
2008-04-28 15:32:30 +02:00
|
|
|
draw_rectangle_gradient(draw_context_t *ctx, area_t geometry, float line_width, bool filled,
|
2008-07-02 12:25:52 +02:00
|
|
|
vector_t gradient_vector, const xcolor_t *pcolor,
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
const xcolor_t *pcolor_center, const xcolor_t *pcolor_end)
|
2008-02-04 11:16:30 +01:00
|
|
|
{
|
|
|
|
cairo_pattern_t *pat;
|
|
|
|
|
|
|
|
cairo_set_antialias(ctx->cr, CAIRO_ANTIALIAS_NONE);
|
2008-03-21 18:02:40 +01:00
|
|
|
cairo_set_line_width(ctx->cr, line_width);
|
2008-04-13 02:09:10 +02:00
|
|
|
cairo_set_miter_limit(ctx->cr, 10.0);
|
2008-03-26 03:18:21 +01:00
|
|
|
cairo_set_line_join(ctx->cr, CAIRO_LINE_JOIN_MITER);
|
2008-02-04 11:16:30 +01:00
|
|
|
|
2008-07-02 12:25:52 +02:00
|
|
|
pat = draw_setup_cairo_color_source(ctx, gradient_vector, pcolor, pcolor_center, pcolor_end);
|
2008-02-04 11:16:30 +01:00
|
|
|
|
|
|
|
if(filled)
|
|
|
|
{
|
|
|
|
cairo_rectangle(ctx->cr, geometry.x, geometry.y, geometry.width, geometry.height);
|
|
|
|
cairo_fill(ctx->cr);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
cairo_rectangle(ctx->cr, geometry.x + 1, geometry.y, geometry.width - 1, geometry.height - 1);
|
2008-02-05 01:27:39 +01:00
|
|
|
cairo_stroke(ctx->cr);
|
2008-02-04 11:16:30 +01:00
|
|
|
}
|
2007-10-11 17:06:55 +02:00
|
|
|
|
2008-02-05 15:33:42 +01:00
|
|
|
if(pat)
|
|
|
|
cairo_pattern_destroy(pat);
|
2007-09-05 20:15:00 +02:00
|
|
|
}
|
|
|
|
|
2008-02-05 15:33:42 +01:00
|
|
|
/** Setup some cairo-things for drawing a graph
|
|
|
|
* \param ctx Draw context
|
|
|
|
*/
|
2008-01-25 21:39:08 +01:00
|
|
|
void
|
2008-04-28 15:32:30 +02:00
|
|
|
draw_graph_setup(draw_context_t *ctx)
|
2008-01-25 21:39:08 +01:00
|
|
|
{
|
2008-01-31 19:40:47 +01:00
|
|
|
cairo_set_antialias(ctx->cr, CAIRO_ANTIALIAS_NONE);
|
|
|
|
cairo_set_line_width(ctx->cr, 1.0);
|
2008-04-18 23:54:55 +02:00
|
|
|
/* without it, it can draw over the path on sharp angles
|
|
|
|
* ...too long lines * (...graph_line) */
|
2008-03-26 03:18:21 +01:00
|
|
|
cairo_set_miter_limit(ctx->cr, 0.0);
|
|
|
|
cairo_set_line_join(ctx->cr, CAIRO_LINE_JOIN_MITER);
|
2008-01-25 21:39:08 +01:00
|
|
|
}
|
2008-02-27 09:32:45 +01:00
|
|
|
|
2008-06-12 15:21:25 +02:00
|
|
|
/** Draw a graph.
|
|
|
|
* \param ctx Draw context.
|
2008-06-13 19:17:35 +02:00
|
|
|
* \param rect The area to draw into.
|
2008-06-12 15:21:25 +02:00
|
|
|
* \param from Array of starting-point offsets to draw a graph lines.
|
|
|
|
* \param to Array of end-point offsets to draw a graph lines.
|
|
|
|
* \param cur_index Current position in data-array (cycles around).
|
|
|
|
* \param grow Put new values to the left or to the right.
|
2008-07-02 12:25:52 +02:00
|
|
|
* \param gradient_vector Color-Gradient course.
|
|
|
|
* \param pcolor Color at start of gradient_vector.
|
2008-06-12 15:21:25 +02:00
|
|
|
* \param pcolor_center Color in the center.
|
2008-07-02 12:25:52 +02:00
|
|
|
* \param pcolor_end Color at end of gradient_vector.
|
2008-02-05 15:33:42 +01:00
|
|
|
*/
|
2008-01-25 21:39:08 +01:00
|
|
|
void
|
2008-04-28 15:32:30 +02:00
|
|
|
draw_graph(draw_context_t *ctx, area_t rect, int *from, int *to, int cur_index,
|
2008-07-02 12:25:52 +02:00
|
|
|
position_t grow, vector_t gradient_vector, const xcolor_t *pcolor,
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
const xcolor_t *pcolor_center, const xcolor_t *pcolor_end)
|
2008-01-25 21:39:08 +01:00
|
|
|
{
|
2008-06-12 15:21:25 +02:00
|
|
|
int i = -1;
|
|
|
|
float x = rect.x + 0.5; /* middle of a pixel */
|
2008-02-05 15:33:42 +01:00
|
|
|
cairo_pattern_t *pat;
|
2008-03-02 21:53:18 +01:00
|
|
|
|
2008-07-02 12:25:52 +02:00
|
|
|
pat = draw_setup_cairo_color_source(ctx, gradient_vector,
|
2008-03-21 11:26:56 +01:00
|
|
|
pcolor, pcolor_center, pcolor_end);
|
2008-03-09 23:49:03 +01:00
|
|
|
|
2008-03-18 03:15:50 +01:00
|
|
|
if(grow == Right) /* draw from right to left */
|
2008-01-06 18:23:56 +01:00
|
|
|
{
|
2008-06-12 15:21:25 +02:00
|
|
|
x += rect.width - 1;
|
|
|
|
while(++i < rect.width)
|
2008-03-18 03:15:50 +01:00
|
|
|
{
|
2008-06-12 15:21:25 +02:00
|
|
|
cairo_move_to(ctx->cr, x, rect.y - from[cur_index]);
|
|
|
|
cairo_line_to(ctx->cr, x, rect.y - to[cur_index]);
|
2008-04-17 05:03:37 +02:00
|
|
|
x -= 1.0;
|
2008-01-06 18:23:56 +01:00
|
|
|
|
2008-03-18 03:15:50 +01:00
|
|
|
if (--cur_index < 0)
|
2008-06-12 15:21:25 +02:00
|
|
|
cur_index = rect.width - 1;
|
2008-03-18 03:15:50 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* draw from left to right */
|
2008-06-12 15:21:25 +02:00
|
|
|
while(++i < rect.width)
|
2008-03-18 03:15:50 +01:00
|
|
|
{
|
2008-06-12 15:21:25 +02:00
|
|
|
cairo_move_to(ctx->cr, x, rect.y - from[cur_index]);
|
|
|
|
cairo_line_to(ctx->cr, x, rect.y - to[cur_index]);
|
2008-04-17 05:03:37 +02:00
|
|
|
x += 1.0;
|
2008-03-18 03:15:50 +01:00
|
|
|
|
|
|
|
if (--cur_index < 0)
|
2008-06-12 15:21:25 +02:00
|
|
|
cur_index = rect.width - 1;
|
2008-03-18 03:15:50 +01:00
|
|
|
}
|
2008-01-31 18:18:15 +01:00
|
|
|
|
2008-01-31 19:40:47 +01:00
|
|
|
cairo_stroke(ctx->cr);
|
2008-02-05 15:33:42 +01:00
|
|
|
|
|
|
|
if(pat)
|
|
|
|
cairo_pattern_destroy(pat);
|
2008-01-25 21:39:08 +01:00
|
|
|
}
|
2008-02-27 09:32:45 +01:00
|
|
|
|
2008-06-24 20:34:02 +02:00
|
|
|
/** Draw a line into a graph-widget.
|
|
|
|
* \param ctx Draw context.
|
2008-06-13 19:17:35 +02:00
|
|
|
* \param rect The area to draw into.
|
2008-02-05 15:33:42 +01:00
|
|
|
* \param to array of offsets to draw the line through...
|
|
|
|
* \param cur_index current position in data-array (cycles around)
|
2008-03-18 03:15:50 +01:00
|
|
|
* \param grow put new values to the left or to the right
|
2008-07-02 12:25:52 +02:00
|
|
|
* \param gradient_vector Color-gradient course.
|
|
|
|
* \param pcolor Color at start of gradient_vector.
|
|
|
|
* \param pcolor_center Color in the center.
|
|
|
|
* \param pcolor_end Color at end of gradient_vector.
|
2008-02-05 15:33:42 +01:00
|
|
|
*/
|
2008-01-25 21:39:08 +01:00
|
|
|
void
|
2008-04-28 15:32:30 +02:00
|
|
|
draw_graph_line(draw_context_t *ctx, area_t rect, int *to, int cur_index,
|
2008-07-02 12:25:52 +02:00
|
|
|
position_t grow, vector_t gradient_vector, const xcolor_t *pcolor,
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
const xcolor_t *pcolor_center, const xcolor_t *pcolor_end)
|
2008-01-25 21:39:08 +01:00
|
|
|
{
|
2008-04-18 23:54:55 +02:00
|
|
|
int i, w;
|
|
|
|
float x, y;
|
2008-02-05 15:33:42 +01:00
|
|
|
cairo_pattern_t *pat;
|
|
|
|
|
2008-04-18 23:54:55 +02:00
|
|
|
/* NOTE: without, it sometimes won't draw to some path (centered in a pixel)
|
|
|
|
* ... it won't fill some pixels! It also looks much nicer so.
|
|
|
|
* (since line-drawing is the last on the graph, no need to reset to _NONE) */
|
|
|
|
/* Not much difference to CAIRO_ANTIALIAS_DEFAULT, but recommend for LCD */
|
|
|
|
cairo_set_antialias(ctx->cr, CAIRO_ANTIALIAS_SUBPIXEL);
|
2008-04-19 05:17:02 +02:00
|
|
|
/* a nicer, better visible line compared to 1.0 */
|
|
|
|
cairo_set_line_width(ctx->cr, 1.25);
|
2008-04-18 00:58:42 +02:00
|
|
|
|
2008-07-02 12:25:52 +02:00
|
|
|
pat = draw_setup_cairo_color_source(ctx, gradient_vector, pcolor, pcolor_center, pcolor_end);
|
2008-03-02 21:53:18 +01:00
|
|
|
|
2008-04-18 23:54:55 +02:00
|
|
|
/* path through the centers of pixels */
|
|
|
|
x = rect.x + 0.5;
|
|
|
|
y = rect.y + 0.5;
|
2008-03-09 23:49:03 +01:00
|
|
|
w = rect.width;
|
2008-01-06 18:23:56 +01:00
|
|
|
|
2008-04-18 23:54:55 +02:00
|
|
|
if(grow == Right)
|
|
|
|
{
|
|
|
|
/* go through the values from old to new. Begin with the oldest. */
|
|
|
|
if(++cur_index > w - 1)
|
2008-04-18 00:58:42 +02:00
|
|
|
cur_index = 0;
|
2008-04-14 02:57:17 +02:00
|
|
|
|
2008-04-18 23:54:55 +02:00
|
|
|
cairo_move_to(ctx->cr, x, y - to[cur_index]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* on the left border: fills a pixel also when there's only one value */
|
|
|
|
cairo_move_to(ctx->cr, x - 1.0, y - to[cur_index]);
|
2008-04-14 02:57:17 +02:00
|
|
|
|
|
|
|
for(i = 0; i < w; i++)
|
2008-01-25 21:39:08 +01:00
|
|
|
{
|
2008-04-18 23:54:55 +02:00
|
|
|
cairo_line_to(ctx->cr, x, y - to[cur_index]);
|
|
|
|
x += 1.0;
|
2008-04-14 02:57:17 +02:00
|
|
|
|
2008-04-18 00:58:42 +02:00
|
|
|
/* cycles around the index */
|
|
|
|
if(grow == Right)
|
2008-01-25 21:39:08 +01:00
|
|
|
{
|
2008-04-18 23:54:55 +02:00
|
|
|
if (++cur_index > w - 1)
|
2008-04-18 00:58:42 +02:00
|
|
|
cur_index = 0;
|
2008-01-25 21:39:08 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-04-18 00:58:42 +02:00
|
|
|
if(--cur_index < 0)
|
|
|
|
cur_index = w - 1;
|
2008-01-25 21:39:08 +01:00
|
|
|
}
|
|
|
|
}
|
2008-04-14 02:57:17 +02:00
|
|
|
|
2008-04-18 23:54:55 +02:00
|
|
|
/* onto the right border: fills a pixel also when there's only one value */
|
|
|
|
if(grow == Right)
|
|
|
|
cairo_line_to(ctx->cr, x, y - to[cur_index]);
|
|
|
|
|
2008-01-31 19:40:47 +01:00
|
|
|
cairo_stroke(ctx->cr);
|
2008-02-05 15:33:42 +01:00
|
|
|
|
|
|
|
if(pat)
|
|
|
|
cairo_pattern_destroy(pat);
|
2008-04-19 05:17:02 +02:00
|
|
|
/* reset line-width */
|
|
|
|
cairo_set_line_width(ctx->cr, 1.0);
|
2008-01-06 18:23:56 +01:00
|
|
|
}
|
|
|
|
|
2008-02-27 09:32:45 +01:00
|
|
|
/** Draw an image from ARGB data to a draw context.
|
|
|
|
* Data should be stored as an array of alpha, red, blue, green for each pixel
|
|
|
|
* and the array size should be w * h elements long.
|
2008-06-24 20:34:02 +02:00
|
|
|
* \param ctx Draw context to draw to.
|
|
|
|
* \param x X coordinate.
|
|
|
|
* \param y Y coordinate.
|
|
|
|
* \param w Width.
|
|
|
|
* \param h Height.
|
|
|
|
* \param wanted_h Wanted height: if > 0, image will be resized.
|
|
|
|
* \param data The image pixels array.
|
2008-02-27 09:32:45 +01:00
|
|
|
*/
|
2008-05-23 17:17:38 +02:00
|
|
|
void
|
|
|
|
draw_image_from_argb_data(draw_context_t *ctx, int x, int y, int w, int h,
|
|
|
|
int wanted_h, unsigned char *data)
|
2007-12-22 19:32:47 +01:00
|
|
|
{
|
2007-12-22 20:14:13 +01:00
|
|
|
double ratio;
|
2007-12-22 19:32:47 +01:00
|
|
|
cairo_t *cr;
|
2008-01-31 18:18:15 +01:00
|
|
|
cairo_surface_t *source;
|
2007-12-22 19:32:47 +01:00
|
|
|
|
2008-03-24 10:26:35 +01:00
|
|
|
source = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, w, h,
|
2008-04-02 17:14:09 +02:00
|
|
|
#if CAIRO_VERSION_MAJOR < 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR < 5) || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR == 5 && CAIRO_VERSION_MICRO < 8)
|
2008-03-24 10:47:57 +01:00
|
|
|
sizeof(unsigned char) * 4 * w);
|
|
|
|
#else
|
2008-03-24 10:26:35 +01:00
|
|
|
cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, w));
|
2008-03-24 10:47:57 +01:00
|
|
|
#endif
|
2008-01-31 18:18:15 +01:00
|
|
|
cr = cairo_create(ctx->surface);
|
2007-12-27 10:33:20 +01:00
|
|
|
if(wanted_h > 0 && h > 0)
|
2007-12-22 20:14:13 +01:00
|
|
|
{
|
2007-12-27 10:33:20 +01:00
|
|
|
ratio = (double) wanted_h / (double) h;
|
2007-12-22 20:14:13 +01:00
|
|
|
cairo_scale(cr, ratio, ratio);
|
|
|
|
cairo_set_source_surface(cr, source, x / ratio, y / ratio);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
cairo_set_source_surface(cr, source, x, y);
|
2008-01-31 18:18:15 +01:00
|
|
|
|
2007-12-22 19:32:47 +01:00
|
|
|
cairo_paint(cr);
|
|
|
|
|
2008-02-17 06:13:26 +01:00
|
|
|
cairo_destroy(cr);
|
2007-12-22 19:32:47 +01:00
|
|
|
cairo_surface_destroy(source);
|
|
|
|
}
|
|
|
|
|
2008-05-23 17:17:38 +02:00
|
|
|
#ifndef WITH_IMLIB2
|
2008-04-03 06:41:30 +02:00
|
|
|
|
2008-06-17 09:21:26 +02:00
|
|
|
/** Load an image from filename.
|
|
|
|
* \param filename The image file to load.
|
|
|
|
* \return A new image.
|
2008-06-03 20:42:48 +02:00
|
|
|
*/
|
2008-06-17 09:37:19 +02:00
|
|
|
draw_image_t *
|
|
|
|
draw_image_new(const char *filename)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
2008-06-17 09:21:26 +02:00
|
|
|
draw_image_t *image = NULL;
|
2008-06-03 20:42:48 +02:00
|
|
|
GdkPixbuf *pixbuf;
|
2008-06-17 09:21:26 +02:00
|
|
|
GError *error = NULL;
|
2008-06-03 20:42:48 +02:00
|
|
|
|
2008-06-17 09:21:26 +02:00
|
|
|
if(filename)
|
|
|
|
{
|
|
|
|
if(!(pixbuf = gdk_pixbuf_new_from_file(filename,&error)))
|
|
|
|
warn("cannot load image %s: %s", filename, error->message);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
image = p_new(draw_image_t, 1);
|
|
|
|
image->data = pixbuf;
|
|
|
|
image->width = gdk_pixbuf_get_width(pixbuf);
|
|
|
|
image->height = gdk_pixbuf_get_height(pixbuf);
|
|
|
|
}
|
2008-06-03 20:42:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
2008-06-17 09:37:19 +02:00
|
|
|
/** Delete an image.
|
|
|
|
* \param image The image to delete.
|
2008-06-03 20:42:48 +02:00
|
|
|
*/
|
2008-06-17 09:37:19 +02:00
|
|
|
void
|
|
|
|
draw_image_delete(draw_image_t **image)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
2008-06-17 09:21:26 +02:00
|
|
|
if(*image)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
|
|
|
gdk_pixbuf_unref((*image)->data);
|
|
|
|
p_delete(image);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-17 09:21:26 +02:00
|
|
|
/** Draw an image to a draw context.
|
|
|
|
* \param ctx Draw context to draw to.
|
|
|
|
* \param x x coordinate.
|
|
|
|
* \param y y coordinate.
|
|
|
|
* \param wanted_h Wanted height: if > 0, image will be resized.
|
|
|
|
* \param image The image to draw.
|
2008-06-03 20:42:48 +02:00
|
|
|
*/
|
2008-06-17 09:21:26 +02:00
|
|
|
void
|
|
|
|
draw_image(draw_context_t *ctx, int x, int y, int wanted_h, draw_image_t *image)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
|
|
|
cairo_t *cr;
|
|
|
|
|
|
|
|
cr = cairo_create(ctx->surface);
|
|
|
|
if(wanted_h > 0 && image->height > 0)
|
|
|
|
{
|
|
|
|
double ratio = (double) wanted_h / (double) image->height;
|
|
|
|
cairo_scale(cr, ratio, ratio);
|
|
|
|
gdk_cairo_set_source_pixbuf(cr, image->data, x / ratio, y / ratio);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
gdk_cairo_set_source_pixbuf(cr, image->data, x, y);
|
|
|
|
|
|
|
|
cairo_paint(cr);
|
|
|
|
|
|
|
|
cairo_destroy(cr);
|
|
|
|
}
|
|
|
|
|
2008-05-23 17:17:38 +02:00
|
|
|
#else /* WITH_IMLIB2 */
|
2008-04-03 06:41:30 +02:00
|
|
|
|
2008-03-22 15:28:25 +01:00
|
|
|
static const char *
|
|
|
|
draw_imlib_load_strerror(Imlib_Load_Error e)
|
|
|
|
{
|
|
|
|
switch(e)
|
|
|
|
{
|
|
|
|
case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
|
|
|
|
return "no such file or directory";
|
|
|
|
case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
|
|
|
|
return "file is a directory";
|
|
|
|
case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
|
|
|
|
return "read permission denied";
|
|
|
|
case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
|
|
|
|
return "no loader for file format";
|
|
|
|
case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
|
|
|
|
return "path too long";
|
|
|
|
case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
|
|
|
|
return "path component non existant";
|
|
|
|
case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
|
|
|
|
return "path compoment not a directory";
|
|
|
|
case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
|
|
|
|
return "path points oustide address space";
|
|
|
|
case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
|
|
|
|
return "too many symbolic links";
|
|
|
|
case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
|
|
|
|
return "out of memory";
|
|
|
|
case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
|
|
|
|
return "out of file descriptors";
|
|
|
|
case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
|
|
|
|
return "write permission denied";
|
|
|
|
case IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE:
|
|
|
|
return "out of disk space";
|
|
|
|
case IMLIB_LOAD_ERROR_UNKNOWN:
|
|
|
|
return "unknown error, that's really bad";
|
|
|
|
case IMLIB_LOAD_ERROR_NONE:
|
|
|
|
return "no error, oops";
|
|
|
|
}
|
|
|
|
|
|
|
|
return "unknown error";
|
|
|
|
}
|
|
|
|
|
2008-06-03 20:42:48 +02:00
|
|
|
|
2008-06-17 09:37:19 +02:00
|
|
|
/** Load an image from filename.
|
|
|
|
* \param filename The image file to load.
|
|
|
|
* \return A new image.
|
2008-06-03 20:42:48 +02:00
|
|
|
*/
|
2008-06-22 06:42:28 +02:00
|
|
|
draw_image_t *
|
|
|
|
draw_image_new(const char *filename)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
|
|
|
int w, h, size, i;
|
|
|
|
DATA32 *data;
|
|
|
|
double alpha;
|
|
|
|
unsigned char *dataimg, *rdataimg;
|
|
|
|
Imlib_Image imimage;
|
|
|
|
Imlib_Load_Error e = IMLIB_LOAD_ERROR_NONE;
|
|
|
|
draw_image_t *image;
|
|
|
|
|
2008-06-22 06:42:28 +02:00
|
|
|
if(!filename)
|
|
|
|
return NULL;
|
|
|
|
|
2008-06-03 20:42:48 +02:00
|
|
|
if(!(imimage = imlib_load_image_with_error_return(filename, &e)))
|
|
|
|
{
|
|
|
|
warn("cannot load image %s: %s", filename, draw_imlib_load_strerror(e));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
imlib_context_set_image(imimage);
|
|
|
|
|
|
|
|
w = imlib_image_get_width();
|
|
|
|
h = imlib_image_get_height();
|
|
|
|
|
|
|
|
size = w * h;
|
|
|
|
|
|
|
|
data = imlib_image_get_data_for_reading_only();
|
|
|
|
|
|
|
|
rdataimg = dataimg = p_new(unsigned char, size * 4);
|
|
|
|
|
|
|
|
for(i = 0; i < size; i++, dataimg += 4)
|
|
|
|
{
|
|
|
|
dataimg[3] = (data[i] >> 24) & 0xff; /* A */
|
|
|
|
/* cairo wants pre-multiplied alpha */
|
|
|
|
alpha = dataimg[3] / 255.0;
|
|
|
|
dataimg[2] = ((data[i] >> 16) & 0xff) * alpha; /* R */
|
|
|
|
dataimg[1] = ((data[i] >> 8) & 0xff) * alpha; /* G */
|
|
|
|
dataimg[0] = (data[i] & 0xff) * alpha; /* B */
|
|
|
|
}
|
|
|
|
|
|
|
|
image = p_new(draw_image_t, 1);
|
|
|
|
|
|
|
|
image->data = rdataimg;
|
|
|
|
image->width = w;
|
|
|
|
image->height = h;
|
|
|
|
|
|
|
|
imlib_free_image();
|
|
|
|
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
2008-06-24 20:34:02 +02:00
|
|
|
/** Delete an image.
|
|
|
|
* \param image The image to delete.
|
2008-06-03 20:42:48 +02:00
|
|
|
*/
|
2008-06-17 09:37:19 +02:00
|
|
|
void
|
|
|
|
draw_image_delete(draw_image_t **image)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
|
|
|
if (*image)
|
|
|
|
{
|
|
|
|
p_delete(&(*image)->data);
|
|
|
|
p_delete(image);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-24 20:34:02 +02:00
|
|
|
/** Draw an image to a draw context.
|
|
|
|
* \param ctx Draw context to draw to.
|
|
|
|
* \param x X coordinate.
|
|
|
|
* \param y Y coordinate.
|
|
|
|
* \param wanted_h Wanted height: if > 0, image will be resized.
|
|
|
|
* \param image The image to draw.
|
2008-06-03 20:42:48 +02:00
|
|
|
*/
|
2008-06-17 09:37:19 +02:00
|
|
|
void
|
|
|
|
draw_image(draw_context_t *ctx, int x, int y, int wanted_h, draw_image_t *image)
|
2008-06-03 20:42:48 +02:00
|
|
|
{
|
|
|
|
draw_image_from_argb_data(ctx, x, y, image->width, image->height, wanted_h, image->data);
|
|
|
|
}
|
2007-12-22 15:37:43 +01:00
|
|
|
|
2008-05-23 17:17:38 +02:00
|
|
|
#endif /* WITH_IMLIB2 */
|
2007-12-29 19:44:15 +01:00
|
|
|
|
2008-06-04 16:13:41 +02:00
|
|
|
/** Rotate a pixmap.
|
2008-05-30 17:53:10 +02:00
|
|
|
* \param ctx Draw context to draw with.
|
|
|
|
* \param src Drawable to draw from.
|
|
|
|
* \param dest Drawable to draw to.
|
|
|
|
* \param src_w Drawable width.
|
|
|
|
* \param src_h Drawable height.
|
|
|
|
* \param dest_w Drawable width.
|
|
|
|
* \param dest_h Drawable height.
|
|
|
|
* \param angle angle to rotate.
|
|
|
|
* \param tx Translate to this x coordinate.
|
|
|
|
* \param ty Translate to this y coordinate.
|
2008-02-27 09:32:45 +01:00
|
|
|
*/
|
2008-03-20 09:17:34 +01:00
|
|
|
void
|
2008-05-30 17:53:10 +02:00
|
|
|
draw_rotate(draw_context_t *ctx,
|
2008-06-04 16:13:41 +02:00
|
|
|
xcb_pixmap_t src, xcb_pixmap_t dest,
|
2008-05-30 17:53:10 +02:00
|
|
|
int src_w, int src_h,
|
|
|
|
int dest_w, int dest_h,
|
2008-03-20 09:17:34 +01:00
|
|
|
double angle, int tx, int ty)
|
2007-11-11 18:59:11 +01:00
|
|
|
{
|
|
|
|
cairo_surface_t *surface, *source;
|
|
|
|
cairo_t *cr;
|
2007-11-11 22:27:00 +01:00
|
|
|
|
2008-03-21 16:50:17 +01:00
|
|
|
surface = cairo_xcb_surface_create(ctx->connection, dest,
|
|
|
|
ctx->visual, dest_w, dest_h);
|
2008-05-30 17:53:10 +02:00
|
|
|
source = cairo_xcb_surface_create(ctx->connection, src,
|
|
|
|
ctx->visual, src_w, src_h);
|
2007-11-11 18:59:11 +01:00
|
|
|
cr = cairo_create (surface);
|
2007-11-11 19:49:42 +01:00
|
|
|
|
|
|
|
cairo_translate(cr, tx, ty);
|
2007-11-11 21:13:37 +01:00
|
|
|
cairo_rotate(cr, angle);
|
2007-11-11 18:59:11 +01:00
|
|
|
|
|
|
|
cairo_set_source_surface(cr, source, 0.0, 0.0);
|
2007-11-11 19:49:42 +01:00
|
|
|
cairo_paint(cr);
|
2007-11-11 18:59:11 +01:00
|
|
|
|
|
|
|
cairo_destroy(cr);
|
|
|
|
cairo_surface_destroy(source);
|
2007-11-11 22:38:29 +01:00
|
|
|
cairo_surface_destroy(surface);
|
2007-11-11 18:59:11 +01:00
|
|
|
}
|
|
|
|
|
2008-06-08 10:58:48 +02:00
|
|
|
/** Return the width and height of a text in pixel.
|
|
|
|
* \param conn Connection ref.
|
|
|
|
* \param phys_screen Physical screen number.
|
|
|
|
* \param font Font to use.
|
|
|
|
* \param text The text.
|
2008-07-10 15:06:09 +02:00
|
|
|
* \param len The text length.
|
2008-06-23 13:09:42 +02:00
|
|
|
* \param pdata The parser data to fill.
|
2008-06-08 10:58:48 +02:00
|
|
|
* \return Text height and width.
|
2008-02-27 09:32:45 +01:00
|
|
|
*/
|
2008-04-23 17:44:09 +02:00
|
|
|
area_t
|
2008-06-23 15:21:29 +02:00
|
|
|
draw_text_extents(xcb_connection_t *conn, int phys_screen, font_t *font,
|
2008-07-10 15:06:09 +02:00
|
|
|
const char *text, ssize_t len, draw_parser_data_t *parser_data)
|
2007-10-01 19:22:57 +02:00
|
|
|
{
|
2007-10-16 01:20:03 +02:00
|
|
|
cairo_surface_t *surface;
|
|
|
|
cairo_t *cr;
|
2008-03-17 12:38:49 +01:00
|
|
|
PangoLayout *layout;
|
|
|
|
PangoRectangle ext;
|
2008-06-17 16:55:24 +02:00
|
|
|
xcb_screen_t *s = xutil_screen_get(conn, phys_screen);
|
2008-06-22 22:09:48 +02:00
|
|
|
area_t geom = { 0, 0, 0, 0 };
|
2008-06-23 13:09:42 +02:00
|
|
|
|
2008-07-10 15:06:09 +02:00
|
|
|
if(!len)
|
2008-04-23 17:44:09 +02:00
|
|
|
return geom;
|
2007-12-30 14:22:19 +01:00
|
|
|
|
2008-06-23 13:09:42 +02:00
|
|
|
parser_data->connection = conn;
|
|
|
|
parser_data->phys_screen = phys_screen;
|
|
|
|
if(draw_text_markup_expand(parser_data, text, len))
|
|
|
|
{
|
|
|
|
text = parser_data->text.s;
|
|
|
|
len = parser_data->text.len;
|
2008-06-22 15:27:06 +02:00
|
|
|
}
|
2008-04-25 15:50:36 +02:00
|
|
|
|
2008-06-08 10:58:48 +02:00
|
|
|
surface = cairo_xcb_surface_create(conn, phys_screen,
|
2008-04-09 13:26:02 +02:00
|
|
|
draw_screen_default_visual(s),
|
2008-03-21 16:50:17 +01:00
|
|
|
s->width_in_pixels,
|
|
|
|
s->height_in_pixels);
|
2008-04-25 15:50:36 +02:00
|
|
|
|
2007-10-16 01:20:03 +02:00
|
|
|
cr = cairo_create(surface);
|
2008-03-17 12:38:49 +01:00
|
|
|
layout = pango_cairo_create_layout(cr);
|
2008-06-22 15:20:55 +02:00
|
|
|
pango_layout_set_markup(layout, text, len);
|
2008-03-17 12:38:49 +01:00
|
|
|
pango_layout_set_font_description(layout, font->desc);
|
|
|
|
pango_layout_get_pixel_extents(layout, NULL, &ext);
|
|
|
|
g_object_unref(layout);
|
2007-10-16 01:20:03 +02:00
|
|
|
cairo_destroy(cr);
|
|
|
|
cairo_surface_destroy(surface);
|
|
|
|
|
2008-04-23 17:44:09 +02:00
|
|
|
geom.width = ext.width;
|
|
|
|
geom.height = ext.height * 1.5;
|
|
|
|
|
|
|
|
return geom;
|
2007-09-06 22:09:00 +02:00
|
|
|
}
|
2007-10-15 13:40:52 +02:00
|
|
|
|
2008-04-11 11:18:23 +02:00
|
|
|
/** Transform a string to a alignment_t type.
|
2008-02-27 09:32:45 +01:00
|
|
|
* Recognized string are left, center or right. Everything else will be
|
|
|
|
* recognized as AlignAuto.
|
2008-06-23 14:01:33 +02:00
|
|
|
* \param align Atring with align text.
|
|
|
|
* \param len The string length.
|
|
|
|
* \return An alignment_t type.
|
2008-02-27 09:32:45 +01:00
|
|
|
*/
|
2008-04-11 11:18:23 +02:00
|
|
|
alignment_t
|
2008-06-23 14:01:33 +02:00
|
|
|
draw_align_fromstr(const char *align, ssize_t len)
|
2008-01-03 16:02:32 +01:00
|
|
|
{
|
2008-06-24 20:34:02 +02:00
|
|
|
switch (a_tokenize(align, len))
|
2008-06-23 13:09:42 +02:00
|
|
|
{
|
2008-06-23 00:14:42 +02:00
|
|
|
case A_TK_LEFT: return AlignLeft;
|
|
|
|
case A_TK_CENTER: return AlignCenter;
|
|
|
|
case A_TK_RIGHT: return AlignRight;
|
|
|
|
case A_TK_FLEX: return AlignFlex;
|
|
|
|
default: return AlignAuto;
|
|
|
|
}
|
2008-01-03 16:02:32 +01:00
|
|
|
}
|
|
|
|
|
2008-07-01 16:29:50 +02:00
|
|
|
/** Transform an alignment to a string.
|
|
|
|
* \param a The alignment.
|
|
|
|
* \return A string which must not be freed.
|
|
|
|
*/
|
|
|
|
const char *
|
|
|
|
draw_align_tostr(alignment_t a)
|
|
|
|
{
|
|
|
|
switch(a)
|
|
|
|
{
|
|
|
|
case AlignLeft: return "left";
|
|
|
|
case AlignCenter: return "center";
|
|
|
|
case AlignRight: return "right";
|
|
|
|
case AlignFlex: return "flex";
|
|
|
|
case AlignAuto: return "auto";
|
|
|
|
default: return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-03-22 20:44:23 +01:00
|
|
|
#define RGB_COLOR_8_TO_16(i) (65535 * ((i) & 0xff) / 255)
|
|
|
|
|
2008-06-24 20:34:02 +02:00
|
|
|
/** Initialize an X color.
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
* \param color xcolor_t struct to store color into.
|
2008-06-24 20:34:02 +02:00
|
|
|
* \param conn Connection ref.
|
|
|
|
* \param phys_screen Physical screen number.
|
|
|
|
* \param colstr Color specification.
|
|
|
|
* \return True if color allocation was successfull.
|
2008-01-27 18:56:37 +01:00
|
|
|
*/
|
2008-03-21 16:50:17 +01:00
|
|
|
bool
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
xcolor_init(xcolor_t *color, xcb_connection_t *conn, int phys_screen,
|
2008-07-10 15:30:16 +02:00
|
|
|
const char *colstr, ssize_t len)
|
2008-01-27 18:56:37 +01:00
|
|
|
{
|
2008-06-17 16:55:24 +02:00
|
|
|
xcb_screen_t *s = xutil_screen_get(conn, phys_screen);
|
2008-04-17 11:28:56 +02:00
|
|
|
unsigned long colnum;
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
uint16_t red, green, blue, alpha = 0xffff;
|
2008-01-27 18:56:37 +01:00
|
|
|
|
2008-07-10 15:30:16 +02:00
|
|
|
if(!len)
|
2008-03-21 16:50:17 +01:00
|
|
|
return false;
|
|
|
|
|
2008-03-22 20:44:23 +01:00
|
|
|
/* The color is given in RGB value */
|
2008-05-30 13:00:52 +02:00
|
|
|
if(colstr[0] == '#')
|
2008-03-21 16:50:17 +01:00
|
|
|
{
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
xcb_alloc_color_cookie_t cookie;
|
|
|
|
xcb_alloc_color_reply_t *hexa_color;
|
|
|
|
char *p;
|
|
|
|
|
2008-05-30 13:00:52 +02:00
|
|
|
if(len == 7)
|
|
|
|
{
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
colnum = strtoul(colstr + 1, &p, 16);
|
|
|
|
if(p - colstr != 7)
|
|
|
|
goto invalid;
|
2008-05-30 13:00:52 +02:00
|
|
|
}
|
|
|
|
/* we have alpha */
|
|
|
|
else if(len == 9)
|
|
|
|
{
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
colnum = strtoul(colstr + 1, &p, 16);
|
|
|
|
if(p - colstr != 9)
|
|
|
|
goto invalid;
|
|
|
|
alpha = RGB_COLOR_8_TO_16(colnum);
|
|
|
|
colnum >>= 8;
|
2008-05-30 13:00:52 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
invalid:
|
2008-05-30 13:00:52 +02:00
|
|
|
warn("awesome: error, invalid color '%s'", colstr);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
red = RGB_COLOR_8_TO_16(colnum >> 16);
|
2008-04-17 11:28:56 +02:00
|
|
|
green = RGB_COLOR_8_TO_16(colnum >> 8);
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
blue = RGB_COLOR_8_TO_16(colnum);
|
2008-03-22 20:44:23 +01:00
|
|
|
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
cookie = xcb_alloc_color_unchecked(conn, s->default_colormap,
|
|
|
|
red, green, blue),
|
|
|
|
hexa_color = xcb_alloc_color_reply(conn, cookie, NULL);
|
2008-03-22 20:44:23 +01:00
|
|
|
|
|
|
|
if(hexa_color)
|
|
|
|
{
|
|
|
|
color->pixel = hexa_color->pixel;
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
color->red = hexa_color->red;
|
2008-03-22 20:44:23 +01:00
|
|
|
color->green = hexa_color->green;
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
color->blue = hexa_color->blue;
|
|
|
|
color->alpha = alpha;
|
2008-07-02 11:04:17 +02:00
|
|
|
color->initialized = true;
|
2008-03-22 20:44:23 +01:00
|
|
|
p_delete(&hexa_color);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
xcb_alloc_named_color_reply_t *named_color = NULL;
|
|
|
|
xcb_alloc_named_color_cookie_t cookie;
|
|
|
|
|
|
|
|
cookie = xcb_alloc_named_color_unchecked(conn, s->default_colormap, len,
|
|
|
|
colstr),
|
|
|
|
named_color = xcb_alloc_named_color_reply(conn, cookie, NULL);
|
2008-03-22 20:44:23 +01:00
|
|
|
|
|
|
|
if(named_color)
|
|
|
|
{
|
|
|
|
color->pixel = named_color->pixel;
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
color->red = named_color->visual_red;
|
2008-03-22 20:44:23 +01:00
|
|
|
color->green = named_color->visual_green;
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
color->blue = named_color->visual_blue;
|
2008-05-30 13:00:52 +02:00
|
|
|
color->alpha = 0xffff;
|
Streamline xcolor_t.
Do not have a ->name char * field, but a char[32] instead. This isn't a
big problem, the longest color in /etc/X11/rgb.txt is 23 chars long, and
if it becomes a problem one day, one could just strip the name and
generate an hexadecimal representation on the fly instead. But allocating
the name is asking for a lot of trouble.
Since we do not allocate anything anymore, just don't allocate anything
anymore at all, it avoids the mess of xcolor_copy/_wipe and fixes a lot of
sleeping bugs (p_dup were used e.g., which is wrong).
Pass xcolor_t *, xcolor_t becomes too big to be passed by value. Add
consts at some places.
xcolor_new allocates nothing, hence is renamed xcolor_init, has xcolor_t
as a first argument (OO-style, this is self), and doesn't touch the
structure at all if it returns false, which allow us to skip a lot of
intermediates values.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-07-02 10:14:42 +02:00
|
|
|
color->alpha = alpha;
|
2008-07-02 11:04:17 +02:00
|
|
|
color->initialized = true;
|
2008-03-22 20:44:23 +01:00
|
|
|
p_delete(&named_color);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2008-01-27 18:56:37 +01:00
|
|
|
|
2008-05-23 22:53:59 +02:00
|
|
|
warn("awesome: error, cannot allocate color '%s'", colstr);
|
2008-03-22 20:44:23 +01:00
|
|
|
return false;
|
2008-01-27 18:56:37 +01:00
|
|
|
}
|
|
|
|
|
2008-01-28 18:30:23 +01:00
|
|
|
/** Remove a area from a list of them,
|
2008-03-21 11:26:56 +01:00
|
|
|
* spliting the space between several area that can overlap
|
2008-06-24 20:34:02 +02:00
|
|
|
* \param areas Array of areas.
|
|
|
|
* \param elem Area to remove.
|
2008-01-28 18:30:23 +01:00
|
|
|
*/
|
|
|
|
void
|
2008-06-22 22:09:48 +02:00
|
|
|
area_array_remove(area_array_t *areas, area_t elem)
|
2008-01-28 18:30:23 +01:00
|
|
|
{
|
2008-06-22 22:09:48 +02:00
|
|
|
/* loop from the end because:
|
|
|
|
* (1) we remove elements ;
|
|
|
|
* (2) the one we add to the end are okay wrt the invariants
|
|
|
|
*/
|
2008-06-23 13:09:42 +02:00
|
|
|
for(int i = areas->len - 1; i >= 0; i--)
|
2008-06-22 22:09:48 +02:00
|
|
|
if(area_intersect_area(areas->tab[i], elem))
|
2008-01-28 18:30:23 +01:00
|
|
|
{
|
|
|
|
/* remove it from the list */
|
2008-06-22 22:09:48 +02:00
|
|
|
area_t r = area_array_take(areas, i);
|
|
|
|
area_t inter = area_get_intersect_area(r, elem);
|
2008-01-28 18:30:23 +01:00
|
|
|
|
2008-06-22 22:09:48 +02:00
|
|
|
if(AREA_LEFT(inter) > AREA_LEFT(r))
|
2008-01-28 18:30:23 +01:00
|
|
|
{
|
2008-06-23 13:09:42 +02:00
|
|
|
area_t extra =
|
|
|
|
{
|
2008-06-22 22:09:48 +02:00
|
|
|
.x = r.x,
|
|
|
|
.y = r.y,
|
2008-06-23 17:30:35 +02:00
|
|
|
.width = AREA_LEFT(inter) - AREA_LEFT(r),
|
2008-06-22 22:09:48 +02:00
|
|
|
.height = r.height,
|
|
|
|
};
|
|
|
|
area_array_append(areas, extra);
|
2008-01-28 18:30:23 +01:00
|
|
|
}
|
|
|
|
|
2008-06-22 22:09:48 +02:00
|
|
|
if(AREA_TOP(inter) > AREA_TOP(r))
|
2008-01-28 18:30:23 +01:00
|
|
|
{
|
2008-06-23 13:09:42 +02:00
|
|
|
area_t extra =
|
|
|
|
{
|
2008-06-22 22:09:48 +02:00
|
|
|
.x = r.x,
|
|
|
|
.y = r.y,
|
|
|
|
.width = r.width,
|
2008-06-23 17:30:35 +02:00
|
|
|
.height = AREA_TOP(inter) - AREA_LEFT(r),
|
2008-06-22 22:09:48 +02:00
|
|
|
};
|
|
|
|
area_array_append(areas, extra);
|
2008-01-28 18:30:23 +01:00
|
|
|
}
|
|
|
|
|
2008-06-22 22:09:48 +02:00
|
|
|
if(AREA_RIGHT(inter) < AREA_RIGHT(r))
|
2008-01-28 18:30:23 +01:00
|
|
|
{
|
2008-06-23 13:09:42 +02:00
|
|
|
area_t extra =
|
|
|
|
{
|
2008-06-22 22:09:48 +02:00
|
|
|
.x = AREA_RIGHT(inter),
|
|
|
|
.y = r.y,
|
|
|
|
.width = AREA_RIGHT(r) - AREA_RIGHT(inter),
|
|
|
|
.height = r.height,
|
|
|
|
};
|
|
|
|
area_array_append(areas, extra);
|
2008-01-28 18:30:23 +01:00
|
|
|
}
|
|
|
|
|
2008-06-22 22:09:48 +02:00
|
|
|
if(AREA_BOTTOM(inter) < AREA_BOTTOM(r))
|
2008-01-28 18:30:23 +01:00
|
|
|
{
|
2008-06-23 13:09:42 +02:00
|
|
|
area_t extra =
|
|
|
|
{
|
2008-06-22 22:09:48 +02:00
|
|
|
.x = r.x,
|
|
|
|
.y = AREA_BOTTOM(inter),
|
|
|
|
.width = r.width,
|
|
|
|
.height = AREA_BOTTOM(r) - AREA_BOTTOM(inter),
|
|
|
|
};
|
|
|
|
area_array_append(areas, extra);
|
2008-01-28 18:30:23 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-18 09:24:15 +01:00
|
|
|
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
|