awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
awesome/widgets/textbox.c

84 lines
1.9 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 "util.h"
#include "widget.h"
Make textbox foreground and background configurable.
2007-12-19 03:20:21 +01:00
#include "xutil.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
Change awesome_config -> AwesomeConf. All other struct definitions in the project follow this naming convention.
2007-12-19 04:46:44 +01:00
extern AwesomeConf globalconf;
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
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
typedef struct Data Data;
struct Data
{
char *text;
Make textbox foreground and background configurable.
2007-12-19 03:20:21 +01:00
XColor fg;
XColor bg;
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
};
static void
update(Widget *widget, char *text){
Data *d;
d = (Data*) widget->data;
if (d->text)
p_delete(&d->text);
d->text = a_strdup(text);
}
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
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
textbox_draw(Widget *widget, DrawCtx *ctx, int offset,
Simplify widget draw interface.
2007-12-16 04:28:29 +01:00
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
{
Simplify widget draw interface.
2007-12-16 04:28:29 +01:00
VirtScreen vscreen = globalconf.screens[widget->statusbar->screen];
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
int width, location;
Data *d;
d = (Data*) widget->data;
width = textwidth(ctx, vscreen.font, d->text);
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,
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
width,
offset,
widget->alignment);
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
drawtext(ctx, location, 0, width, vscreen.statusbar->height,
Make textbox foreground and background configurable.
2007-12-19 03:20:21 +01:00
vscreen.font, d->text, d->fg, d->bg);
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;
}
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
static void
textbox_tell(Widget *widget, char *command)
{
update(widget, command);
}
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 *
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
textbox_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;
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
Data *d;
Make textbox foreground and background configurable.
2007-12-19 03:20:21 +01:00
char *color;
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
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 = 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);
cosmetic and don't cast for nothing
2007-12-15 16:25:54 +01:00
w->draw = textbox_draw;
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
w->tell = textbox_tell;
Make textbox foreground and background configurable.
2007-12-19 03:20:21 +01:00
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
d = p_new(Data, 1);
w->data = (void*) d;
Make textbox foreground and background configurable.
2007-12-19 03:20:21 +01:00
if ((color = cfg_getstr(config, "fg")))
d->fg = initxcolor(statusbar->screen, color);
else
d->fg = globalconf.screens[statusbar->screen].colors_normal[ColFG];
if ((color = cfg_getstr(config, "bg")))
d->bg = initxcolor(statusbar->screen, color);
else
d->bg = globalconf.screens[statusbar->screen].colors_normal[ColBG];
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
update(w, cfg_getstr(config, "default"));
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 w;
}
The preferred line length is 80 characters.
2007-12-18 09:24:15 +01:00
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80