diff options
| -rw-r--r-- | client.c | 6 | ||||
| -rw-r--r-- | group.c | 4 | ||||
| -rw-r--r-- | menu.c | 16 | ||||
| -rw-r--r-- | search.c | 6 | ||||
| -rw-r--r-- | xevents.c | 4 |
5 files changed, 18 insertions, 18 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: client.c,v 1.121 2013/04/03 20:22:55 okan Exp $ + * $OpenBSD: client.c,v 1.122 2013/04/05 17:07:25 okan Exp $ */ #include <sys/param.h> @@ -574,7 +574,7 @@ client_cycle(struct screen_ctx *sc, int flags) return; if (oldcc == NULL) - oldcc = (flags & CWM_RCYCLE ? + oldcc = (flags & CWM_RCYCLE ? TAILQ_LAST(&sc->mruq, cycle_entry_q) : TAILQ_FIRST(&sc->mruq)); @@ -606,7 +606,7 @@ client_cycle(struct screen_ctx *sc, int flags) } void -client_cycle_leave(struct screen_ctx *sc, struct client_ctx *cc) +client_cycle_leave(struct screen_ctx *sc, struct client_ctx *cc) { sc->cycling = 0; @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: group.c,v 1.70 2013/01/13 13:55:12 okan Exp $ + * $OpenBSD: group.c,v 1.71 2013/04/05 17:07:25 okan Exp $ */ #include <sys/param.h> @@ -142,7 +142,7 @@ group_init(struct screen_ctx *sc) TAILQ_INIT(&sc->groupq); sc->group_hideall = 0; - /* + /* * See if any group names have already been set and update the * property with ours if they'll have changed. */ @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: menu.c,v 1.51 2013/01/07 21:53:23 okan Exp $ + * $OpenBSD: menu.c,v 1.52 2013/04/05 17:07:25 okan Exp $ */ #include <sys/param.h> @@ -59,8 +59,8 @@ struct menu_ctx { int flags; int x; int y; - void (*match)(struct menu_q *, struct menu_q *, char *); - void (*print)(struct menu *, int); + void (*match)(struct menu_q *, struct menu_q *, char *); + void (*print)(struct menu *, int); }; static struct menu *menu_handle_key(XEvent *, struct menu_ctx *, struct menu_q *, struct menu_q *); @@ -75,7 +75,7 @@ static void menu_draw_entry(struct screen_ctx *, struct menu_ctx *, static int menu_calc_entry(struct screen_ctx *, struct menu_ctx *, int, int); static int menu_keycode(XKeyEvent *, enum ctltype *, - char *); + char *); void menu_init(struct screen_ctx *sc) @@ -88,7 +88,7 @@ menu_init(struct screen_ctx *sc) struct menu * menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt, - char *initial, int flags, + char *initial, int flags, void (*match)(struct menu_q *, struct menu_q *, char *), void (*print)(struct menu *, int)) { @@ -217,7 +217,7 @@ menu_complete_path(struct menu_ctx *mc) menuq_clear(&menuq); - if (path[0] != '\0') + if (path[0] != '\0') snprintf(mr->text, sizeof(mr->text), "%s \"%s\"", mc->searchstr, path); else if (!mr->abort) @@ -286,7 +286,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq, break; case CTL_TAB: if ((mi = TAILQ_FIRST(resultq)) != NULL) { - /* + /* * - We are in exec_path menu mode * - It is equal to the input * We got a command, launch the file menu @@ -296,7 +296,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq, strlen(mi->text))) == 0) return (menu_complete_path(mc)); - /* + /* * Put common prefix of the results into searchstr */ (void)strlcpy(mc->searchstr, @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: search.c,v 1.28 2013/04/03 19:28:00 okan Exp $ + * $OpenBSD: search.c,v 1.29 2013/04/05 17:07:25 okan Exp $ */ #include <sys/param.h> @@ -189,13 +189,13 @@ search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search, in globfree(&g); } -void +void search_match_path_exec(struct menu_q *menuq, struct menu_q *resultq, char *search) { return (search_match_path(menuq, resultq, search, PATH_EXEC)); } -void +void search_match_path_any(struct menu_q *menuq, struct menu_q *resultq, char *search) { return (search_match_path(menuq, resultq, search, 0)); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xevents.c,v 1.70 2012/12/18 17:37:39 okan Exp $ + * $OpenBSD: xevents.c,v 1.71 2013/04/05 17:07:25 okan Exp $ */ /* @@ -203,7 +203,7 @@ xev_handle_propertynotify(XEvent *ee) break; } } else { - TAILQ_FOREACH(sc, &Screenq, entry) + TAILQ_FOREACH(sc, &Screenq, entry) if (sc->rootwin == e->window) goto test; return; |