From b16493d87895dcbd8780069702abc99991c0901f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 13 Jun 2008 19:17:35 +0200 Subject: [PATCH] random updates/fixes Signed-off-by: Julien Danjou --- awesome.c | 5 +++-- common/draw.c | 20 +++++++++----------- common/swindow.h | 2 +- common/xscreen.c | 1 + common/xutil.c | 3 ++- mouse.c | 3 ++- window.c | 3 ++- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/awesome.c b/awesome.c index 8cebdbf37..0c528bb1a 100644 --- a/awesome.c +++ b/awesome.c @@ -192,8 +192,9 @@ exit_on_signal(int sig __attribute__ ((unused))) * There's no way to check accesses to destroyed windows, thus those cases are * ignored (especially on UnmapNotify's). Other types of errors call Xlibs * default error handler, which may call exit. - * \param edpy display ref - * \param ee XErrorEvent event + * \param data currently unused + * \param c The connectiont to the X server. + * \param e The error event * \return 0 if no error, or xerror's xlib return status */ static int diff --git a/common/draw.c b/common/draw.c index f079495b0..29115a4ab 100644 --- a/common/draw.c +++ b/common/draw.c @@ -144,6 +144,7 @@ draw_context_new(xcb_connection_t *conn, int phys_screen, /** Create a new Pango font * \param conn Connection ref + * \param phys_screen The physical screen number. * \param fontname Pango fontname (e.g. [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]) * \return a new font */ @@ -287,9 +288,9 @@ draw_text_markup_expand(draw_parser_data_t *data, /** Draw text into a draw context. * \param ctx Draw context to draw to. + * \param font The font to use. * \param area Area to draw to. * \param text Text to draw. - * \param style A pointer to the style to use. */ void draw_text(draw_context_t *ctx, font_t *font, @@ -377,7 +378,7 @@ draw_text(draw_context_t *ctx, font_t *font, /** Setup color-source for cairo (gradient or mono). * \param ctx Draw context. * \param rect x, y to x + x_offset, y + y_offset. - * \param color Color to use at start (x, y). + * \param pcolor Color to use at start (x, y). * \param pcolor_center Color at 50% of width. * \param pcolor_end Color at pattern end (x + x_offset, y + y_offset). * \return pat Pattern or NULL, needs to get cairo_pattern_destroy()'ed. @@ -469,9 +470,8 @@ draw_rectangle(draw_context_t *ctx, area_t geometry, float line_width, bool fill * \param geometry geometry * \param line_width line width * \param filled filled rectangle? - * \param pattern__x pattern start x coord - * \param pattern_width pattern width - * \param color color to use at start + * \param pattern_rect pattern geometry + * \param pcolor color to use at start * \param pcolor_center color at 50% of width * \param pcolor_end color at pattern_start + pattern_width */ @@ -520,13 +520,12 @@ draw_graph_setup(draw_context_t *ctx) /** Draw a graph. * \param ctx Draw context. - * \param x x offset of widget. - * \param y y offset of widget. - * \param w Width in pixels. + * \param rect The area to draw into. * \param from Array of starting-point offsets to draw a graph lines. * \param to Array of end-point offsets to draw a graph lines. * \param cur_index Current position in data-array (cycles around). * \param grow Put new values to the left or to the right. + * \param patt_rect Pattern geometry. * \param pcolor Color at the left. * \param pcolor_center Color in the center. * \param pcolor_end Color at the right. @@ -575,12 +574,11 @@ draw_graph(draw_context_t *ctx, area_t rect, int *from, int *to, int cur_index, /** Draw a line into a graph-widget * \param ctx Draw context - * \param x x-offset of widget - * \param y y-offset of widget - * \param w width in pixels + * \param rect The area to draw into. * \param to array of offsets to draw the line through... * \param cur_index current position in data-array (cycles around) * \param grow put new values to the left or to the right + * \param patt_rect Pattern geometry. * \param pcolor color at the left * \param pcolor_center color in the center * \param pcolor_end color at the right diff --git a/common/swindow.h b/common/swindow.h index 0c19c7f79..c7765d960 100644 --- a/common/swindow.h +++ b/common/swindow.h @@ -104,7 +104,7 @@ simplewindow_border_width_set(simple_window_t *sw, uint32_t border_width) /** Set a simple window border color. * \param sw The simple window to change border width. - * \param border_color The border color. + * \param color The border color. */ static inline void simplewindow_border_color_set(simple_window_t *sw, xcolor_t *color) diff --git a/common/xscreen.c b/common/xscreen.c index 11fb868d7..a6393b864 100644 --- a/common/xscreen.c +++ b/common/xscreen.c @@ -27,6 +27,7 @@ /** Return the Xinerama screen number where the coordinates belongs to. * \param si The screens infos structure. + * \param screen The logical screen number. * \param x X coordinate * \param y Y coordinate * \return Screen number or screen param if no match or no multi-head. diff --git a/common/xutil.c b/common/xutil.c index 8215347b9..3c7abf158 100644 --- a/common/xutil.c +++ b/common/xutil.c @@ -160,7 +160,7 @@ xutil_get_transient_for_hint(xcb_connection_t *c, xcb_window_t win, * linked-list) * \param c X connection * \param atoms atoms cache - * \param property atom name + * \param name atom name * \return a request structure */ xutil_intern_atom_request_t @@ -585,6 +585,7 @@ xutil_button_fromint(int button) /** Equivalent to 'XCreateFontCursor()', error are handled by the * default current error handler. + * \param conn The connection to the X server. * \param cursor_font Type of cursor to use. * \return Allocated cursor font. */ diff --git a/mouse.c b/mouse.c index 0a1ef77a1..b5efbe982 100644 --- a/mouse.c +++ b/mouse.c @@ -120,6 +120,7 @@ mouse_snapclienttogeometry_inside(area_t geometry, area_t snap_geometry, int sna /** Snap a client with a futur geometry to the screen and other clients. * \param c The client. * \param geometry Geometry the client will get. + * \param snap The maximum distance in pixels to trigger a "snap". * \return Geometry to set to the client. */ static area_t @@ -829,7 +830,7 @@ luaA_mouse_screen_get(lua_State *L) } /** Create a new mouse userdata. - * \param t The mouse. + * \param bt The mouse button binding. */ static int luaA_mouse_userdata_new(button_t *bt) diff --git a/window.c b/window.c index f04b7916b..b8a94feae 100644 --- a/window.c +++ b/window.c @@ -83,7 +83,7 @@ window_getstate(xcb_window_t w) } /** Configure a window with its new geometry and border size. - * \param win Tthe X window id to configure. + * \param win The X window id to configure. * \param geometry The new window geometry. * \param border The new border size. */ @@ -108,6 +108,7 @@ window_configure(xcb_window_t win, area_t geometry, int border) /** Grab or ungrab buttons on a window. * \param win The window. * \param phys_screen Physical screen number. + * \param buttons The buttons to grab. */ void window_grabbuttons(xcb_window_t win, int phys_screen, button_t *buttons)