AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

use SWP_NOACTIVATE in gdk_window_set_keep_(above|below) to make DND work

Browse Source 
2004-01-04  Hans Breuer  <hans@breuer.org>

	* gdk/win32/gdkwindow-win32.c : use SWP_NOACTIVATE in
	gdk_window_set_keep_(above|below) to make DND work again.
	Thanks to Alif Wahid for noticing.

	* gdk/gdk.def : update externals

	* gtk/gtkfilesystemwin32.c : adapt to GtkFileSystemIFace changes

	* gtk/gtk-stock.[hc] gtk/gtkiconfactory.c
	  gtk/stock-icons/Makefile.am gtk/stock-icons/makefile.msc :
	  gtk/stock-icons/stock_harddisk_16.png
	  gtk/stock-icons/stock_harddisk_24.png
	Harddisk stock icons for file system implementations. Beside
	FLOPPY and CDROM there is now HARDDISK, probably some
	GTK_STOCK_NETWORK would be useful, but I could not find one.
This commit is contained in:
Hans Breuer 2004-01-04 15:45:56 +00:00 committed by Hans Breuer
parent 4c2c3d36ae
commit 5f98762951
15 changed files with 269 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2004-01-04 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkwindow-win32.c : use SWP_NOACTIVATE in
gdk_window_set_keep_(above|below) to make DND work again.
Thanks to Alif Wahid for noticing.
* gdk/gdk.def : update externals
* gtk/gtkfilesystemwin32.c : adapt to GtkFileSystemIFace changes
* gtk/gtk-stock.[hc] gtk/gtkiconfactory.c
gtk/stock-icons/Makefile.am gtk/stock-icons/makefile.msc :
gtk/stock-icons/stock_harddisk_16.png
gtk/stock-icons/stock_harddisk_24.png
Harddisk stock icons for file system implementations. Beside
FLOPPY and CDROM there is now HARDDISK, probably some
GTK_STOCK_NETWORK would be useful, but I could not find one.
Sat Jan 3 11:39:42 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link.

18
ChangeLog.pre-2-10
View File

@ -1,3 +1,21 @@
2004-01-04 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkwindow-win32.c : use SWP_NOACTIVATE in
gdk_window_set_keep_(above|below) to make DND work again.
Thanks to Alif Wahid for noticing.
* gdk/gdk.def : update externals
* gtk/gtkfilesystemwin32.c : adapt to GtkFileSystemIFace changes
* gtk/gtk-stock.[hc] gtk/gtkiconfactory.c
gtk/stock-icons/Makefile.am gtk/stock-icons/makefile.msc :
gtk/stock-icons/stock_harddisk_16.png
gtk/stock-icons/stock_harddisk_24.png
Harddisk stock icons for file system implementations. Beside
FLOPPY and CDROM there is now HARDDISK, probably some
GTK_STOCK_NETWORK would be useful, but I could not find one.
Sat Jan 3 11:39:42 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link.

18
ChangeLog.pre-2-4
View File

@ -1,3 +1,21 @@
2004-01-04 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkwindow-win32.c : use SWP_NOACTIVATE in
gdk_window_set_keep_(above|below) to make DND work again.
Thanks to Alif Wahid for noticing.
* gdk/gdk.def : update externals
* gtk/gtkfilesystemwin32.c : adapt to GtkFileSystemIFace changes
* gtk/gtk-stock.[hc] gtk/gtkiconfactory.c
gtk/stock-icons/Makefile.am gtk/stock-icons/makefile.msc :
gtk/stock-icons/stock_harddisk_16.png
gtk/stock-icons/stock_harddisk_24.png
Harddisk stock icons for file system implementations. Beside
FLOPPY and CDROM there is now HARDDISK, probably some
GTK_STOCK_NETWORK would be useful, but I could not find one.
Sat Jan 3 11:39:42 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link.

18
ChangeLog.pre-2-6
View File

