New import

git-svn-id: http://tint2.googlecode.com/svn/trunk@13 121b4492-b84c-0410-8b4c-0d4edfb3f3cc

src/util/area.c

@@ -0,0 +1,182 @@
+/**************************************************************************
+*
+* Tint2 : area
+* 
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* 
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* as published by the Free Software Foundation.
+*
+* 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.
+**************************************************************************/
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+
+#include "window.h"
+#include "server.h"
+#include "area.h"
+
+
+
+void redraw (Area *a)
+{
+   a->redraw = 1;
+   
+   GSList *l;
+   for (l = a->list ; l ; l = l->next) 
+      redraw(l->data);
+}
+
+
+int draw (Area *a)
+{
+   if (!a->redraw) return 0;
+
+   cairo_surface_t *cs;
+   cairo_t *c;
+   int ret = 0;
+
+   if (a->pmap) XFreePixmap (server.dsp, a->pmap);
+   a->pmap = server_create_pixmap (a->width, a->height);
+
+   // add layer of root pixmap
+   XCopyArea (server.dsp, server.pmap, a->pmap, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
+
+   cs = cairo_xlib_surface_create (server.dsp, a->pmap, server.visual, a->width, a->height);
+   c = cairo_create (cs);
+
+   draw_background (a, c);
+   
+   if (a->draw_foreground) {
+      ret = a->draw_foreground(a, c);
+   }
+   else {
+      // parcours de la liste des sous objets
+   }
+
+   cairo_destroy (c);
+   cairo_surface_destroy (cs);
+   a->redraw = 0;
+   
+   return ret;
+}
+
+
+void draw_background (Area *a, cairo_t *c)
+{
+   if (a->back.alpha > 0.0) {
+      //printf("   draw_background %d %d\n", a->width, a->height);
+      draw_rect(c, a->border.width, a->border.width, a->width-(2.0 * a->border.width), a->height-(2.0*a->border.width), a->border.rounded - a->border.width/1.571);
+      /*
+      double x0, y0, x1, y1;
+      x0 = 0;
+      y0 = 100;
+      x1 = 100;
+      y1 = 0;
+            
+      cairo_pattern_t *linpat;
+      cairo_matrix_t matrix;
+      linpat = cairo_pattern_create_linear (x0, y0, x1, y1);
+
+      cairo_pattern_add_color_stop_rgba (linpat, 0, a->back.color[0], a->back.color[1], a->back.color[2], a->back.alpha);
+      cairo_pattern_add_color_stop_rgba (linpat, 1, a->back.color[0], a->back.color[1], a->back.color[2], 0);
+      //cairo_matrix_init_scale (&matrix, a->height, a->width);
+      //cairo_pattern_set_matrix (linpat, &matrix);
+      cairo_set_source (c, linpat);
+      */
+      cairo_set_source_rgba(c, a->back.color[0], a->back.color[1], a->back.color[2], a->back.alpha);
+      
+      cairo_fill(c);
+      //cairo_pattern_destroy (linpat);
+   }
+
+   if (a->border.width > 0 && a->border.alpha > 0.0) {
+      cairo_set_line_width (c, a->border.width);
+
+      // draw border inside (x, y, width, height)
+      draw_rect(c, a->border.width/2.0, a->border.width/2.0, a->width - a->border.width, a->height - a->border.width, a->border.rounded);
+      /*
+      // convert : radian = degre * M_PI/180
+      // définir le dégradé dans un carré de (0,0) (100,100)
+      // ensuite ce dégradé est extrapolé selon le ratio width/height
+      // dans repère (0, 0) (100, 100)
+      double X0, Y0, X1, Y1, degre;
+      // x = X * (a->width / 100), y = Y * (a->height / 100)
+      double x0, y0, x1, y1;
+      X0 = 0;
+      Y0 = 100;
+      X1 = 100;
+      Y1 = 0;
+      degre = 45;
+      // et ensuite faire la changement d'unité du repère
+      // car ce qui doit resté inchangée est les traits et pas la direction
+      
+      // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°)
+      // ceci peut être appliqué une fois pour toute au départ
+      // ensuite calculer l'angle dans le nouveau repère
+      // puis faire une rotation de 90°
+      x0 = X0 * ((double)a->width / 100);
+      x1 = X1 * ((double)a->width / 100);
+      y0 = Y0 * ((double)a->height / 100);
+      y1 = Y1 * ((double)a->height / 100);
+      
+      x0 = X0 * ((double)a->height / 100);
+      x1 = X1 * ((double)a->height / 100);
+      y0 = Y0 * ((double)a->width / 100);
+      y1 = Y1 * ((double)a->width / 100);
+      printf("repère (%d, %d)  points (%lf, %lf) (%lf, %lf)\n", a->width, a->height, x0, y0, x1, y1);
+            
+      cairo_pattern_t *linpat;
+      linpat = cairo_pattern_create_linear (x0, y0, x1, y1);
+      cairo_pattern_add_color_stop_rgba (linpat, 0, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
+      cairo_pattern_add_color_stop_rgba (linpat, 1, a->border.color[0], a->border.color[1], a->border.color[2], 0);
+      cairo_set_source (c, linpat);
+      */
+      cairo_set_source_rgba (c, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
+      
+      cairo_stroke (c);
+      //cairo_pattern_destroy (linpat);
+   }
+}
+
+
+void refresh (Area *a)
+{
+   XCopyArea (server.dsp, a->pmap, server.pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
+}
+
+
+void remove_area (Area *a)
+{
+   Area *parent;
+   
+   parent = (Area*)a->parent;
+   parent->list = g_slist_remove(parent->list, a);
+   redraw (parent);
+
+}
+
+
+void add_area (Area *a)
+{
+   Area *parent;
+   
+   parent = (Area*)a->parent;
+   parent->list = g_slist_remove(parent->list, a);
+   redraw (parent);
+
+}
+

src/util/area.h

@@ -0,0 +1,140 @@
+/**************************************************************************
+* base class for all objects (panel, taskbar, task, systray, clock, ...).
+* each object 'inherit' Area and implement draw_foreground if needed.
+* 
+* Area is at the begining of each object so &object == &area.
+* 
+* une zone comprend :
+* - fond : couleur / opacité
+* - contenu
+* - largeur / hauteur
+* - paddingx / paddingy
+* - pixmap mémorisant l'affichage (évite de redessiner l'objet à chaque rafraichissement)
+* - une liste de sous objets
+*
+* un objet comprend les actions:
+* 1) redraw(obj)
+*    force l'indicateur 'redraw' sur l'objet
+*    parcoure la liste des sous objets => redraw(obj)
+* 2) draw(obj)
+*    dessine le background, dessine le contenu dans pmap
+*    parcoure la liste des sous objets => draw(obj)
+*    le pmap de l'objet se base sur le pmap de l'objet parent (cumul des couches)
+* 3) draw_background(obj)
+*    dessine le fond dans pmap
+* 4) draw_foreground(obj) = 0 : fonction virtuelle à redéfinir
+*    dessine le contenu dans pmap
+*    si l'objet n'a pas de contenu, la fonction est nulle
+* 5) resize_width(obj, width) = 0 : fonction virtuelle à redéfinir
+*    recalcule la largeur de l'objet (car la hauteur est fixe)
+*    - taille systray calculée à partir de la liste des icones
+*    - taille clock calculée à partir de l'heure
+*    - taille d'une tache calculée à partir de la taskbar (ajout, suppression, taille)
+*    - taille d'une taskbar calculée à partir de la taille du panel et des autres objets
+* 6) voir refresh(obj)
+* 
+* Implémentation :
+* - tous les éléments du panel possèdent 1 objet en début de structure
+*   panel, taskbar, systray, task, ...
+* - l'objet est en fait une zone (area). 
+*   l'imbrication des sous objet doit permettre de gérer le layout.
+* - on a une relation 1<->1 entre un objet et une zone graphique
+*   les taskbar affichent toutes les taches.
+*   donc on utilise la liste des objets pour gérer la liste des taches.
+* - les taches ont 2 objets : l'un pour la tache inactive et l'autre pour la tache active
+*   draw(obj) est appellé sur le premier objet automatiquement 
+*   et draw_foreground(obj) lance l'affichage du 2 ieme objet
+*   ainsi la taskbar gère bien une liste d'objets mais draw(obj) dessine les 2 objets
+* - les fonctions de refresh et de draw sont totalement dissociées
+* 
+* ----------------------------------------------------
+* A évaluer :
+* 1. voir comment définir et gérer le panel_layout avec les objets
+*    => peut on s'affranchir des données spécifiques à chaque objet ?
+*    => comment gérer l'affichage du layout ?
+*    => comment configurer le layout ?
+*    => voir le cumul des couches et l'imbrication entre objet et parent ?
+* 2. voir la fonction de refresh des objets ??
+*    surtout le refresh des taches qui est différent pour la tache active
+* 
+* 3. tester l'implémentation et évaluer les autres abstractions possibles ?
+* 
+* 4. comment gérer le groupage des taches
+* 5. la clock est le contenu du panel. mais elle ne tiens pas compte du padding vertical ?
+*    c'est ok pour la clock. voir l'impact sur paddingx ?
+* 
+* voir resize_taskbar(), resize_clock() et resize_tasks()
+* voir les taches actives et inactives ?? une seule tache est active !
+* variable widthChanged ou bien emission d'un signal ???
+*
+* 6) config(obj) configure un objet (définie les positions verticales)
+*
+**************************************************************************/
+
+#ifndef AREA_H
+#define AREA_H
+
+#include <X11/Xlib.h>
+#include <pango/pangocairo.h>
+
+#include "common.h"
+
+
+
+typedef struct
+{
+   double color[3];
+   double alpha;
+   int width;
+   int rounded;
+} Border;
+
+
+typedef struct
+{
+   double color[3];
+   double alpha;
+} Color;
+
+
+typedef struct {
+   // need redraw Pixmap
+   int redraw;
+   
+   int paddingx, paddingy;   
+   int width, height;
+   Pixmap pmap;
+   
+   Color back;
+   Border border;
+   
+   // absolute coordinate in panel
+   int posx, posy;
+   // parent Area
+   void *parent;
+
+   // pointer to function
+   // draw_foreground : return 1 if width changed, return O otherwise
+   int (*draw_foreground)(void *obj, cairo_t *c);
+   void (*add_child)(void *obj);
+   int (*remove_child)(void *obj);
+   
+   // list of child
+   GSList *list;
+} Area;
+
+
+// redraw an area and childs
+void redraw (Area *a);
+
+// draw background and foreground
+// return 1 if width changed, return O otherwise
+int  draw (Area *a);
+void draw_background (Area *a, cairo_t *c);
+
+void refresh (Area *a);
+void remove_area (Area *a);
+void add_area (Area *a);
+
+#endif
+

src/util/common.h

@@ -0,0 +1,41 @@
+/**************************************************************************
+* Common declarations
+* 
+**************************************************************************/
+
+#ifndef COMMON_H
+#define COMMON_H
+
+
+#define WM_CLASS_TINT   "panel"
+
+#include "area.h"
+
+// taskbar table : convert 2 dimension in 1 dimension
+#define index(i, j) ((i * panel.nb_monitor) + j)
+
+// mouse actions
+enum { NONE=0, CLOSE, TOGGLE, ICONIFY, SHADE, TOGGLE_ICONIFY };
+
+
+
+typedef struct config_border
+{
+   double color[3];
+   double alpha;
+   int width;
+   int rounded;
+} config_border;
+
+
+typedef struct config_color
+{
+   double color[3];
+   double alpha;
+} config_color;
+
+
+
+
+#endif
+

src/util/window.c

@@ -0,0 +1,264 @@
+/**************************************************************************
+*
+* Tint2 : common windows function
+*
+* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* as published by the Free Software Foundation.
+*
+* 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.
+**************************************************************************/
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <Imlib2.h>
+
+#include "common.h"
+#include "window.h"
+#include "server.h"
+
+
+
+void set_active (Window win)
+{
+   send_event32 (win, server.atom._NET_ACTIVE_WINDOW, 2, 0);
+}
+
+
+void set_desktop (int desktop)
+{
+   send_event32 (server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0);
+}
+
+
+void windows_set_desktop (Window win, int desktop)
+{
+   send_event32 (win, server.atom._NET_WM_DESKTOP, desktop, 2);
+}
+
+
+void set_close (Window win)
+{
+   send_event32 (win, server.atom._NET_CLOSE_WINDOW, 0, 2);
+}
+
+
+void window_toggle_shade (Window win)
+{
+   send_event32 (win, server.atom._NET_WM_STATE, 2, 0);
+}
+
+
+int window_is_hidden (Window win)
+{
+   Window window;
+   Atom *at;
+   int count, i;
+   
+   if (XGetTransientForHint(server.dsp, win, &window) != 0) {
+      if (window) {
+         return 1;
+      }
+   }
+
+   at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+   for (i = 0; i < count; i++) {      
+      if (at[i] == server.atom._NET_WM_STATE_SKIP_PAGER || at[i] == server.atom._NET_WM_STATE_SKIP_TASKBAR) {
+         XFree(at);
+         return 1;
+      }
+   }
+   XFree(at);
+
+   at = server_get_property (win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, &count);
+   for (i = 0; i < count; i++) {
+      if (at[i] == server.atom._NET_WM_WINDOW_TYPE_DOCK || at[i] == server.atom._NET_WM_WINDOW_TYPE_DESKTOP || at[i] == server.atom._NET_WM_WINDOW_TYPE_TOOLBAR || at[i] == server.atom._NET_WM_WINDOW_TYPE_MENU || at[i] == server.atom._NET_WM_WINDOW_TYPE_SPLASH) {
+         XFree(at);
+         return 1;
+      }
+   }
+
+   // specification
+   // Windows with neither _NET_WM_WINDOW_TYPE nor WM_TRANSIENT_FOR set
+   // MUST be taken as top-level window.
+   XFree(at);
+   return 0;
+}
+
+
+int window_get_desktop (Window win)
+{
+   return get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL);
+}  
+
+
+int window_get_monitor (Window win)
+{
+   int i, x, y;
+   Window src;
+
+   XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);   
+   for (i = 0; i < server.nb_monitor; i++) {
+      if (x >= server.monitor[i].x && x <= (server.monitor[i].x + server.monitor[i].width))
+         if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height))
+            break;
+   }
+   
+   //printf("window %lx : ecran %d, (%d, %d)\n", win, i, x, y);
+   if (i == server.nb_monitor) return 0;
+   else return i;
+}
+
+
+int window_is_iconified (Window win)
+{
+   return (IconicState == get_property32(win, server.atom.WM_STATE, server.atom.WM_STATE));
+}
+
+
+int server_get_number_of_desktop ()
+{
+   return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
+}
+
+
+int server_get_current_desktop ()
+{
+   return get_property32(server.root_win, server.atom._NET_CURRENT_DESKTOP, XA_CARDINAL);
+}
+
+
+Window window_get_active ()
+{
+   return get_property32(server.root_win, server.atom._NET_ACTIVE_WINDOW, XA_WINDOW);
+}
+
+
+int window_is_active (Window win)
+{
+   return (win == get_property32(server.root_win, server.atom._NET_ACTIVE_WINDOW, XA_WINDOW));
+}
+
+
+int get_icon_count (long *data, int num)
+{
+   int count, pos, w, h;
+
+   count = 0;
+   pos = 0;
+   while (pos < num) {
+      w = data[pos++];
+      h = data[pos++];
+      pos += w * h;
+      if (pos > num || w * h == 0) break;
+      count++;
+   }
+
+   return count;
+}
+
+
+long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
+{
+   int width[icon_count], height[icon_count], pos, i, w, h;
+   long *icon_data[icon_count];
+
+   /* List up icons */
+   pos = 0;
+   i = icon_count;
+   while (i--) {
+      w = data[pos++];
+      h = data[pos++];
+      if (pos + w * h > num) break;
+
+      width[i] = w;
+      height[i] = h;
+      icon_data[i] = &data[pos];
+
+      pos += w * h;
+   }
+
+   /* Try to find exact size */
+   int icon_num = -1;
+   for (i = 0; i < icon_count; i++) {
+      if (width[i] == best_icon_size) {
+         icon_num = i;
+         break;
+      }
+   }
+
+   /* Take the biggest or whatever */
+   if (icon_num < 0) {
+      int highest = 0;
+      for (i = 0; i < icon_count; i++) {
+         if (width[i] > highest) {
+               icon_num = i;
+               highest = width[i];
+         }
+      }
+   }
+       
+   *iw = width[icon_num];
+   *ih = height[icon_num];
+   return icon_data[icon_num];
+}
+
+
+void draw_rect(cairo_t *c, double x, double y, double w, double h, double r)
+{
+   if (r > 0.0) {
+      double c1 = 0.55228475 * r;
+
+      cairo_move_to(c, x+r, y);
+      cairo_rel_line_to(c, w-2*r, 0);
+      cairo_rel_curve_to(c, c1, 0.0, r, c1, r, r);
+      cairo_rel_line_to(c, 0, h-2*r);
+      cairo_rel_curve_to(c, 0.0, c1, c1-r, r, -r, r);
+      cairo_rel_line_to (c, -w +2*r, 0);
+      cairo_rel_curve_to (c, -c1, 0, -r, -c1, -r, -r);
+      cairo_rel_line_to (c, 0, -h + 2 * r);
+      cairo_rel_curve_to (c, 0, -c1, r - c1, -r, r, -r);
+   }
+   else
+      cairo_rectangle(c, x, y, w, h);
+}
+
+
+void get_text_size(PangoFontDescription *font, int *height_ink, int *height, int panel_height, char *text, int len)
+{
+   PangoRectangle rect_ink, rect;
+
+   Pixmap pmap = server_create_pixmap (panel_height, panel_height);
+   cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, panel_height, panel_height);
+   cairo_t *c = cairo_create (cs);
+   
+   PangoLayout *layout = pango_cairo_create_layout (c);
+   pango_layout_set_font_description (layout, font);
+   pango_layout_set_text (layout, text, len);
+   
+   pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
+   *height_ink = rect_ink.height;
+   *height = rect.height;
+   //printf("dimension : %d - %d\n", rect_ink.height, rect.height);
+
+   g_object_unref (layout);   
+   cairo_destroy (c);
+   cairo_surface_destroy (cs);
+   XFreePixmap (server.dsp, pmap);
+}
+
+
+

src/util/window.h

@@ -0,0 +1,46 @@
+/**************************************************************************
+* window : 
+* - 
+*
+* Check COPYING file for Copyright
+*
+**************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <cairo.h>
+#include <cairo-xlib.h>
+#include <pango/pangocairo.h>
+
+
+typedef struct window_global
+{
+   Window main_win;
+} window_global;
+
+window_global window;
+
+void set_active (Window win);
+void set_desktop (int desktop);
+void set_close (Window win);
+int server_get_current_desktop ();
+int server_get_number_of_desktop ();
+int window_is_iconified (Window win);
+int window_is_hidden (Window win);
+int window_is_active (Window win);
+int get_icon_count (long *data, int num);
+long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
+void window_toggle_shade (Window win);
+int window_get_desktop (Window win);
+void windows_set_desktop (Window win, int desktop);
+int window_get_monitor (Window win);
+Window window_get_active ();
+
+// draw rounded rectangle
+void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
+
+void get_text_size(PangoFontDescription *font, int *height_ink, int *height, int panel_height, char *text, int len);
+
+
+#endif