summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2001-08-01 09:22:40 +0000
committerCarsten Haitzler <raster@rasterman.com>2001-08-01 09:22:40 +0000
commitbd45e5475da191bbe97a0c1310239c176c8926c5 (patch)
tree1e6121f3e7b51ecbd7518dec8711eb68182f9c03
parentff60ed35c10b3dac3a58cd2bf485d4ac646e63e1 (diff)
add a different view bg... and oops - adopted desktop window.. dont do that :)
SVN revision: 5025
-rw-r--r--data/backgrounds/default.bg.dbbin69632 -> 946176 bytes
-rw-r--r--data/backgrounds/view.bg.dbbin0 -> 217088 bytes
-rw-r--r--src/desktops.c2
-rw-r--r--src/view.c42
4 files changed, 30 insertions, 14 deletions
diff --git a/data/backgrounds/default.bg.db b/data/backgrounds/default.bg.db
index 7261cf4ac..3bf096f17 100644
--- a/data/backgrounds/default.bg.db
+++ b/data/backgrounds/default.bg.db
Binary files differ
diff --git a/data/backgrounds/view.bg.db b/data/backgrounds/view.bg.db
new file mode 100644
index 000000000..1eb059de4
--- /dev/null
+++ b/data/backgrounds/view.bg.db
Binary files differ
diff --git a/src/desktops.c b/src/desktops.c
index f4d330e33..e4594e1fb 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -178,7 +178,6 @@ e_desktops_init_file_display(E_Desktop *desk)
178 178
179 sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds")); 179 sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds"));
180 desk->view->bg = e_background_load(buf); 180 desk->view->bg = e_background_load(buf);
181 printf("**** load %s = %p\n", buf, desk->view->bg);
182 } 181 }
183 182
184 /* fixme: later */ 183 /* fixme: later */
@@ -207,6 +206,7 @@ e_desktops_new(void)
207 206
208 desk->win.main = e_window_override_new(e_base_win, 0, 0, screen_w, screen_h); 207 desk->win.main = e_window_override_new(e_base_win, 0, 0, screen_w, screen_h);
209 desk->win.container = e_window_override_new(desk->win.main, 0, 0, screen_w, screen_h); 208 desk->win.container = e_window_override_new(desk->win.main, 0, 0, screen_w, screen_h);
209 e_window_lower(desk->win.container);
210 210
211 e_window_show(desk->win.container); 211 e_window_show(desk->win.container);
212 212
diff --git a/src/view.c b/src/view.c
index de7cb74ba..29d778b07 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2,6 +2,7 @@
2 2
3#include "view.h" 3#include "view.h"
4#include "background.h" 4#include "background.h"
5#include "desktops.h"
5#include "config.h" 6#include "config.h"
6#include "border.h" 7#include "border.h"
7#include "menu.h" 8#include "menu.h"
@@ -552,7 +553,7 @@ e_view_icon_exec(E_Icon *ic)
552 { 553 {
553 char buf[4096]; 554 char buf[4096];
554 555
555 sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds")); 556 sprintf(buf, "%s/view.bg.db", e_config_get("backgrounds"));
556 v->bg = e_background_load(buf); 557 v->bg = e_background_load(buf);
557 } 558 }
558 sprintf(buf, "%s/%s", ic->view->dir, ic->file); 559 sprintf(buf, "%s/%s", ic->view->dir, ic->file);
@@ -2308,8 +2309,10 @@ e_view_handle_fs(EfsdEvent *ev)
2308 2309
2309 ok = 0; 2310 ok = 0;
2310 v = l->data; 2311 v = l->data;
2312 if (v->is_desktop) continue;
2311 if (v->geom_get.x == cmd) 2313 if (v->geom_get.x == cmd)
2312 { 2314 {
2315 printf("Got X\n");
2313 v->geom_get.x = 0; 2316 v->geom_get.x = 0;
2314 if (efsd_metadata_get_type(ev) == EFSD_INT) 2317 if (efsd_metadata_get_type(ev) == EFSD_INT)
2315 { 2318 {
@@ -2317,18 +2320,22 @@ e_view_handle_fs(EfsdEvent *ev)
2317 { 2320 {
2318 if (efsd_metadata_get_int(ev, 2321 if (efsd_metadata_get_int(ev,
2319 &(v->location.x))) 2322 &(v->location.x)))
2320 e_window_move(v->win.base, 2323 {
2321 v->location.x, 2324 printf("mov x\n");
2322 v->location.y); 2325 e_window_move(v->win.base,
2323 e_window_set_xy_hints(v->win.base, 2326 v->location.x,
2324 v->location.x, 2327 v->location.y);
2325 v->location.y); 2328 e_window_set_xy_hints(v->win.base,
2329 v->location.x,
2330 v->location.y);
2331 }
2326 } 2332 }
2327 } 2333 }
2328 ok = 1; 2334 ok = 1;
2329 } 2335 }
2330 else if (v->geom_get.y == cmd) 2336 else if (v->geom_get.y == cmd)
2331 { 2337 {
2338 printf("Got Y\n");
2332 v->geom_get.y = 0; 2339 v->geom_get.y = 0;
2333 if (efsd_metadata_get_type(ev) == EFSD_INT) 2340 if (efsd_metadata_get_type(ev) == EFSD_INT)
2334 { 2341 {
@@ -2336,18 +2343,22 @@ e_view_handle_fs(EfsdEvent *ev)
2336 { 2343 {
2337 if (efsd_metadata_get_int(ev, 2344 if (efsd_metadata_get_int(ev,
2338 &(v->location.y))) 2345 &(v->location.y)))
2339 e_window_move(v->win.base, 2346 {
2340 v->location.x, 2347 printf("mov y\n");
2341 v->location.y); 2348 e_window_move(v->win.base,
2342 e_window_set_xy_hints(v->win.base, 2349 v->location.x,
2343 v->location.x, 2350 v->location.y);
2344 v->location.y); 2351 e_window_set_xy_hints(v->win.base,
2352 v->location.x,
2353 v->location.y);
2354 }
2345 } 2355 }
2346 } 2356 }
2347 ok = 1; 2357 ok = 1;
2348 } 2358 }
2349 else if (v->geom_get.w == cmd) 2359 else if (v->geom_get.w == cmd)
2350 { 2360 {
2361 printf("Got W\n");
2351 v->geom_get.w = 0; 2362 v->geom_get.w = 0;
2352 if (efsd_metadata_get_type(ev) == EFSD_INT) 2363 if (efsd_metadata_get_type(ev) == EFSD_INT)
2353 { 2364 {
@@ -2364,6 +2375,7 @@ e_view_handle_fs(EfsdEvent *ev)
2364 } 2375 }
2365 else if (v->geom_get.h == cmd) 2376 else if (v->geom_get.h == cmd)
2366 { 2377 {
2378 printf("Got H\n");
2367 v->geom_get.h = 0; 2379 v->geom_get.h = 0;
2368 if (efsd_metadata_get_type(ev) == EFSD_INT) 2380 if (efsd_metadata_get_type(ev) == EFSD_INT)
2369 { 2381 {
@@ -2389,6 +2401,10 @@ e_view_handle_fs(EfsdEvent *ev)
2389 E_Border *b; 2401 E_Border *b;
2390 2402
2391 v->geom_get.busy = 0; 2403 v->geom_get.busy = 0;
2404 printf("ok.. adopt!\n");
2405 printf("at %i %i, %ix%i\n",
2406 v->location.x, v->location.y,
2407 v->size.w, v->size.h);
2392 if (v->options.back_pixmap) e_view_update(v); 2408 if (v->options.back_pixmap) e_view_update(v);
2393 b = e_border_adopt(v->win.base, 1); 2409 b = e_border_adopt(v->win.base, 1);
2394 } 2410 }