@ -1,3 +1,21 @@
2004-01-04 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkwindow-win32.c : use SWP_NOACTIVATE in
gdk_window_set_keep_(above|below) to make DND work again.
Thanks to Alif Wahid for noticing.
* gdk/gdk.def : update externals
* gtk/gtkfilesystemwin32.c : adapt to GtkFileSystemIFace changes
* gtk/gtk-stock.[hc] gtk/gtkiconfactory.c
gtk/stock-icons/Makefile.am gtk/stock-icons/makefile.msc :
gtk/stock-icons/stock_harddisk_16.png
gtk/stock-icons/stock_harddisk_24.png
Harddisk stock icons for file system implementations. Beside
FLOPPY and CDROM there is now HARDDISK, probably some
GTK_STOCK_NETWORK would be useful, but I could not find one.
Sat Jan 3 11:39:42 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link.

18
ChangeLog.pre-2-8
View File

@ -1,3 +1,21 @@
2004-01-04 Hans Breuer <hans@breuer.org>
* gdk/win32/gdkwindow-win32.c : use SWP_NOACTIVATE in
gdk_window_set_keep_(above|below) to make DND work again.
Thanks to Alif Wahid for noticing.
* gdk/gdk.def : update externals
* gtk/gtkfilesystemwin32.c : adapt to GtkFileSystemIFace changes
* gtk/gtk-stock.[hc] gtk/gtkiconfactory.c
gtk/stock-icons/Makefile.am gtk/stock-icons/makefile.msc :
gtk/stock-icons/stock_harddisk_16.png
gtk/stock-icons/stock_harddisk_24.png
Harddisk stock icons for file system implementations. Beside
FLOPPY and CDROM there is now HARDDISK, probably some
GTK_STOCK_NETWORK would be useful, but I could not find one.
Sat Jan 3 11:39:42 2004 Manish Singh <yosh@gimp.org>
* gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link.

1
gdk/gdk.def
View File

@ -84,6 +84,7 @@ EXPORTS
gdk_display_pointer_is_grabbed
gdk_display_pointer_ungrab
gdk_display_put_event
gdk_display_set_double_click_distance
gdk_display_set_double_click_time
gdk_display_set_pointer_hooks
gdk_display_sync

4
gdk/win32/gdkwindow-win32.c
View File

@ -2951,7 +2951,7 @@ gdk_window_set_keep_above (GdkWindow *window, gboolean setting)
if (GDK_WINDOW_IS_MAPPED (window))
{
if (!SetWindowPos(GDK_WINDOW_HWND (window), setting ? HWND_TOPMOST : HWND_NOTOPMOST,
0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE))
0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE))
WIN32_API_FAILED ("SetWindowPos");
}
else
@ -2971,7 +2971,7 @@ gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
if (GDK_WINDOW_IS_MAPPED (window))
{
if (!SetWindowPos(GDK_WINDOW_HWND (window), setting ? HWND_BOTTOM : HWND_NOTOPMOST,
0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE))
0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE))
WIN32_API_FAILED ("SetWindowPos");
}
else

194
gtk/gtkfilesystemwin32.c
View File

