nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some evil tabs

Browse source
This commit is contained in:
Mikael Magnusson 2011-01-11 18:12:01 +01:00
parent 782b2864b1
commit f6fb70a4b9
3 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
obt/link.h
View file

@ -26,15 +26,15 @@ G_BEGIN_DECLS
struct _ObtPaths; struct _ObtPaths;
typedef enum { typedef enum {
OBT_LINK_TYPE_APPLICATION = 1, OBT_LINK_TYPE_APPLICATION = 1,
OBT_LINK_TYPE_URL = 2, OBT_LINK_TYPE_URL = 2,
OBT_LINK_TYPE_DIRECTORY = 3 OBT_LINK_TYPE_DIRECTORY = 3
} ObtLinkType; } ObtLinkType;
typedef enum { typedef enum {
OBT_LINK_APP_STARTUP_NO_SUPPORT, OBT_LINK_APP_STARTUP_NO_SUPPORT,
OBT_LINK_APP_STARTUP_PROTOCOL_SUPPORT, OBT_LINK_APP_STARTUP_PROTOCOL_SUPPORT,
OBT_LINK_APP_STARTUP_LEGACY_SUPPORT OBT_LINK_APP_STARTUP_LEGACY_SUPPORT
} ObtLinkAppStartup; } ObtLinkAppStartup;
/*! These bit flags are environments for links. Some links are used or not /*! These bit flags are environments for links. Some links are used or not
@ -50,14 +50,14 @@ typedef enum {
} ObtLinkEnvFlags; } ObtLinkEnvFlags;
typedef enum { typedef enum {
/*! The app can be launched with a single local file */ /*! The app can be launched with a single local file */
OBT_LINK_APP_SINGLE_LOCAL = 1 << 0, OBT_LINK_APP_SINGLE_LOCAL = 1 << 0,
/*! The app can be launched with multiple local files */ /*! The app can be launched with multiple local files */
OBT_LINK_APP_MULTI_LOCAL = 1 << 1, OBT_LINK_APP_MULTI_LOCAL = 1 << 1,
/*! The app can be launched with a single URL */ /*! The app can be launched with a single URL */
OBT_LINK_APP_SINGLE_URL = 1 << 2, OBT_LINK_APP_SINGLE_URL = 1 << 2,
/*! The app can be launched with multiple URLs */ /*! The app can be launched with multiple URLs */
OBT_LINK_APP_MULTI_URL = 1 << 3 OBT_LINK_APP_MULTI_URL = 1 << 3
} ObtLinkAppOpen; } ObtLinkAppOpen;
typedef struct _ObtLink ObtLink; typedef struct _ObtLink ObtLink;
@ -77,8 +77,8 @@ gboolean obt_link_deleted (ObtLink *e);
ObtLinkType obt_link_type (ObtLink *e); ObtLinkType obt_link_type (ObtLink *e);
/*! Returns TRUE if the .desktop file should be displayed to users, given the /*! Returns TRUE if the .desktop file should be displayed to users, given the
current environment. If FALSE, the .desktop file should not be showed. current environment. If FALSE, the .desktop file should not be showed.
This also uses the TryExec option if it is present. This also uses the TryExec option if it is present.
@env A semicolon-deliminated list of environemnts. Can be one or more of: @env A semicolon-deliminated list of environemnts. Can be one or more of:
GNOME, KDE, ROX, XFCE. Other environments not listed here may also GNOME, KDE, ROX, XFCE. Other environments not listed here may also
be supported. This can be null also if not listing any environment. */ be supported. This can be null also if not listing any environment. */

26
openbox/moveresize.c
View file

@ -582,19 +582,19 @@ static void edge_warp_move_ptr(void)
a = screen_physical_area_all_monitors(); a = screen_physical_area_all_monitors();
switch (edge_warp_dir) { switch (edge_warp_dir) {
case OB_DIRECTION_NORTH: case OB_DIRECTION_NORTH:
y = a->height - 1; y = a->height - 1;
break; break;
case OB_DIRECTION_EAST: case OB_DIRECTION_EAST:
x = a->x; x = a->x;
break; break;
case OB_DIRECTION_SOUTH: case OB_DIRECTION_SOUTH:
y = a->y; y = a->y;
break; break;
case OB_DIRECTION_WEST: case OB_DIRECTION_WEST:
x = a->width - 1; x = a->width - 1;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }

54
openbox/place_overlap.c
View file

@ -43,33 +43,33 @@ void place_overlap_find_least_placement(const Rect* client_rects,
int overlap = G_MAXINT; int overlap = G_MAXINT;
int max_edges = 2 * (n_client_rects + 1); int max_edges = 2 * (n_client_rects + 1);
int x_edges[max_edges]; int x_edges[max_edges];
int y_edges[max_edges]; int y_edges[max_edges];
make_grid(client_rects, n_client_rects, bound, make_grid(client_rects, n_client_rects, bound,
x_edges, y_edges, max_edges); x_edges, y_edges, max_edges);
int i; int i;
for (i = 0; i < max_edges; ++i) { for (i = 0; i < max_edges; ++i) {
if (x_edges[i] == G_MAXINT) if (x_edges[i] == G_MAXINT)
break; break;
int j; int j;
for (j = 0; j < max_edges; ++j) { for (j = 0; j < max_edges; ++j) {
if (y_edges[j] == G_MAXINT) if (y_edges[j] == G_MAXINT)
break; break;
Point grid_point = {.x = x_edges[i], .y = y_edges[j]}; Point grid_point = {.x = x_edges[i], .y = y_edges[j]};
Point best_top_left; Point best_top_left;
int this_overlap = int this_overlap =
best_direction(&grid_point, client_rects, n_client_rects, best_direction(&grid_point, client_rects, n_client_rects,
bound, req_size, &best_top_left); bound, req_size, &best_top_left);
if (this_overlap < overlap) { if (this_overlap < overlap) {
overlap = this_overlap; overlap = this_overlap;
*result = best_top_left; *result = best_top_left;
} }
if (overlap == 0) if (overlap == 0)
break; break;
} }
if (overlap == 0) if (overlap == 0)
break; break;
} }
} }
static int compare_ints(const void* a, const void* b) static int compare_ints(const void* a, const void* b)