summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2004-11-29 07:40:06 +0000
committerCarsten Haitzler <raster@rasterman.com>2004-11-29 07:40:06 +0000
commit080b56ed3d3b41d9f4ecfc87a05a6c3bb59d57e4 (patch)
tree64e83b8f351fe94a7cebb80ee4d83409c22ae631
parent3099278cfff410e0555189fa07d582f37b4baf85 (diff)
do them hints proper-like
SVN revision: 12306
-rw-r--r--src/bin/e_border.c54
1 files changed, 30 insertions, 24 deletions
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index c5ad7e44f..98916e0e1 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -156,6 +156,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map)
156 bd->client.icccm.step_h = 1; 156 bd->client.icccm.step_h = 1;
157 bd->client.icccm.min_aspect = 0.0; 157 bd->client.icccm.min_aspect = 0.0;
158 bd->client.icccm.max_aspect = 0.0; 158 bd->client.icccm.max_aspect = 0.0;
159 bd->client.icccm.accepts_focus = 1;
159 160
160 bd->client.icccm.fetch.title = 1; 161 bd->client.icccm.fetch.title = 1;
161 bd->client.icccm.fetch.name_class = 1; 162 bd->client.icccm.fetch.name_class = 1;
@@ -1120,35 +1121,41 @@ _e_border_eval(E_Border *bd)
1120 int is_urgent = 0; 1121 int is_urgent = 0;
1121 1122
1122 bd->client.icccm.initial_state = ECORE_X_WINDOW_STATE_HINT_NORMAL; 1123 bd->client.icccm.initial_state = ECORE_X_WINDOW_STATE_HINT_NORMAL;
1123 ecore_x_icccm_hints_get(bd->client.win, 1124 if (ecore_x_icccm_hints_get(bd->client.win,
1124 &accepts_focus, 1125 &accepts_focus,
1125 &bd->client.icccm.initial_state, 1126 &bd->client.icccm.initial_state,
1126 &bd->client.icccm.icon_pixmap, 1127 &bd->client.icccm.icon_pixmap,
1127 &bd->client.icccm.icon_mask, 1128 &bd->client.icccm.icon_mask,
1128 &bd->client.icccm.icon_window, 1129 &bd->client.icccm.icon_window,
1129 &bd->client.icccm.window_group, 1130 &bd->client.icccm.window_group,
1130 &is_urgent); 1131 &is_urgent))
1131 bd->client.icccm.accepts_focus = accepts_focus; 1132 {
1132 bd->client.icccm.urgent = is_urgent; 1133 bd->client.icccm.accepts_focus = accepts_focus;
1134 bd->client.icccm.urgent = is_urgent;
1135 }
1133 bd->client.icccm.fetch.hints = 0; 1136 bd->client.icccm.fetch.hints = 0;
1134 } 1137 }
1135 if (bd->client.icccm.fetch.size_pos_hints) 1138 if (bd->client.icccm.fetch.size_pos_hints)
1136 { 1139 {
1137 int request_pos = 0; 1140 int request_pos = 0;
1138 1141
1139 if (!ecore_x_icccm_size_pos_hints_get(bd->client.win, 1142 if (ecore_x_icccm_size_pos_hints_get(bd->client.win,
1140 &request_pos, 1143 &request_pos,
1141 &bd->client.icccm.gravity, 1144 &bd->client.icccm.gravity,
1142 &bd->client.icccm.min_w, 1145 &bd->client.icccm.min_w,
1143 &bd->client.icccm.min_h, 1146 &bd->client.icccm.min_h,
1144 &bd->client.icccm.max_w, 1147 &bd->client.icccm.max_w,
1145 &bd->client.icccm.max_h, 1148 &bd->client.icccm.max_h,
1146 &bd->client.icccm.base_w, 1149 &bd->client.icccm.base_w,
1147 &bd->client.icccm.base_h, 1150 &bd->client.icccm.base_h,
1148 &bd->client.icccm.step_w, 1151 &bd->client.icccm.step_w,
1149 &bd->client.icccm.step_h, 1152 &bd->client.icccm.step_h,
1150 &bd->client.icccm.min_aspect, 1153 &bd->client.icccm.min_aspect,
1151 &bd->client.icccm.max_aspect)) 1154 &bd->client.icccm.max_aspect))
1155 {
1156 bd->client.icccm.request_pos = request_pos;
1157 }
1158 else
1152 { 1159 {
1153 printf("NO SIZE HINTS!\n"); 1160 printf("NO SIZE HINTS!\n");
1154 } 1161 }
@@ -1158,7 +1165,6 @@ _e_border_eval(E_Border *bd)
1158 if (bd->client.icccm.max_h > 32767) bd->client.icccm.max_h = 32767; 1165 if (bd->client.icccm.max_h > 32767) bd->client.icccm.max_h = 32767;
1159 if (bd->client.icccm.base_w > 32767) bd->client.icccm.base_w = 32767; 1166 if (bd->client.icccm.base_w > 32767) bd->client.icccm.base_w = 32767;
1160 if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767; 1167 if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767;
1161 bd->client.icccm.request_pos = request_pos;
1162 bd->client.icccm.fetch.size_pos_hints = 0; 1168 bd->client.icccm.fetch.size_pos_hints = 0;
1163 } 1169 }
1164 if (bd->client.icccm.fetch.protocol) 1170 if (bd->client.icccm.fetch.protocol)