@ -87,6 +87,8 @@ static void gtk_file_system_win32_class_init (GtkFileSystemWin32
static void gtk_file_system_win32_iface_init (GtkFileSystemIface *iface);
static void gtk_file_system_win32_init (GtkFileSystemWin32 *impl);
static void gtk_file_system_win32_finalize (GObject *object);
static GSList * gtk_file_system_win32_list_volumes (GtkFileSystem *file_system);
static GSList * gtk_file_system_win32_list_roots (GtkFileSystem *file_system);
static GtkFileInfo * gtk_file_system_win32_get_root_info (GtkFileSystem *file_system,
const GtkFilePath *path,
@ -99,6 +101,24 @@ static GtkFileFolder *gtk_file_system_win32_get_folder (GtkFileSystem
static gboolean gtk_file_system_win32_create_folder (GtkFileSystem *file_system,
const GtkFilePath *path,
GError **error);
static void gtk_file_system_win32_volume_free (GtkFileSystem *file_system,
GtkFileSystemVolume *volume);
static GtkFilePath *gtk_file_system_win32_volume_get_base_path (GtkFileSystem *file_system,
GtkFileSystemVolume *volume);
static gboolean gtk_file_system_win32_volume_get_is_mounted (GtkFileSystem *file_system,
GtkFileSystemVolume *volume);
static gboolean gtk_file_system_win32_volume_mount (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GError **error);
static gchar * gtk_file_system_win32_volume_get_display_name (GtkFileSystem *file_system,
GtkFileSystemVolume *volume);
static GdkPixbuf * gtk_file_system_win32_volume_render_icon (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GtkWidget *widget,
gint pixel_size,
GError **error);
static gboolean gtk_file_system_win32_get_parent (GtkFileSystem *file_system,
const GtkFilePath *path,
GtkFilePath **parent,
@ -145,13 +165,21 @@ static GtkFileInfo * gtk_file_folder_win32_get_info (GtkFileFolder
static gboolean gtk_file_folder_win32_list_children (GtkFileFolder *folder,
GSList **children,
GError **error);
static gchar * filename_from_path (const GtkFilePath *path);
static GtkFilePath * filename_to_path (const gchar *filename);
static gboolean filename_is_root (const char *filename);
static GtkFileInfo * filename_get_info (const gchar *filename,
GtkFileInfoType types,
GError **error);
/* some info kept together for volumes */
struct _GtkFileSystemVolume
{
gchar *drive;
gboolean is_mounted;
};
/*
* GtkFileSystemWin32
@ -222,10 +250,17 @@ gtk_file_system_win32_class_init (GtkFileSystemWin32Class *class)
static void
gtk_file_system_win32_iface_init (GtkFileSystemIface *iface)
{
iface->list_volumes = gtk_file_system_win32_list_volumes;
iface->list_roots = gtk_file_system_win32_list_roots;
iface->get_folder = gtk_file_system_win32_get_folder;
iface->get_root_info = gtk_file_system_win32_get_root_info;
iface->create_folder = gtk_file_system_win32_create_folder;
iface->volume_free = gtk_file_system_win32_volume_free;
iface->volume_get_base_path = gtk_file_system_win32_volume_get_base_path;
iface->volume_get_is_mounted = gtk_file_system_win32_volume_get_is_mounted;
iface->volume_mount = gtk_file_system_win32_volume_mount;
iface->volume_get_display_name = gtk_file_system_win32_volume_get_display_name;
iface->volume_render_icon = gtk_file_system_win32_volume_render_icon;
iface->get_parent = gtk_file_system_win32_get_parent;
iface->make_path = gtk_file_system_win32_make_path;
iface->parse = gtk_file_system_win32_parse;
@ -251,7 +286,7 @@ gtk_file_system_win32_finalize (GObject *object)
}
static GSList *
gtk_file_system_win32_list_roots (GtkFileSystem *file_system)
gtk_file_system_win32_list_volumes (GtkFileSystem *file_system)
{
gchar drives[26*4];
guint len;
@ -266,20 +301,43 @@ gtk_file_system_win32_list_roots (GtkFileSystem *file_system)
p = drives;
while ((len = strlen(p)) != 0)
{
/* skip floppy */
if (p[0] != 'a' && p[0] != 'b')
{
GtkFileSystemVolume *vol = g_new0 (GtkFileSystemVolume, 1);
if (p[0] == 'a' || p[0] == 'b')
vol->is_mounted = FALSE; /* skip floppy */
else
vol->is_mounted = TRUE;
/*FIXME: gtk_file_path_compare() is case sensitive, we are not*/
p[0] = toupper (p[0]);
/* needed without the backslash */
p[2] = '\0';
list = g_slist_append (list, gtk_file_path_new_dup (p));
}
vol->drive = g_strdup (p);
list = g_slist_append (list, vol);
p += len + 1;
}
return list;
}
/* to be removed */
static GSList *
gtk_file_system_win32_list_roots (GtkFileSystem *file_system)
{
GSList *volumes, *v;
GSList *list = NULL;
volumes = gtk_file_system_win32_list_volumes (file_system);
for (v = volumes; v; v = v->next)
{
GtkFileSystemVolume *vol = v->data;
if (vol->is_mounted)
list = g_slist_append (list, g_strndup (vol->drive, 2));
}
return list;
}
static GtkFileInfo *
gtk_file_system_win32_get_root_info (GtkFileSystem *file_system,
const GtkFilePath *path,
@ -314,30 +372,6 @@ gtk_file_system_win32_get_root_info (GtkFileSystem *file_system,
gtk_file_info_set_display_name (info, filename);
}
#if 0 /* it's dead in GtkFileSystemUnix.c, too */
if (GTK_FILE_INFO_ICON & types)
{
switch (dt)
{
case DRIVE_REMOVABLE :
/*gtk_file_info_set_icon_type (info, GTK_STOCK_FLOPPY);*/
break;
case DRIVE_CDROM :
/*gtk_file_info_set_icon_type (info, GTK_STOCK_CDROM);*/
break;
case DRIVE_REMOTE :
/*FIXME: need a network stock icon*/
case DRIVE_FIXED :
/*FIXME: need a hard disk stock icon*/
case DRIVE_RAMDISK :
/*FIXME: need a ram stock icon
gtk_file_info_set_icon_type (info, GTK_STOCK_OPEN);*/
break;
default :
g_assert_not_reached ();
}
}
#endif
g_free (filename);
return info;
}
@ -391,6 +425,100 @@ gtk_file_system_win32_create_folder (GtkFileSystem *file_system,
return result;
}
static void
gtk_file_system_win32_volume_free (GtkFileSystem *file_system,
GtkFileSystemVolume *volume)
{
g_free (volume->drive);
g_free (volume);
}
static GtkFilePath *
gtk_file_system_win32_volume_get_base_path (GtkFileSystem *file_system,
GtkFileSystemVolume *volume)
{
return (GtkFilePath *) g_strndup (volume->drive, 2);
}
static gboolean
gtk_file_system_win32_volume_get_is_mounted (GtkFileSystem *file_system,
GtkFileSystemVolume *volume)
{
return volume->is_mounted;
}
static gboolean
gtk_file_system_win32_volume_mount (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GError **error)
{
g_set_error (error,
GTK_FILE_SYSTEM_ERROR,
GTK_FILE_SYSTEM_ERROR_FAILED,
_("This file system does not support mounting"));
return FALSE;
}
static gchar *
gtk_file_system_win32_volume_get_display_name (GtkFileSystem *file_system,
GtkFileSystemVolume *volume)
{
gchar display_name[80];
if (GetVolumeInformation (volume->drive,
display_name, sizeof(display_name),
NULL, /* serial number */
NULL, /* max. component length */
NULL, /* fs flags */
NULL, 0)) /* fs type like FAT, NTFS */
{
gchar* real_display_name = g_strconcat (display_name, " (", volume->drive, ")", NULL);
return real_display_name;
}
else
return g_strdup (volume->drive);
}
static GdkPixbuf *
gtk_file_system_win32_volume_render_icon (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GtkWidget *widget,
gint pixel_size,
GError **error)
{
GtkIconSet *icon_set = NULL;
DWORD dt = GetDriveType (volume->drive);
switch (dt)
{
case DRIVE_REMOVABLE :
icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_FLOPPY);
break;
case DRIVE_CDROM :
icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_CDROM);
break;
case DRIVE_REMOTE :
/*FIXME: need a network stock icon*/
case DRIVE_FIXED :
icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_HARDDISK);
break;
case DRIVE_RAMDISK :
/*FIXME: need a ram stock icon
gtk_file_info_set_icon_type (info, GTK_STOCK_OPEN);*/
break;
default :
g_assert_not_reached ();
}
return gtk_icon_set_render_icon (icon_set,
widget->style,
gtk_widget_get_direction (widget),
GTK_STATE_NORMAL,
GTK_ICON_SIZE_BUTTON,
widget, NULL);
}
static gboolean
gtk_file_system_win32_get_parent (GtkFileSystem *file_system,
const GtkFilePath *path,
@ -816,7 +944,7 @@ gtk_file_system_win32_render_icon (GtkFileSystem *file_system,
icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_CDROM);
break;
case DRIVE_FIXED : /* need a hard disk icon */
icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_CDROM);
icon_set = gtk_style_lookup_icon_set (widget->style, GTK_STOCK_HARDDISK);
break;
default :
break;

