More work on the Mountbox. Changing backgrounds and default icons should
work on runtime now, modifying and adding mountpoint types too. Deleting still needs to be done. Oh, and untested, btw. Damn. I'm getting sick. SVN revision: 1696
This commit is contained in:
Christian Kreibich
parent
d0c758d6c7
commit
f99cb30866
11
ChangeLog
11
ChangeLog
|
|
@ -1714,3 +1714,14 @@ void Epplet_free_rgb_buf(RGB_buf buf);
|
|||
|
||||
I think the user shouldn't have to think about the internals of an RGB_buf
|
||||
in order to free it.
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Mon Dec 20 18:32:58 EST 1999
|
||||
(Christian)
|
||||
|
||||
More work on the Mountbox. Changing backgrounds and default icons should
|
||||
work on runtime now, modifying and adding mountpoint types too. Deleting
|
||||
still needs to be done. Oh, and untested, btw.
|
||||
|
||||
Damn. I'm getting sick.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* E-Mixer.c
|
||||
/* E-Mountbox.c
|
||||
*
|
||||
* Copyright (C) 1999 Christian Kreibich
|
||||
*
|
||||
|
|
@ -28,6 +28,23 @@ error_exit(void)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
UpdateGraphics(void)
|
||||
{
|
||||
Epplet_save_config();
|
||||
|
||||
/* ok, this is cheap. */
|
||||
FreeMounts();
|
||||
FreeMountPointTypes();
|
||||
FreeImages();
|
||||
|
||||
SetupDefaults();
|
||||
SetupMounts();
|
||||
SetupGraphx();
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
CallbackShowMore(void *data)
|
||||
{
|
||||
|
|
@ -102,6 +119,12 @@ CallbackHelp(void *data)
|
|||
static void
|
||||
Callback_ConfigOK(void *data)
|
||||
{
|
||||
Callback_DefaultChange(NULL);
|
||||
Callback_BGChange(NULL);
|
||||
Callback_TypeChange(NULL);
|
||||
SyncConfigs();
|
||||
UpdateGraphics();
|
||||
|
||||
Epplet_window_destroy (config_win);
|
||||
config_win = 0;
|
||||
return;
|
||||
|
|
@ -112,6 +135,12 @@ Callback_ConfigOK(void *data)
|
|||
static void
|
||||
Callback_ConfigApply(void *data)
|
||||
{
|
||||
Callback_DefaultChange(NULL);
|
||||
Callback_BGChange(NULL);
|
||||
Callback_TypeChange(NULL);
|
||||
SyncConfigs();
|
||||
UpdateGraphics();
|
||||
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
|
@ -120,6 +149,7 @@ Callback_ConfigApply(void *data)
|
|||
static void
|
||||
Callback_ConfigCancel(void *data)
|
||||
{
|
||||
Epplet_load_config();
|
||||
Epplet_window_destroy (config_win);
|
||||
config_win = 0;
|
||||
return;
|
||||
|
|
@ -130,6 +160,7 @@ Callback_ConfigCancel(void *data)
|
|||
static void
|
||||
Callback_DefaultChange(void *data)
|
||||
{
|
||||
Epplet_modify_config("DEFAULT", Epplet_textbox_contents(tbox_default));
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
|
@ -138,14 +169,17 @@ Callback_DefaultChange(void *data)
|
|||
static void
|
||||
Callback_BGChange(void *data)
|
||||
{
|
||||
Epplet_modify_config("BG_IMAGE", Epplet_textbox_contents(tbox_bg));
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
Callback_KeyChange(void *data)
|
||||
Callback_TypeChange(void *data)
|
||||
{
|
||||
ModifyMountPointType(current_type, Epplet_textbox_contents(tbox_key),
|
||||
Epplet_textbox_contents(tbox_file));
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
|
@ -156,6 +190,8 @@ Callback_ConfigLeft(void *data)
|
|||
{
|
||||
if (current_type->prev)
|
||||
{
|
||||
ModifyMountPointType(current_type, Epplet_textbox_contents(tbox_key),
|
||||
Epplet_textbox_contents(tbox_file));
|
||||
current_type = current_type->prev;
|
||||
Epplet_change_textbox(tbox_key, current_type->key);
|
||||
Epplet_change_textbox(tbox_file, current_type->imagefile);
|
||||
|
|
@ -170,6 +206,8 @@ Callback_ConfigRight(void *data)
|
|||
{
|
||||
if (current_type->next)
|
||||
{
|
||||
ModifyMountPointType(current_type, Epplet_textbox_contents(tbox_key),
|
||||
Epplet_textbox_contents(tbox_file));
|
||||
current_type = current_type->next;
|
||||
Epplet_change_textbox(tbox_key, current_type->key);
|
||||
Epplet_change_textbox(tbox_file, current_type->imagefile);
|
||||
|
|
@ -180,7 +218,20 @@ Callback_ConfigRight(void *data)
|
|||
|
||||
|
||||
static void
|
||||
Callback_FileChange(void *data)
|
||||
Callback_ConfigAdd(void *data)
|
||||
{
|
||||
AddMountPointType(NULL, NULL);
|
||||
current_type = types;
|
||||
Epplet_reset_textbox(tbox_key);
|
||||
Epplet_reset_textbox(tbox_file);
|
||||
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
Callback_ConfigDel(void *data)
|
||||
{
|
||||
return;
|
||||
data = NULL;
|
||||
|
|
@ -224,15 +275,19 @@ CallbackConfigure(void *data)
|
|||
2));
|
||||
Epplet_gadget_show ((tbox_key = Epplet_create_textbox (NULL, current_type->key,
|
||||
10, 113, 60, 20,
|
||||
2, Callback_KeyChange, NULL)));
|
||||
2, Callback_TypeChange, NULL)));
|
||||
Epplet_gadget_show ((tbox_file = Epplet_create_textbox (NULL, current_type->imagefile,
|
||||
70, 113, 340, 20,
|
||||
2, Callback_FileChange, NULL)));
|
||||
2, Callback_TypeChange, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button(NULL, NULL,
|
||||
170, 140, 0, 0, "ARROW_LEFT", 0, NULL,
|
||||
Callback_ConfigLeft, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button("Add", NULL, 187, 140, 24, 12, NULL, 0, NULL, NULL, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button("Delete", NULL, 216, 140, 36, 12, NULL, 0, NULL, NULL, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button("Add", NULL,
|
||||
187, 140, 24, 12, NULL, 0, NULL,
|
||||
Callback_ConfigAdd, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button("Delete", NULL,
|
||||
216, 140, 36, 12, NULL, 0, NULL,
|
||||
Callback_ConfigDel, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button(NULL, NULL,
|
||||
257, 140, 0, 0, "ARROW_RIGHT", 0, NULL,
|
||||
Callback_ConfigRight, NULL)));
|
||||
|
|
@ -495,7 +550,7 @@ AddMountPoint(char *device, char *path)
|
|||
|
||||
|
||||
void
|
||||
AddMountPointType(int index, char *key, char *image)
|
||||
AddMountPointType(char *key, char *image)
|
||||
{
|
||||
MountPointType *newtype = NULL;
|
||||
ImlibImage *tmp_image = NULL;
|
||||
|
|
@ -526,9 +581,10 @@ AddMountPointType(int index, char *key, char *image)
|
|||
{
|
||||
if ((types->key == NULL) && (types->image == NULL))
|
||||
{
|
||||
types->config_index = index;
|
||||
types->key = strdup(key);
|
||||
types->imagefile = strdup(image);
|
||||
if (key)
|
||||
types->key = strdup(key);
|
||||
if (image)
|
||||
types->imagefile = strdup(image);
|
||||
tmp_image = Imlib_load_image(id, image);
|
||||
if (tmp_image)
|
||||
{
|
||||
|
|
@ -540,16 +596,47 @@ AddMountPointType(int index, char *key, char *image)
|
|||
}
|
||||
|
||||
|
||||
void
|
||||
ModifyMountPointType(MountPointType *mpt, char *key, char *imagefile)
|
||||
{
|
||||
ImlibImage *tmp_image = NULL;
|
||||
|
||||
if (mpt)
|
||||
{
|
||||
if (key)
|
||||
{
|
||||
if (mpt->key)
|
||||
free(mpt->key);
|
||||
mpt->key = strdup(key);
|
||||
}
|
||||
if (imagefile)
|
||||
{
|
||||
if (mpt->imagefile)
|
||||
free(mpt->imagefile);
|
||||
mpt->imagefile = strdup(imagefile);
|
||||
tmp_image = Imlib_load_image(id, mpt->imagefile);
|
||||
if (tmp_image)
|
||||
{
|
||||
Imlib_destroy_image(id, mpt->image);
|
||||
mpt->image = Imlib_clone_scaled_image(id, tmp_image, 44, 32);
|
||||
Imlib_destroy_image(id, tmp_image);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
FreeImages(void)
|
||||
{
|
||||
if (bg_image)
|
||||
{
|
||||
Imlib_destroy_image(id, bg_image);
|
||||
bg_image = NULL;
|
||||
}
|
||||
if (default_image)
|
||||
{
|
||||
Imlib_destroy_image(id, default_image);
|
||||
default_image = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -575,6 +662,8 @@ FreeMounts(void)
|
|||
current = current->next;
|
||||
free(tmp);
|
||||
}
|
||||
tiles = NULL;
|
||||
num_tiles = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -603,6 +692,8 @@ FreeMountPointTypes(void)
|
|||
current = current->next;
|
||||
free(tmp);
|
||||
}
|
||||
types = NULL;
|
||||
num_types = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1014,7 +1105,7 @@ SetupDefaults(void)
|
|||
|
||||
if (key && image)
|
||||
{
|
||||
AddMountPointType(i, key, image);
|
||||
AddMountPointType(key, image);
|
||||
}
|
||||
free(key);
|
||||
free(image);
|
||||
|
|
@ -1028,6 +1119,7 @@ SetupDefaults(void)
|
|||
void
|
||||
SetupGraphx(void)
|
||||
{
|
||||
static int first_time = 1;
|
||||
int i, j, k, linear, linear_w;
|
||||
ImlibImage *tmp = NULL;
|
||||
Tile *tile;
|
||||
|
|
@ -1035,7 +1127,6 @@ SetupGraphx(void)
|
|||
|
||||
s = Epplet_query_config("BG_IMAGE");
|
||||
|
||||
|
||||
tmp = Imlib_load_image(id, s);
|
||||
if (!tmp)
|
||||
tmp = Imlib_load_image(id, __BG_IMAGE);
|
||||
|
|
@ -1056,8 +1147,13 @@ SetupGraphx(void)
|
|||
Imlib_destroy_image(id, tmp);
|
||||
|
||||
/* setup widescreen according to current mounts */
|
||||
window_buf = Epplet_make_rgb_buf(44, 32);
|
||||
if (!window_buf)
|
||||
window_buf = Epplet_make_rgb_buf(44, 32);
|
||||
if (widescreen_buf)
|
||||
Epplet_free_rgb_buf(widescreen_buf);
|
||||
widescreen_buf = Epplet_make_rgb_buf((44 * num_tiles), 32);
|
||||
if (widescreen_canvas_buf)
|
||||
Epplet_free_rgb_buf(widescreen_canvas_buf);
|
||||
widescreen_canvas_buf = Epplet_make_rgb_buf((44 * num_tiles), 32);
|
||||
|
||||
memcpy(widescreen_buf->im->rgb_data, bg_image->rgb_data,
|
||||
|
|
@ -1096,34 +1192,70 @@ SetupGraphx(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (first_time)
|
||||
{
|
||||
first_time = 0;
|
||||
Epplet_gadget_show((Epplet_create_button(NULL, NULL,
|
||||
2, 34, 0, 0, "ARROW_LEFT", 0, NULL,
|
||||
CallbackSlideLeft, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button(NULL, NULL,
|
||||
33, 34, 0, 0, "ARROW_RIGHT", 0, NULL,
|
||||
CallbackSlideRight, NULL)));
|
||||
Epplet_gadget_show((action_area = Epplet_create_drawingarea(2, 2, 44, 32)));
|
||||
|
||||
Epplet_gadget_show((Epplet_create_button("...", NULL, 14, 34, 20, 12, NULL, 0, NULL, CallbackShowMore, NULL)));
|
||||
button_help = Epplet_create_button(NULL, NULL, 3, 3, 0, 0, "HELP", 0, NULL, CallbackHelp, NULL);
|
||||
button_close = Epplet_create_button(NULL, NULL, 33, 3, 0, 0, "CLOSE", 0, NULL, CallbackExit, NULL);
|
||||
button_config = Epplet_create_button(NULL, NULL, 18, 3, 0, 0, "CONFIGURE", 0, NULL, CallbackConfigure, NULL);
|
||||
|
||||
/*
|
||||
Epplet_register_focus_in_handler(CallbackEnter, NULL);
|
||||
Epplet_register_focus_out_handler(CallbackLeave, NULL);
|
||||
*/
|
||||
Epplet_register_expose_handler(CallbackExpose, NULL);
|
||||
Epplet_register_button_release_handler(CallbackButtonUp, NULL);
|
||||
Epplet_register_key_press_handler(CallbackKeyPress, NULL);
|
||||
|
||||
/* Setup the current view */
|
||||
Epplet_show();
|
||||
}
|
||||
|
||||
Epplet_gadget_show((Epplet_create_button(NULL, NULL,
|
||||
2, 34, 0, 0, "ARROW_LEFT", 0, NULL,
|
||||
CallbackSlideLeft, NULL)));
|
||||
Epplet_gadget_show((Epplet_create_button(NULL, NULL,
|
||||
33, 34, 0, 0, "ARROW_RIGHT", 0, NULL,
|
||||
CallbackSlideRight, NULL)));
|
||||
Epplet_gadget_show((action_area = Epplet_create_drawingarea(2, 2, 44, 32)));
|
||||
|
||||
Epplet_gadget_show((Epplet_create_button("...", NULL, 14, 34, 20, 12, NULL, 0, NULL, CallbackShowMore, NULL)));
|
||||
button_help = Epplet_create_button(NULL, NULL, 3, 3, 0, 0, "HELP", 0, NULL, CallbackHelp, NULL);
|
||||
button_close = Epplet_create_button(NULL, NULL, 33, 3, 0, 0, "CLOSE", 0, NULL, CallbackExit, NULL);
|
||||
button_config = Epplet_create_button(NULL, NULL, 18, 3, 0, 0, "CONFIGURE", 0, NULL, CallbackConfigure, NULL);
|
||||
|
||||
/*
|
||||
Epplet_register_focus_in_handler(CallbackEnter, NULL);
|
||||
Epplet_register_focus_out_handler(CallbackLeave, NULL);
|
||||
*/
|
||||
Epplet_register_expose_handler(CallbackExpose, NULL);
|
||||
Epplet_register_button_release_handler(CallbackButtonUp, NULL);
|
||||
Epplet_register_key_press_handler(CallbackKeyPress, NULL);
|
||||
|
||||
/* Setup the current view */
|
||||
Epplet_show();
|
||||
UpdateView(0, 0);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
SyncConfigs(void)
|
||||
{
|
||||
char **strings = NULL;
|
||||
char s[1024];
|
||||
int i;
|
||||
MountPointType *mpt = NULL;
|
||||
|
||||
strings = (char**)malloc(sizeof(char*) * num_types);
|
||||
if (strings)
|
||||
{
|
||||
for (mpt=types, i=0; mpt; mpt=mpt->next, i++)
|
||||
{
|
||||
Esnprintf(s, sizeof(s), "%s %s", mpt->key, mpt->imagefile);
|
||||
strings[i] = strdup(s);
|
||||
}
|
||||
/*
|
||||
for (i=0; i<num_types; i++)
|
||||
{
|
||||
printf("DEBUG: %s\n", strings[i]);
|
||||
}*/
|
||||
|
||||
Epplet_modify_multi_config("TYPEDEF", strings, num_types);
|
||||
|
||||
for (i=0; i<num_types; i++)
|
||||
if (strings[i])
|
||||
free(strings[i]);
|
||||
free(strings);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,3 +1,23 @@
|
|||
/* E-Mountbox.h
|
||||
*
|
||||
* Copyright (C) 1999 Christian Kreibich
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*/
|
||||
|
||||
#include "epplet.h"
|
||||
#include <math.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -38,7 +58,6 @@ typedef struct _mountpointtype MountPointType;
|
|||
|
||||
struct _mountpointtype
|
||||
{
|
||||
int config_index;
|
||||
char *key;
|
||||
char *imagefile;
|
||||
ImlibImage *image;
|
||||
|
|
@ -78,9 +97,9 @@ Epplet_gadget tbox_key, tbox_file, tbox_default, tbox_bg;
|
|||
Window config_win = 0;
|
||||
MountPointType *current_type = NULL;
|
||||
|
||||
RGB_buf window_buf;
|
||||
RGB_buf widescreen_buf;
|
||||
RGB_buf widescreen_canvas_buf;
|
||||
RGB_buf window_buf = NULL;
|
||||
RGB_buf widescreen_buf = NULL;
|
||||
RGB_buf widescreen_canvas_buf = NULL;
|
||||
char anim_mount = 0;
|
||||
int is_shown = 0;
|
||||
|
||||
|
|
@ -88,13 +107,16 @@ int is_shown = 0;
|
|||
int IsTransparent(ImlibImage * im, int x, int y);
|
||||
void UpdateView(int dir, int fast);
|
||||
void FreeImages(void);
|
||||
void UpdateGraphics(void);
|
||||
|
||||
/* mount handling */
|
||||
void SetupMounts(void);
|
||||
void FreeMounts(void);
|
||||
void AddMountPoint(char *device, char *path);
|
||||
void FreeMountPointTypes(void);
|
||||
void AddMountPointType(int index, char *key, char *image);
|
||||
void AddMountPointType(char *key, char *image);
|
||||
void ModifyMountPointType(MountPointType *mpt, char *key, char *imagefile);
|
||||
void DeleteMountPointType(MountPointType *mpt);
|
||||
void Mount(MountPoint * mp);
|
||||
void Umount(MountPoint * mp);
|
||||
|
||||
|
|
@ -104,6 +126,7 @@ int ParseProcMounts(void);
|
|||
int ParseEtcMtab(void);
|
||||
void VisitMountPoints(void);
|
||||
MountPoint *FindMountPointByClick(int x, int y);
|
||||
void SyncConfigs(void);
|
||||
|
||||
/* callbacks/ handlers */
|
||||
/*
|
||||
|
|
@ -123,10 +146,11 @@ static void Callback_ConfigApply(void *data);
|
|||
static void Callback_ConfigCancel(void *data);
|
||||
static void Callback_DefaultChange(void *data);
|
||||
static void Callback_BGChange(void *data);
|
||||
static void Callback_KeyChange(void *data);
|
||||
static void Callback_TypeChange(void *data);
|
||||
static void Callback_ConfigLeft(void *data);
|
||||
static void Callback_ConfigRight(void *data);
|
||||
static void Callback_FileChange(void *data);
|
||||
static void Callback_ConfigAdd(void *data);
|
||||
static void Callback_ConfigDel(void *data);
|
||||
|
||||
/* config stuff */
|
||||
void SetupDefaults(void);
|
||||
|
|
|
|||
Loading…
Reference in New Issue