Commit Graph

163 Commits

Author SHA1 Message Date
Julien Danjou 7f3e831221 draw: stop using font as argument, use global
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou 26da80f90a draw: remove custom markup support
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou a4d914f0e4 draw: fix UTF-8 string len computation upon conversion
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou 9adf3fd869 draw: remove bg color markup, move to textbox
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou b5fb612ea3 draw: remove shadow support
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou 486e13eba0 draw: honor bottom margin
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou 8e9f0c8857 draw: remove margin markup, move to textbox widget
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou 3c304bca07 draw: remove alignment markup
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou 68f31f0629 draw: remove border markup, move it to textbox
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:23 +01:00
Julien Danjou da99991223 draw: draw_text take extents as argument
This avoid one call of pango_layout_get_pixel_extents().

Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-14 10:28:22 +01:00
Julien Danjou beabf82ddf draw: check more quickly if we need UTF-8 conversion
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-12 16:51:41 +01:00
Julien Danjou 00149a0e90 draw: fix text alignment on small width
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-03 11:11:11 +01:00
Julien Danjou 35811f9c36 draw: height computing honor margin top
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-12-03 11:10:05 +01:00
Julien Danjou a5cb98162d textbox: add ellipsize and wrap mode support
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-11-06 17:04:23 +01:00
Julien Danjou de9c2b1886 draw: stop exporting draw_text_markup_expand
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-11-05 13:16:02 +01:00
Julien Danjou 8e66a543bc draw: remove phys_screen from font handling
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-11-04 17:50:10 +01:00
Julien Danjou 24a8e6d377 draw: support top and bottom as align
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-11-04 16:34:30 +01:00
Julien Danjou 737a70f60c remove a bunch of useless #include-s
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-10-24 20:57:29 +02:00
Julien Danjou 93be5b3cae draw: remove useless AlignAuto
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-10-23 15:53:04 +02:00
Julien Danjou 0261969930 draw: allow text to be on multiple lines
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-10-01 14:07:30 +02:00
Julien Danjou fcc93e5f88 draw: merge draw context into swindow
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-09-22 11:11:56 +02:00
Julien Danjou 6ac0c4130c image: merge draw_image_t and image_t
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-09-22 11:11:55 +02:00
Julien Danjou fbf0a785d5 draw: iconv is local
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-09-22 11:11:55 +02:00
Julien Danjou b48f094490 draw: remove GdkPixBuf support
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-09-22 11:11:55 +02:00
Julien Danjou 6a5ad6af9b common: move draw, xscreen and swindow out
Signed-off-by: Julien Danjou <julien@danjou.info>
2008-09-22 11:11:55 +02:00
Julien Danjou 2ac27fdac4 move draw files to common/ 2008-01-24 18:48:11 +01:00
Julien Danjou 35803aff4c make draw functions more independant 2008-01-24 18:43:24 +01:00
Julien Danjou 7ad43fe713 stop being stupid, use only one Drawable 2008-01-23 19:10:53 +01:00
Julien Danjou 3e249cab4b change align type 2008-01-23 16:54:14 +01:00
Julien Danjou f17bf8b334 do not return nothing on errors 2008-01-23 15:56:40 +01:00
Julien Danjou 0b678ce0c2 print cairo errors 2008-01-23 13:47:56 +01:00
Julien Danjou e8bc0dac62 check cairo errors 2008-01-23 10:48:08 +01:00
Julien Danjou 668702b777 move list.h and util.[ch] to common/ 2008-01-21 18:14:59 +01:00
Julien Danjou 17a8c4a4c4 draw_text takes a Area as arg 2008-01-21 16:31:14 +01:00
Julien Danjou d59fc62739 draw rectangle take an Area as arg 2008-01-21 16:31:14 +01:00
marco candrian 23fc37a4a6 not needed i_tmp variable removed and using h_index instead 2008-01-07 09:24:31 +01:00
Julien Danjou 9fa01e34de rename textwidth to draw_textwidth 2008-01-06 22:57:23 +01:00
marco candrian 37da7d0d01 graph widget added
example config:

graph gr_cpu {
  width = 80
  height = "0.8"
  fg = "#336633"
  bg = "#000000"
  bordercolor = "#669966"
  padding_left = 0
  mouse = {...}
  x = ...
  y = ...
}

