X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=de%2Fstyle.h;h=073f14554c3a075cd49c6981c58c80d47527ecf3;hp=f25c44ceedeaf7758a7223a7cda2ed9c562196ed;hb=e3aec18706513a87eaa7839dfdaf7e0fcd0d8d2a;hpb=8366314611bf30a0f31d25bf5f5023186fa87692 diff --git a/de/style.h b/de/style.h index f25c44c..073f145 100644 --- a/de/style.h +++ b/de/style.h @@ -1,12 +1,9 @@ /* * ion/de/style.h * - * Copyright (c) Tuomo Valkonen 1999-2006. + * Copyright (c) Tuomo Valkonen 1999-2009. * - * Ion is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. + * See the included file LICENSE for details. */ #ifndef ION_DE_STYLE_H @@ -31,6 +28,12 @@ enum{ DEBORDER_GROOVE /* \_/xxxx\_/ */ }; +enum{ + DEBORDER_ALL=0, + DEBORDER_TB, + DEBORDER_LR +}; + enum{ DEALIGN_LEFT=0, @@ -42,11 +45,12 @@ enum{ DECLSTRUCT(DEBorder){ uint sh, hl, pad; uint style; + uint sides; }; DECLSTRUCT(DEStyle){ - char *style; + GrStyleSpec spec; int usecount; bool is_fallback; @@ -66,7 +70,7 @@ DECLSTRUCT(DEStyle){ int textalign; uint spacing; - ExtlTab data_table; + ExtlTab extras_table; /* Only initialised if used as a DETabBrush */ bool tabbrush_data_ok; @@ -91,7 +95,10 @@ extern void destyle_create_tab_gcs(DEStyle *style); extern void de_reset(); extern void de_deinit_styles(); -extern DEStyle *de_get_style(WRootWin *rootwin, const char *name); +extern DEStyle *de_get_style(WRootWin *rootwin, const GrStyleSpec *spec); + +extern void destyle_add(DEStyle *style); +extern void destyle_dump(DEStyle *style); #endif /* ION_DE_STYLE_H */