Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
awesome/widgets/layoutinfo.c

45 lines
1.2 KiB
C
Raw Normal View History

This patch is a first draft of independently targetable textboxes, and a protocol to speak to them. Given a textbox widget definition like this: textbox mail { default = 0 } textbox time {} We can update the boxes individually by going: echo 0 tell_widget mail 10 echo 0 tell_widget time 12:01 Text boxes will dynamically resize to fit their contents. A textbox can be cleared by going: echo 0 tell_widget name A text-box containing no text will take up 0 space in the bar, i.e. it will not be visible at all Textboxes now supersede statusbar_set_text, so this call has been removed.
2007-12-17 10:57:17 +01:00
#include <confuse.h>
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
#include "widget.h"
#include "util.h"
#include "layout.h"
Massive, massive interface refactoring. The big change here is that we now keep our configuration structure in a global variable called globalconf. This radically simplifies many interfaces, since passing awesomeconf everywhere is no longer necessary. There are also more subtle interface effects - now we can reliably identify a screen from just a screen ID, rather than an awesomeconf, screenid tuple. Overall, this patch makes most of the interfaces in awesome much nicer to use - enjoy! Yes, this is a huge patch, but since a lot of the refactoring was done systematically using vim macros, splitting this up would have been very hard.
2007-12-16 02:45:38 +01:00
extern awesome_config globalconf;
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
static int
Solidify widgets. Factor out common initialisation into a common_new function. Copy the section title into the Widget title attribute.
2007-12-16 09:34:33 +01:00
layoutinfo_draw(Widget *widget,
DrawCtx *ctx,
int offset,
int used __attribute__ ((unused)))
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
{
int width = 0, location;
Simplify widget draw interface.
2007-12-16 04:28:29 +01:00
VirtScreen vscreen = globalconf.screens[widget->statusbar->screen];
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
Layout *l;
for(l = vscreen.layouts ; l; l = l->next)
width = MAX(width, (textwidth(ctx, vscreen.font, l->symbol)));
Make "Statusbar statusbar" the in VirtScreen "Statusbar *statusbar". This is more consistent with the rest of the interface, and will make our life easier when we have mulitiple statusbars per screen.
2007-12-18 08:17:46 +01:00
location = calculate_offset(vscreen.statusbar->width,
Solidify widgets. Factor out common initialisation into a common_new function. Copy the section title into the Widget title attribute.
2007-12-16 09:34:33 +01:00
width,
offset,
widget->alignment);
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
drawtext(ctx, location, 0,
width,
Make "Statusbar statusbar" the in VirtScreen "Statusbar *statusbar". This is more consistent with the rest of the interface, and will make our life easier when we have mulitiple statusbars per screen.
2007-12-18 08:17:46 +01:00
vscreen.statusbar->height,
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
vscreen.font,
Simplify widget draw interface.
2007-12-16 04:28:29 +01:00
get_current_layout(widget->statusbar->screen)->symbol,
Make drawtext interface more general.
2007-12-18 04:19:41 +01:00
vscreen.colors_normal[ColFG],
vscreen.colors_normal[ColBG]);
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
return width;
}
Widget *
This patch is a first draft of independently targetable textboxes, and a protocol to speak to them. Given a textbox widget definition like this: textbox mail { default = 0 } textbox time {} We can update the boxes individually by going: echo 0 tell_widget mail 10 echo 0 tell_widget time 12:01 Text boxes will dynamically resize to fit their contents. A textbox can be cleared by going: echo 0 tell_widget name A text-box containing no text will take up 0 space in the bar, i.e. it will not be visible at all Textboxes now supersede statusbar_set_text, so this call has been removed.
2007-12-17 10:57:17 +01:00
layoutinfo_new(Statusbar *statusbar, cfg_t* config)
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
{
Widget *w;
w = p_new(Widget, 1);
This patch is a first draft of independently targetable textboxes, and a protocol to speak to them. Given a textbox widget definition like this: textbox mail { default = 0 } textbox time {} We can update the boxes individually by going: echo 0 tell_widget mail 10 echo 0 tell_widget time 12:01 Text boxes will dynamically resize to fit their contents. A textbox can be cleared by going: echo 0 tell_widget name A text-box containing no text will take up 0 space in the bar, i.e. it will not be visible at all Textboxes now supersede statusbar_set_text, so this call has been removed.
2007-12-17 10:57:17 +01:00
common_new(w, statusbar, config);
Widget-ise the statusbar. We now have the beginnings of a flexible widget structure for the statusbar. For now, there is no behavioural change, and the interface is a bit crude, but watch this space!
2007-12-15 07:53:53 +01:00
w->draw = (void*) layoutinfo_draw;
return w;
}
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99