Looks like here: http://www.calmar.ws/tmp/112-Sun-screen.png

I renamed lpadding to padding_left, and bcolor to bordercolor
also on the progressbar widget.

The awesomerc page would still be to write, when this patch will get accepted.

Hints are always welcomed.
2008-01-06 20:51:40 +01:00
Julien Danjou 1d6613349e typedef enum Alignment 2008-01-04 19:17:20 +01:00
Julien Danjou bcebd5e1ce fix various uninit vars 2008-01-04 14:19:59 +01:00
Julien Danjou 6c7b0304a0 add draw_get_align() to translate string to enum 2008-01-03 16:02:32 +01:00
Julien Danjou aed3e569de add a align option to draw_text 2008-01-03 15:57:07 +01:00
Julien Danjou 437bc5c22c add 2008 copyright notice 2008-01-02 16:59:43 +01:00
Julien Danjou 4f65aa8f51 rework headers inclusion 2008-01-01 18:02:36 +01:00
Julien Danjou f467fed598 use LayoutArrange and Uicb type into config.h ; move some functions from layout.c to client.c 2008-01-01 17:37:16 +01:00
Julien Danjou 84c59a5704 code documentation update 2007-12-30 15:11:37 +01:00
Julien Danjou 0eb4743385 draw_text don't pad with font->height / 2 by default: padding is now an arg 2007-12-30 14:42:51 +01:00
Julien Danjou 9a5e745114 remove textwidth_primitive 2007-12-30 14:22:19 +01:00
Julien Danjou e57f387df0 fix size stuff for square 2007-12-30 14:06:45 +01:00
Julien Danjou 0df27e0f6a split the display part of statusbar_draw(), move it to new statusbar_display(), and call it for expose events 2007-12-30 13:17:26 +01:00
Julien Danjou 1021f86e24 rework draw stuff
- remove display from DrawCtx
- add Drawable in statusbar
2007-12-30 12:26:11 +01:00
Julien Danjou 3d71a2e9a4 merge draw_get_image_{width,height}() into draw_get_image_size() 2007-12-29 21:44:44 +01:00
Robert Millar eb65306127 Custom netwm icons, scaling icons!
I hacked together support for custom netwm icons set in the rules
section of .awesomerc, and for iconboxes and netwm icons to be scaled
to fit into the statusbar. It could probably be done a bit more
cleanly than I've done it, though :)

Rob
2007-12-29 21:30:37 +01:00
Julien Danjou c900e37843 add mouse bindings to status bar 2007-12-27 15:49:00 +01:00
Julien Danjou 26ce9ee5d7 it's not width but height which defines ratio 2007-12-27 10:33:20 +01:00
Julien Danjou 91cc5a4618 use image instead of symbols for layouts 2007-12-27 00:13:44 +01:00
Julien Danjou e77fe9c2a0 compute textlen also 2007-12-26 22:00:43 +01:00
Julien Danjou c232576631 rename a bunch of draw functions 2007-12-22 20:17:24 +01:00
Julien Danjou e72a278080 allow to shrink net_wm_icon to statusbar size 2007-12-22 20:14:13 +01:00
Julien Danjou 8c898256b1 new widget: add support for netwmicon 2007-12-22 19:32:47 +01:00
Julien Danjou 3f3748d4bd new widget to draw icons from PNG image 2007-12-22 15:37:43 +01:00
Aldo Cortesi ce556ec743 The preferred line length is 80 characters. 2007-12-18 11:27:26 +01:00
Aldo Cortesi 21fe1add9e Make drawtext interface more general. 2007-12-18 11:25:50 +01:00
Aldo Cortesi 4723ab3627 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 18:22:05 +01:00
Aldo Cortesi c81b5cfc55 Refactor statusbar.c
This a preparatory patch. Refactor statusbar.c to compartmentalise the drawing
of the statusbar "widgets". We can now begin to see what a generalised widget
drawing interface would look like.

Note that at the moment we don't gracefully handle situations where "widgets"
run out of space. That will come as we generalise from here.
2007-12-15 09:48:13 +01:00
Aldo Cortesi f36a56cdcc Refactor draw.c
This is a big patch that does not change any behaviour. We abstract the data
needed by the draw.c functions into a context object, and pass that around
instead of passing each argument every time. This results in a much cleaner API
- most functions lose 3-4 arguments.