4
gtk/gtkiconfactory.c
View File

@ -534,6 +534,10 @@ get_default_icons (GtkIconFactory *factory)
16, stock_font_16,
24, stock_font_24);
add_icon2 (factory, GTK_STOCK_HARDDISK,
16, stock_harddisk_16,
24, stock_harddisk_24);
add_icon2 (factory, GTK_STOCK_HELP,
16, stock_help_16,
24, stock_help_24);

1
gtk/gtkstock.c
View File

@ -295,6 +295,7 @@ static const GtkStockItem builtin_items [] =
{ GTK_STOCK_GO_DOWN, N_("_Down"), 0, 0, GETTEXT_PACKAGE },
{ GTK_STOCK_GO_FORWARD, N_("_Forward"), 0, 0, GETTEXT_PACKAGE },
{ GTK_STOCK_GO_UP, N_("_Up"), 0, 0, GETTEXT_PACKAGE },
{ GTK_STOCK_HARDDISK, N_("_Harddisk"), 0, 0, GETTEXT_PACKAGE },
{ GTK_STOCK_HELP, N_("_Help"), GDK_CONTROL_MASK, 'h', GETTEXT_PACKAGE },
{ GTK_STOCK_HOME, N_("_Home"), 0, 0, GETTEXT_PACKAGE },
{ GTK_STOCK_INDEX, N_("_Index"), 0, 0, GETTEXT_PACKAGE },

