nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some small style changes to make urs’ code consistent

This commit is contained in:
Michael Stapelberg 2009-03-30 09:25:30 +02:00
parent efbe2dfeaa
commit 79e5d5f29d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/commands.c
View File

@ -589,31 +589,34 @@ void show_workspace(xcb_connection_t *conn, int workspace) {
* Jump directly to the specified workspace, row and col. * Jump directly to the specified workspace, row and col.
* Great for reaching windows that you always keep in the * Great for reaching windows that you always keep in the
* same spot (hello irssi, I'm looking at you) * same spot (hello irssi, I'm looking at you)
*
*/ */
static void jump_to_container(xcb_connection_t *conn, const char* arg_str) { static void jump_to_container(xcb_connection_t *conn, const char* arg_str) {
int ws,row,col; int ws, row, col;
int result; int result;
result = sscanf(arg_str, "%i %i %i", &ws, &row, &col); result = sscanf(arg_str, "%d %d %d", &ws, &row, &col);
LOG("Jump called with parameters '%s', which parses as %i numbers\n", arg_str, result); LOG("Jump called with %d parameters (\"%s\")\n", result, arg_str);
/* No match? (This is technically a syntax error, but who cares.) */ /* No match? Either no arguments were specified, or no numbers */
if(result < 1) if (result < 1) {
return; LOG("At least one valid argument required\n");
return;
}
/* Move to the target workspace */ /* Move to the target workspace */
show_workspace(conn, ws); show_workspace(conn, ws);
if(result < 3) if (result < 3)
return; return;
/* Move to row/col */ /* Move to row/col */
if(row >= c_ws->rows) if (row >= c_ws->rows)
row = c_ws->rows - 1; row = c_ws->rows - 1;
if(col >= c_ws->cols) if (col >= c_ws->cols)
col = c_ws->cols - 1; col = c_ws->cols - 1;
LOG("Jumping to row %i, col %i\n", row, col); LOG("Jumping to row %d, col %d\n", row, col);
if (c_ws->table[col][row]->currently_focused != NULL) if (c_ws->table[col][row]->currently_focused != NULL)
set_focus(conn, c_ws->table[col][row]->currently_focused); set_focus(conn, c_ws->table[col][row]->currently_focused);
} }
@ -661,7 +664,7 @@ void parse_command(xcb_connection_t *conn, const char *command) {
/* Is it a jump to a specified workspae,row,col? */ /* Is it a jump to a specified workspae,row,col? */
if (STARTS_WITH(command, "jump ")) { if (STARTS_WITH(command, "jump ")) {
jump_to_container(conn, command+strlen("jump ")); jump_to_container(conn, command + strlen("jump "));
return; return;
} }