This is a preparatory patch for further work on statusbar.
2007-12-15 09:30:29 +01:00
Julien Danjou ae49735001 use real and smaller surface size to draw statusbar when rotating 2007-11-13 21:23:13 +01:00
Julien Danjou 3f36130533 fix X memory leak in draw_rotate() 2007-11-11 22:38:29 +01:00
Julien Danjou 0753ed5fb5 statusbar drawable is no more stored but dynamicaly created; this fix a problem with statusbar on right 2007-11-11 22:27:00 +01:00
Julien Danjou 84017b9666 inverse rotate and translate and fix bar position on right for Xinerama 2007-11-11 21:13:37 +01:00
Julien Danjou 543899da7c fix statusbar display when on right 2007-11-11 19:49:50 +01:00
Julien Danjou 05dad60786 experimental support for status bar to be on right or left 2007-11-11 18:59:11 +01:00
Martin Stubenschrott b333185ec1 better centering for drawtext() 2007-10-16 19:20:39 +02:00
Julien Danjou 472b07f8ab remove useless cast 2007-10-16 18:54:58 +02:00
Nikos Ntarmos 7ecbae334f use Cairo to render fonts 2007-10-16 16:35:28 +02:00
Julien Danjou 866a75e76a use XftChar8 instead of FcChar8 2007-10-15 21:42:49 +02:00
Julien Danjou 9d48aaac1f destroy xftdrawable 2007-10-15 21:41:44 +02:00
Julien Danjou a74ca1d1de tabswidth is 4 not 6 2007-10-15 13:56:24 +02:00
Julien Danjou 4e0acfa99a add coding style stuff 2007-10-15 13:40:52 +02:00
Julien Danjou b3995c6152 do not print empty text 2007-10-15 12:42:48 +02:00
Julien Danjou f20c729d64 better compute for empty circle size 2007-10-11 17:09:38 +02:00
Julien Danjou a06674fbe7 add drawcircle() function and use it for floating/max windows instead of drawrectangle 2007-10-11 17:06:55 +02:00
Julien Danjou 9ad6b157df remove math.h 2007-10-11 16:30:49 +02:00
Julien Danjou 1f5a6e918b use drawrectangle to draw background in statusbar, fix coords of rectangles and compute colors correctly 2007-10-11 16:29:20 +02:00
Julien Danjou f6ea98649c drawsquare is now drawrectangle 2007-10-11 15:44:30 +02:00
Julien Danjou 445479cf8b use Cairo for rendering square instead of Xlib 2007-10-10 19:59:14 +02:00
Julien Danjou 1a755ff245 simplify color handling 2007-10-10 13:07:12 +02:00
Julien Danjou 2887bb8b86 avoid DC in drawsquare() 2007-10-09 21:43:26 +02:00
Julien Danjou aa645b15ab avoid DC in drawtext() 2007-10-09 21:29:19 +02:00
Julien Danjou d7aac7b811 better fix for font height problem
Thanks to Arnaud Fontaine
2007-10-04 17:35:47 +02:00
Julien Danjou 97a2085705 cosmetic: remove lines with empty spaces at end 2007-10-03 17:26:14 +02:00
Julien Danjou 5ecb754d62 remove useless extern variables 2007-10-03 00:14:39 +02:00
Julien Danjou 0745844db5 remove alpha layer; bug otherwise 2007-10-02 17:06:38 +02:00
Julien Danjou 272f4b1c2a Xft support 2007-10-01 19:22:57 +02:00
Julien Danjou 9737185639 simplify drawsquare() 2007-09-20 20:11:33 +02:00
Julien Danjou ce367ebfba simplify drawsquare() 2007-09-19 15:42:40 +02:00
Julien Danjou 82e1c44f85 better proto for drawsquare
the old one was not logical
2007-09-17 12:45:41 +02:00
Julien Danjou fe89aa31b0 create statusbar.c and move things from draw.c 2007-09-15 15:16:53 +02:00
Julien Danjou 6a11f10764 move drawable to statusbar struct 2007-09-15 14:58:41 +02:00
Julien Danjou 01b2785587 rename drawstatus to drawstatusbar 2007-09-15 13:54:02 +02:00