1
gtk/gtkstock.h
View File

@ -96,6 +96,7 @@ void gtk_stock_item_free (GtkStockItem *item);
#define GTK_STOCK_GO_DOWN "gtk-go-down"
#define GTK_STOCK_GO_FORWARD "gtk-go-forward"
#define GTK_STOCK_GO_UP "gtk-go-up"
#define GTK_STOCK_HARDDISK "gtk-harddisk"
#define GTK_STOCK_HELP "gtk-help"
#define GTK_STOCK_HOME "gtk-home"
#define GTK_STOCK_INDEX "gtk-index"

4
gtk/stock-icons/Makefile.am
View File

@ -45,6 +45,8 @@ IMAGES = \
stock_first_24.png \
stock_font_16.png \
stock_font_24.png \
stock_harddisk_16.png \
stock_harddisk_24.png \
stock_help_16.png \
stock_help_24.png \
stock_home_16.png \
@ -181,6 +183,8 @@ VARIABLES3 = \
stock_font_24 $(srcdir)/stock_font_24.png \
stock_help_16 $(srcdir)/stock_help_16.png \
stock_help_24 $(srcdir)/stock_help_24.png \
stock_harddisk_16 $(srcdir)/stock_harddisk_16.png \
stock_harddisk_24 $(srcdir)/stock_harddisk_24.png \
stock_home_16 $(srcdir)/stock_home_16.png \
stock_home_24 $(srcdir)/stock_home_24.png \
stock_index_24 $(srcdir)/stock_index_24.png \

2
gtk/stock-icons/makefile.msc
View File

@ -47,6 +47,8 @@ VARIABLES = \
stock_font_24 stock_font_24.png \
stock_help_16 stock_help_16.png \
stock_help_24 stock_help_24.png \
stock_harddisk_16 stock_harddisk_16.png \
stock_harddisk_24 stock_harddisk_24.png \
stock_home_16 stock_home_16.png \
stock_home_24 stock_home_24.png \
stock_index_24 stock_index_24.png \

BIN
gtk/stock-icons/stock_harddisk_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

BIN
gtk/stock-icons/stock_harddisk_24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB