nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 18:07:59 +00:00
Code Issues Projects Releases Wiki Activity
066dfb7786
putty-source/unix/gtkdlg.c

4006 lines
124 KiB
C
Raw Normal View History

First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
/*
* gtkdlg.c - GTK implementation of the PuTTY configuration box.
*/
#include <assert.h>
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
#include <stdarg.h>
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
#include <ctype.h>
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
#include <time.h>
Introduce a config option for building on OS X GTK. Using GTK to run on OS X is going to require several workarounds and behaviour tweaks to be enabled at various points in the code, and it's already getting cumbersome to remember what they all are to put on the command line. Here's a central #define (OSX_GTK) that enables them all in one go, and a configure option (--with-quartz) that sets it. As part of this commit, I've also rearranged the #include order in the GTK source files, so that they include unix.h (which now might be where NOT_X_WINDOWS gets defined) before they test NOT_X_WINDOWS to decide whether to include X11 headers.
2015-08-31 12:05:51 +00:00
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
#include <gtk/gtk.h>
GTK 3 prep: do not include individual GTK/GDK headers. This is the first of several cleanup steps recommended by the GTK 2->3 migration guide. I intend to begin work towards compatibility with GTK 3, but without breaking GTK 2 and even GTK 1 compatibility in the process; GTK 2 is still useful to _me_ (not least because it permits much easier support of old-style server-side X11 fonts), and I recall hearing a rumour that at least one kind of strange system can only run GTK 1, so for the moment I don't intend to stop supporting either. Including gdkkeysyms.h is not optional in GTK 2, because gdk.h does not include it. In GTK 3 it does, so we don't explicitly reinclude it ourselves. We now build cleanly in GTK2 with -DGTK_DISABLE_SINGLE_INCLUDES. (But that doesn't say much, because we did already! Apparently gdkkeysyms.h was a special case which that #define didn't forbid.)
2015-08-08 14:06:15 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
#include <gdk/gdkkeysyms.h>
GTK 3 prep: do not include individual GTK/GDK headers. This is the first of several cleanup steps recommended by the GTK 2->3 migration guide. I intend to begin work towards compatibility with GTK 3, but without breaking GTK 2 and even GTK 1 compatibility in the process; GTK 2 is still useful to _me_ (not least because it permits much easier support of old-style server-side X11 fonts), and I recall hearing a rumour that at least one kind of strange system can only run GTK 1, so for the moment I don't intend to stop supporting either. Including gdkkeysyms.h is not optional in GTK 2, because gdk.h does not include it. In GTK 3 it does, so we don't explicitly reinclude it ourselves. We now build cleanly in GTK2 with -DGTK_DISABLE_SINGLE_INCLUDES. (But that doesn't say much, because we did already! Apparently gdkkeysyms.h was a special case which that #define didn't forbid.)
2015-08-08 14:06:15 +00:00
#endif
Introduce a config option for building on OS X GTK. Using GTK to run on OS X is going to require several workarounds and behaviour tweaks to be enabled at various points in the code, and it's already getting cumbersome to remember what they all are to put on the command line. Here's a central #define (OSX_GTK) that enables them all in one go, and a configure option (--with-quartz) that sets it. As part of this commit, I've also rearranged the #include order in the GTK source files, so that they include unix.h (which now might be where NOT_X_WINDOWS gets defined) before they test NOT_X_WINDOWS to decide whether to include X11 headers.
2015-08-31 12:05:51 +00:00
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
#define MAY_REFER_TO_GTK_IN_HEADERS
Introduce a config option for building on OS X GTK. Using GTK to run on OS X is going to require several workarounds and behaviour tweaks to be enabled at various points in the code, and it's already getting cumbersome to remember what they all are to put on the command line. Here's a central #define (OSX_GTK) that enables them all in one go, and a configure option (--with-quartz) that sets it. As part of this commit, I've also rearranged the #include order in the GTK source files, so that they include unix.h (which now might be where NOT_X_WINDOWS gets defined) before they test NOT_X_WINDOWS to decide whether to include X11 headers.
2015-08-31 12:05:51 +00:00
#include "putty.h"
#include "gtkcompat.h"
#include "gtkcols.h"
#include "gtkfont.h"
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
#include "gtkmisc.h"
Introduce a config option for building on OS X GTK. Using GTK to run on OS X is going to require several workarounds and behaviour tweaks to be enabled at various points in the code, and it's already getting cumbersome to remember what they all are to put on the command line. Here's a central #define (OSX_GTK) that enables them all in one go, and a configure option (--with-quartz) that sets it. As part of this commit, I've also rearranged the #include order in the GTK source files, so that they include unix.h (which now might be where NOT_X_WINDOWS gets defined) before they test NOT_X_WINDOWS to decide whether to include X11 headers.
2015-08-31 12:05:51 +00:00
Allow direct use of X11 to be conditionally compiled out. A major aim of introducing GTK 3 support is to permit compiling for non-X11 platforms that GTK 3 supports, so I'm going to need to be able to build as a pure GTK application with no use of X11 internals. Naturally, I don't intend to stop supporting the hybrid GTK+X11 mode in which X server-side bitmap fonts are available. Use of X11 can be removed by compiling with -DNOT_X_WINDOWS. That's the same compatibility flag that was already used by the unfinished OS X port to disable the X-specific parts of uxpty.c; now it just applies to more source files. (There's no 'configure' option to set this flag at present. I haven't worked out whether we'll need one yet.)
2015-08-08 15:35:19 +00:00
#ifndef NOT_X_WINDOWS
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Allow direct use of X11 to be conditionally compiled out. A major aim of introducing GTK 3 support is to permit compiling for non-X11 platforms that GTK 3 supports, so I'm going to need to be able to build as a pure GTK application with no use of X11 internals. Naturally, I don't intend to stop supporting the hybrid GTK+X11 mode in which X server-side bitmap fonts are available. Use of X11 can be removed by compiling with -DNOT_X_WINDOWS. That's the same compatibility flag that was already used by the unfinished OS X port to disable the X-specific parts of uxpty.c; now it just applies to more source files. (There's no 'configure' option to set this flag at present. I haven't worked out whether we'll need one yet.)
2015-08-08 15:35:19 +00:00
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
#ifdef TESTMODE
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#endif
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
#include "storage.h"
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
#include "dialog.h"
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
#include "tree234.h"
Stop copying the licence text into C source code. Now all the uses of the licence text or the short copyright notice get it from a new header "licence.h", which in turn is built by a Perl script licence.pl invoked by mkfiles.pl, using LICENCE itself as the source. Hence, I can completely remove a whole section from the list of licence locations in CHECKLST.txt :-)
2015-12-22 12:43:31 +00:00
#include "licence.h"
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog. I've put in a special #define to control this selection, in case I decide that for reasons of taste I'd prefer to switch back to GtkFileSelection in GTK2 which supports both!
2015-08-08 16:34:25 +00:00
#if GTK_CHECK_VERSION(2,0,0)
/* Decide which of GtkFileChooserDialog and GtkFileSelection to use */
#define USE_GTK_FILE_CHOOSER_DIALOG
#endif
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
struct Shortcut {
GtkWidget *widget;
struct uctrl *uc;
int action;
};
struct Shortcuts {
struct Shortcut sc[128];
};
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct uctrl {
union control *ctrl;
GtkWidget *toplevel;
GtkWidget **buttons; int nbuttons; /* for radio buttons */
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkWidget *entry; /* for editbox, filesel, fontsel */
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
GtkWidget *button; /* for filesel, fontsel */
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
GtkWidget *list; /* for listbox (in GTK1), combobox (<=GTK2.3) */
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GtkWidget *menu; /* for optionmenu (==droplist) */
GtkWidget *optmenu; /* also for optionmenu */
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkWidget *combo; /* for combo box (either editable or not) */
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#endif
#if GTK_CHECK_VERSION(2,0,0)
GtkWidget *treeview; /* for listbox (GTK2), droplist+combo (>=2.4) */
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkListStore *listmodel; /* for all types of list box */
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
GtkWidget *text; /* for text */
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
GtkWidget *label; /* for dlg_label_change */
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
GtkAdjustment *adj; /* for the scrollbar in a list box */
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
guint entrysig;
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
guint textsig;
Patch from John Sullivan: process double-clicks in the session list box on button-up rather than button-down. The effect of this is that if a saved session is already selected in the list box and then you double-click it, it will open rather than beeping annoyingly. [originally from svn r7414]
2007-03-27 18:16:36 +00:00
int nclicks;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
};
struct dlgparam {
tree234 *byctrl, *bywidget;
void *data;
struct { unsigned char r, g, b, ok; } coloursel_result; /* 0-255 */
/* `flags' are set to indicate when a GTK signal handler is being called
* due to automatic processing and should not flag a user event. */
int flags;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
struct Shortcuts *shortcuts;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
GtkWidget *window, *cancelbutton;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
union control *currfocus, *lastfocus;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
GtkWidget *currtreeitem, **treeitems;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
int ntreeitems;
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
#else
int nselparams;
struct selparam *selparams;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
int retval;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
};
#define FLAG_UPDATING_COMBO_LIST 1
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
#define FLAG_UPDATING_LISTBOX 2
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
enum { /* values for Shortcut.action */
SHORTCUT_EMPTY, /* no shortcut on this key */
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
SHORTCUT_TREE, /* focus a tree item */
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
SHORTCUT_FOCUS, /* focus the supplied widget */
SHORTCUT_UCTRL, /* do something sane with uctrl */
SHORTCUT_UCTRL_UP, /* uctrl is a draglist, move Up */
SHORTCUT_UCTRL_DOWN, /* uctrl is a draglist, move Down */
};
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
enum {
TREESTORE_PATH,
TREESTORE_PARAMS,
TREESTORE_NUM
};
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
/*
* Forward references.
*/
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
static gboolean widget_focus(GtkWidget *widget, GdkEventFocus *event,
gpointer data);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
static void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
int chr, int action, void *ptr);
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
static void shortcut_highlight(GtkWidget *label, int chr);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
static gboolean listitem_single_key(GtkWidget *item, GdkEventKey *event,
gpointer data);
static gboolean listitem_multi_key(GtkWidget *item, GdkEventKey *event,
gpointer data);
static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
gpointer data);
static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
gpointer data);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#endif
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
static void menuitem_activate(GtkMenuItem *item, gpointer data);
#endif
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#if GTK_CHECK_VERSION(3,0,0)
static void colourchoose_response(GtkDialog *dialog,
gint response_id, gpointer data);
#else
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void coloursel_ok(GtkButton *button, gpointer data);
static void coloursel_cancel(GtkButton *button, gpointer data);
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#endif
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
static void window_destroy(GtkWidget *widget, gpointer data);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
int get_listitemheight(GtkWidget *widget);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static int uctrl_cmp_byctrl(void *av, void *bv)
{
struct uctrl *a = (struct uctrl *)av;
struct uctrl *b = (struct uctrl *)bv;
if (a->ctrl < b->ctrl)
return -1;
else if (a->ctrl > b->ctrl)
return +1;
return 0;
}
static int uctrl_cmp_byctrl_find(void *av, void *bv)
{
union control *a = (union control *)av;
struct uctrl *b = (struct uctrl *)bv;
if (a < b->ctrl)
return -1;
else if (a > b->ctrl)
return +1;
return 0;
}
static int uctrl_cmp_bywidget(void *av, void *bv)
{
struct uctrl *a = (struct uctrl *)av;
struct uctrl *b = (struct uctrl *)bv;
if (a->toplevel < b->toplevel)
return -1;
else if (a->toplevel > b->toplevel)
return +1;
return 0;
}
static int uctrl_cmp_bywidget_find(void *av, void *bv)
{
GtkWidget *a = (GtkWidget *)av;
struct uctrl *b = (struct uctrl *)bv;
if (a < b->toplevel)
return -1;
else if (a > b->toplevel)
return +1;
return 0;
}
static void dlg_init(struct dlgparam *dp)
{
dp->byctrl = newtree234(uctrl_cmp_byctrl);
dp->bywidget = newtree234(uctrl_cmp_bywidget);
dp->coloursel_result.ok = FALSE;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
dp->window = dp->cancelbutton = NULL;
#if !GTK_CHECK_VERSION(2,0,0)
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
dp->treeitems = NULL;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
dp->currtreeitem = NULL;
#endif
Various uninitialised-variable accesses picked up by valgrind. [originally from svn r3723]
2004-01-17 14:25:36 +00:00
dp->flags = 0;
dp->currfocus = NULL;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
static void dlg_cleanup(struct dlgparam *dp)
{
struct uctrl *uc;
freetree234(dp->byctrl); /* doesn't free the uctrls inside */
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
dp->byctrl = NULL;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
while ( (uc = index234(dp->bywidget, 0)) != NULL) {
del234(dp->bywidget, uc);
sfree(uc->buttons);
sfree(uc);
}
freetree234(dp->bywidget);
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
dp->bywidget = NULL;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
sfree(dp->treeitems);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
static void dlg_add_uctrl(struct dlgparam *dp, struct uctrl *uc)
{
add234(dp->byctrl, uc);
add234(dp->bywidget, uc);
}
static struct uctrl *dlg_find_byctrl(struct dlgparam *dp, union control *ctrl)
{
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
if (!dp->byctrl)
return NULL;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
return find234(dp->byctrl, ctrl, uctrl_cmp_byctrl_find);
}
static struct uctrl *dlg_find_bywidget(struct dlgparam *dp, GtkWidget *w)
{
struct uctrl *ret = NULL;
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
if (!dp->bywidget)
return NULL;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
do {
ret = find234(dp->bywidget, w, uctrl_cmp_bywidget_find);
if (ret)
return ret;
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
w = gtk_widget_get_parent(w);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
} while (w);
return ret;
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
union control *dlg_last_focused(union control *ctrl, void *dlg)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
if (dp->currfocus != ctrl)
return dp->currfocus;
else
return dp->lastfocus;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
void dlg_radiobutton_set(union control *ctrl, void *dlg, int which)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_RADIO);
assert(uc->buttons != NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(uc->buttons[which]), TRUE);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
int dlg_radiobutton_get(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
int i;
assert(uc->ctrl->generic.type == CTRL_RADIO);
assert(uc->buttons != NULL);
for (i = 0; i < uc->nbuttons; i++)
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(uc->buttons[i])))
return i;
return 0; /* got to return something */
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_checkbox_set(union control *ctrl, void *dlg, int checked)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_CHECKBOX);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(uc->toplevel), checked);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
int dlg_checkbox_get(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_CHECKBOX);
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(uc->toplevel));
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_editbox_set(union control *ctrl, void *dlg, char const *text)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkWidget *entry;
char *tmpstring;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
assert(uc->ctrl->generic.type == CTRL_EDITBOX);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if GTK_CHECK_VERSION(2,4,0)
if (uc->combo)
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
entry = gtk_bin_get_child(GTK_BIN(uc->combo));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
else
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
entry = uc->entry;
assert(entry != NULL);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
/*
* GTK 2 implements gtk_entry_set_text by means of two separate
* operations: first delete the previous text leaving the empty
* string, then insert the new text. This causes two calls to
* the "changed" signal.
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
*
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
* The first call to "changed", if allowed to proceed normally,
* will cause an EVENT_VALCHANGE event on the edit box, causing
* a call to dlg_editbox_get() which will read the empty string
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
* out of the GtkEntry - and promptly write it straight into the
* Conf structure, which is precisely where our `text' pointer
* is probably pointing, so the second editing operation will
* insert that instead of the string we originally asked for.
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
*
* Hence, we must take our own copy of the text before we do
* this.
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
*/
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
tmpstring = dupstr(text);
gtk_entry_set_text(GTK_ENTRY(entry), tmpstring);
sfree(tmpstring);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
char *dlg_editbox_get(union control *ctrl, void *dlg)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if GTK_CHECK_VERSION(2,4,0)
if (uc->combo) {
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
return dupstr(gtk_entry_get_text
(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uc->combo)))));
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
if (uc->entry) {
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
return dupstr(gtk_entry_get_text(GTK_ENTRY(uc->entry)));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
}
assert(!"We shouldn't get here");
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
static void container_remove_and_destroy(GtkWidget *w, gpointer data)
{
GtkContainer *cont = GTK_CONTAINER(data);
/* gtk_container_remove will unref the widget for us; we need not. */
gtk_container_remove(cont, w);
}
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
/* The `listbox' functions can also apply to combo boxes. */
void dlg_listbox_clear(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (uc->menu) {
gtk_container_foreach(GTK_CONTAINER(uc->menu),
container_remove_and_destroy,
GTK_CONTAINER(uc->menu));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
}
if (uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
gtk_list_clear_items(GTK_LIST(uc->list), 0, -1);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if GTK_CHECK_VERSION(2,0,0)
if (uc->listmodel) {
gtk_list_store_clear(uc->listmodel);
return;
}
#endif
assert(!"We shouldn't get here");
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_listbox_del(union control *ctrl, void *dlg, int index)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (uc->menu) {
gtk_container_remove
(GTK_CONTAINER(uc->menu),
g_list_nth_data(GTK_MENU_SHELL(uc->menu)->children, index));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
}
if (uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
gtk_list_clear_items(GTK_LIST(uc->list), index, index+1);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#endif
#if GTK_CHECK_VERSION(2,0,0)
if (uc->listmodel) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GtkTreePath *path;
GtkTreeIter iter;
assert(uc->listmodel != NULL);
path = gtk_tree_path_new_from_indices(index, -1);
gtk_tree_model_get_iter(GTK_TREE_MODEL(uc->listmodel), &iter, path);
gtk_list_store_remove(uc->listmodel, &iter);
gtk_tree_path_free(path);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
{
Rename dlg_listbox_addwithindex() to dlg_listbox_addwithid(), since the old name was, not to put too fine a point on it, wrong. [originally from svn r2997]
2003-03-25 23:45:56 +00:00
dlg_listbox_addwithid(ctrl, dlg, text, 0);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
/*
* Each listbox entry may have a numeric id associated with it.
* Note that some front ends only permit a string to be stored at
* each position, which means that _if_ you put two identical
* strings in any listbox then you MUST not assign them different
* IDs and expect to get meaningful results back.
*/
Rename dlg_listbox_addwithindex() to dlg_listbox_addwithid(), since the old name was, not to put too fine a point on it, wrong. [originally from svn r2997]
2003-03-25 23:45:56 +00:00
void dlg_listbox_addwithid(union control *ctrl, void *dlg,
char const *text, int id)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
/*
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
* This routine is long and complicated in both GTK 1 and 2,
* and completely different. Sigh.
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
*/
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
dp->flags |= FLAG_UPDATING_COMBO_LIST;
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (uc->menu) {
/*
* List item in a drop-down (but non-combo) list. Tabs are
* ignored; we just provide a standard menu item with the
* text.
*/
GtkWidget *menuitem = gtk_menu_item_new_with_label(text);
gtk_container_add(GTK_CONTAINER(uc->menu), menuitem);
gtk_widget_show(menuitem);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data(G_OBJECT(menuitem), "user-data",
GINT_TO_POINTER(id));
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(menuitem_activate), dp);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
goto done;
}
if (uc->list && uc->entry) {
/*
* List item in a combo-box list, which means the sensible
* thing to do is make it a perfectly normal label. Hence
* tabs are disregarded.
*/
GtkWidget *listitem = gtk_list_item_new_with_label(text);
gtk_container_add(GTK_CONTAINER(uc->list), listitem);
gtk_widget_show(listitem);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data(G_OBJECT(listitem), "user-data",
GINT_TO_POINTER(id));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
goto done;
}
#endif
#if !GTK_CHECK_VERSION(2,0,0)
if (uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
/*
* List item in a non-combo-box list box. We make all of
* these Columns containing GtkLabels. This allows us to do
* the nasty force_left hack irrespective of whether there
* are tabs in the thing.
*/
GtkWidget *listitem = gtk_list_item_new();
GtkWidget *cols = columns_new(10);
gint *percents;
int i, ncols;
/* Count the tabs in the text, and hence determine # of columns. */
ncols = 1;
for (i = 0; text[i]; i++)
if (text[i] == '\t')
ncols++;
assert(ncols <=
(uc->ctrl->listbox.ncols ? uc->ctrl->listbox.ncols : 1));
percents = snewn(ncols, gint);
percents[ncols-1] = 100;
for (i = 0; i < ncols-1; i++) {
percents[i] = uc->ctrl->listbox.percentages[i];
percents[ncols-1] -= percents[i];
}
columns_set_cols(COLUMNS(cols), ncols, percents);
sfree(percents);
for (i = 0; i < ncols; i++) {
int len = strcspn(text, "\t");
char *dup = dupprintf("%.*s", len, text);
GtkWidget *label;
text += len;
if (*text) text++;
label = gtk_label_new(dup);
sfree(dup);
columns_add(COLUMNS(cols), label, i, 1);
columns_force_left_align(COLUMNS(cols), label);
gtk_widget_show(label);
}
gtk_container_add(GTK_CONTAINER(listitem), cols);
gtk_widget_show(cols);
gtk_container_add(GTK_CONTAINER(uc->list), listitem);
gtk_widget_show(listitem);
if (ctrl->listbox.multisel) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(listitem), "key_press_event",
G_CALLBACK(listitem_multi_key), uc->adj);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
} else {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(listitem), "key_press_event",
G_CALLBACK(listitem_single_key), uc->adj);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(listitem), "focus_in_event",
G_CALLBACK(widget_focus), dp);
g_signal_connect(G_OBJECT(listitem), "button_press_event",
G_CALLBACK(listitem_button_press), dp);
g_signal_connect(G_OBJECT(listitem), "button_release_event",
G_CALLBACK(listitem_button_release), dp);
g_object_set_data(G_OBJECT(listitem), "user-data",
GINT_TO_POINTER(id));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
goto done;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#else
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
if (uc->listmodel) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GtkTreeIter iter;
int i, cols;
dp->flags |= FLAG_UPDATING_LISTBOX;/* inhibit drag-list update */
gtk_list_store_append(uc->listmodel, &iter);
dp->flags &= ~FLAG_UPDATING_LISTBOX;
gtk_list_store_set(uc->listmodel, &iter, 0, id, -1);
/*
* Now go through text and divide it into columns at the tabs,
* as necessary.
*/
cols = (uc->ctrl->generic.type == CTRL_LISTBOX ? ctrl->listbox.ncols : 1);
cols = cols ? cols : 1;
for (i = 0; i < cols; i++) {
int collen = strcspn(text, "\t");
char *tmpstr = snewn(collen+1, char);
memcpy(tmpstr, text, collen);
tmpstr[collen] = '\0';
gtk_list_store_set(uc->listmodel, &iter, i+1, tmpstr, -1);
sfree(tmpstr);
text += collen;
if (*text) text++;
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
goto done;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
done:
dp->flags &= ~FLAG_UPDATING_COMBO_LIST;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
if (uc->menu || uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GList *children;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
GObject *item;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
uc->list));
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
item = G_OBJECT(g_list_nth_data(children, index));
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
g_list_free(children);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "user-data"));
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#endif
#if GTK_CHECK_VERSION(2,0,0)
if (uc->listmodel) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GtkTreePath *path;
GtkTreeIter iter;
int ret;
path = gtk_tree_path_new_from_indices(index, -1);
gtk_tree_model_get_iter(GTK_TREE_MODEL(uc->listmodel), &iter, path);
gtk_tree_model_get(GTK_TREE_MODEL(uc->listmodel), &iter, 0, &ret, -1);
gtk_tree_path_free(path);
return ret;
}
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
return -1; /* placate dataflow analysis */
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
/* dlg_listbox_index returns <0 if no single element is selected. */
int dlg_listbox_index(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
if (uc->menu || uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GList *children;
GtkWidget *item, *activeitem;
int i;
int selected = -1;
if (uc->menu)
activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
else
activeitem = NULL; /* unnecessarily placate gcc */
children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
uc->list));
for (i = 0; children!=NULL && (item = GTK_WIDGET(children->data))!=NULL;
i++, children = children->next) {
if (uc->menu ? activeitem == item :
GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED) {
if (selected == -1)
selected = i;
else
selected = -2;
}
}
g_list_free(children);
return selected < 0 ? -1 : selected;
}
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (uc->combo) {
/*
* This API function already does the right thing in the
* case of no current selection.
*/
return gtk_combo_box_get_active(GTK_COMBO_BOX(uc->combo));
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
}
#endif
#if GTK_CHECK_VERSION(2,0,0)
if (uc->treeview) {
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkTreeSelection *treesel;
GtkTreePath *path;
Work around a bug in early versions of GTK (which I'm still forced to use, gah) in which the "model" argument to gtk_tree_selection_get_selected_rows() couldn't be NULL. [originally from svn r8069]
2008-06-11 18:03:35 +00:00
GtkTreeModel *model;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GList *sellist;
gint *indices;
int ret;
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
assert(uc->treeview != NULL);
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview));
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (gtk_tree_selection_count_selected_rows(treesel) != 1)
return -1;
Work around a bug in early versions of GTK (which I'm still forced to use, gah) in which the "model" argument to gtk_tree_selection_get_selected_rows() couldn't be NULL. [originally from svn r8069]
2008-06-11 18:03:35 +00:00
sellist = gtk_tree_selection_get_selected_rows(treesel, &model);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
assert(sellist && sellist->data);
path = sellist->data;
if (gtk_tree_path_get_depth(path) != 1) {
ret = -1;
} else {
indices = gtk_tree_path_get_indices(path);
if (!indices) {
ret = -1;
} else {
ret = indices[0];
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
g_list_foreach(sellist, (GFunc)gtk_tree_path_free, NULL);
g_list_free(sellist);
return ret;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
return -1; /* placate dataflow analysis */
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
int dlg_listbox_issel(union control *ctrl, void *dlg, int index)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
if (uc->menu || uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GList *children;
GtkWidget *item, *activeitem;
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
assert(uc->menu != NULL || uc->list != NULL);
children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
uc->list));
item = GTK_WIDGET(g_list_nth_data(children, index));
g_list_free(children);
if (uc->menu) {
activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
return item == activeitem;
} else {
return GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED;
}
}
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (uc->combo) {
/*
* This API function already does the right thing in the
* case of no current selection.
*/
return gtk_combo_box_get_active(GTK_COMBO_BOX(uc->combo)) == index;
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
}
#endif
#if GTK_CHECK_VERSION(2,0,0)
if (uc->treeview) {
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkTreeSelection *treesel;
GtkTreePath *path;
int ret;
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
assert(uc->treeview != NULL);
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview));
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
path = gtk_tree_path_new_from_indices(index, -1);
ret = gtk_tree_selection_path_is_selected(treesel, path);
gtk_tree_path_free(path);
return ret;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
return -1; /* placate dataflow analysis */
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_listbox_select(union control *ctrl, void *dlg, int index)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
uc->ctrl->generic.type == CTRL_LISTBOX);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (uc->optmenu) {
gtk_option_menu_set_history(GTK_OPTION_MENU(uc->optmenu), index);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
}
if (uc->list) {
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
int nitems;
GList *items;
gdouble newtop, newbot;
gtk_list_select_item(GTK_LIST(uc->list), index);
/*
* Scroll the list box if necessary to ensure the newly
* selected item is visible.
*/
items = gtk_container_children(GTK_CONTAINER(uc->list));
nitems = g_list_length(items);
if (nitems > 0) {
int modified = FALSE;
g_list_free(items);
newtop = uc->adj->lower +
(uc->adj->upper - uc->adj->lower) * index / nitems;
newbot = uc->adj->lower +
(uc->adj->upper - uc->adj->lower) * (index+1) / nitems;
if (uc->adj->value > newtop) {
modified = TRUE;
uc->adj->value = newtop;
} else if (uc->adj->value < newbot - uc->adj->page_size) {
modified = TRUE;
uc->adj->value = newbot - uc->adj->page_size;
}
if (modified)
gtk_adjustment_value_changed(uc->adj);
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (uc->combo) {
gtk_combo_box_set_active(GTK_COMBO_BOX(uc->combo), index);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
}
#endif
#if GTK_CHECK_VERSION(2,0,0)
if (uc->treeview) {
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkTreeSelection *treesel;
GtkTreePath *path;
dlg_listbox_select() now scrolls the list box to ensure that the item it's just selected is visible. [originally from svn r6338]
2005-09-21 17:09:07 +00:00
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview));
dlg_listbox_select() now scrolls the list box to ensure that the item it's just selected is visible. [originally from svn r6338]
2005-09-21 17:09:07 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
path = gtk_tree_path_new_from_indices(index, -1);
gtk_tree_selection_select_path(treesel, path);
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(uc->treeview),
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
path, NULL, FALSE, 0.0, 0.0);
gtk_tree_path_free(path);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
return;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_text_set(union control *ctrl, void *dlg, char const *text)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_TEXT);
assert(uc->text != NULL);
gtk_label_set_text(GTK_LABEL(uc->text), text);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Support for Windows PuTTY connecting straight to a local serial port in place of making a network connection. This has involved a couple of minor infrastructure changes: - New dlg_label_change() function in the dialog.h interface, which alters the label on a control. Only used, at present, to switch the Host Name and Port boxes into Serial Line and Speed, which means that any platform not implementing serial connections (i.e. currently all but Windows) does not need to actually do anything in this function. Yet. - New small piece of infrastructure: cfg_launchable() determines whether a Config structure describes a session ready to be launched. This was previously determined by seeing if it had a non-empty host name, but it has to check the serial line as well so there's a centralised function for it. I haven't gone through all front ends and arranged for this function to be used everywhere it needs to be; so far I've only checked Windows. - Similarly, cfg_dest() returns the destination of a connection (host name or serial line) in a text format suitable for putting into messages such as `Unable to connect to %s'. [originally from svn r6815]
2006-08-28 10:35:12 +00:00
void dlg_label_change(union control *ctrl, void *dlg, char const *text)
{
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
switch (uc->ctrl->generic.type) {
case CTRL_BUTTON:
gtk_label_set_text(GTK_LABEL(uc->toplevel), text);
shortcut_highlight(uc->toplevel, ctrl->button.shortcut);
break;
case CTRL_CHECKBOX:
gtk_label_set_text(GTK_LABEL(uc->toplevel), text);
shortcut_highlight(uc->toplevel, ctrl->checkbox.shortcut);
break;
case CTRL_RADIO:
gtk_label_set_text(GTK_LABEL(uc->label), text);
shortcut_highlight(uc->label, ctrl->radio.shortcut);
break;
case CTRL_EDITBOX:
gtk_label_set_text(GTK_LABEL(uc->label), text);
shortcut_highlight(uc->label, ctrl->editbox.shortcut);
break;
case CTRL_FILESELECT:
gtk_label_set_text(GTK_LABEL(uc->label), text);
shortcut_highlight(uc->label, ctrl->fileselect.shortcut);
break;
case CTRL_FONTSELECT:
gtk_label_set_text(GTK_LABEL(uc->label), text);
shortcut_highlight(uc->label, ctrl->fontselect.shortcut);
break;
case CTRL_LISTBOX:
gtk_label_set_text(GTK_LABEL(uc->label), text);
shortcut_highlight(uc->label, ctrl->listbox.shortcut);
break;
default:
assert(!"This shouldn't happen");
break;
}
Support for Windows PuTTY connecting straight to a local serial port in place of making a network connection. This has involved a couple of minor infrastructure changes: - New dlg_label_change() function in the dialog.h interface, which alters the label on a control. Only used, at present, to switch the Host Name and Port boxes into Serial Line and Speed, which means that any platform not implementing serial connections (i.e. currently all but Windows) does not need to actually do anything in this function. Yet. - New small piece of infrastructure: cfg_launchable() determines whether a Config structure describes a session ready to be launched. This was previously determined by seeing if it had a non-empty host name, but it has to check the serial line as well so there's a centralised function for it. I haven't gone through all front ends and arranged for this function to be used everywhere it needs to be; so far I've only checked Windows. - Similarly, cfg_dest() returns the destination of a connection (host name or serial line) in a text format suitable for putting into messages such as `Unable to connect to %s'. [originally from svn r6815]
2006-08-28 10:35:12 +00:00
}
Turn 'Filename' into a dynamically allocated type with no arbitrary length limit, just as I did to FontSpec yesterday. [originally from svn r9316]
2011-10-02 11:01:57 +00:00
void dlg_filesel_set(union control *ctrl, void *dlg, Filename *fn)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
Add code in dlg_filesel_set and dlg_fontsel_set which makes them duplicate the strings they pass to gtk_entry_set_text. I was already doing that in dlg_editbox_set, but forgot to add the same code when I revamped FontSpec and Filename to contain dynamically allocated strings (r9314 and r9316 respectively). This fixes a bug where, on some versions of GTK (but apparently not up-to-date versions), loading a saved session causes gibberish to appear in file-selector edit boxes accompanied by a valgrind error. [originally from svn r9456] [r9314 == 9c75fe9a3fa5e6b709f1c210795d1140ca1be2e8] [r9316 == 62cbc7dc0b33808dc8794c59f60971fbba97894b]
2012-04-13 18:02:30 +00:00
/* We must copy fn->path before passing it to gtk_entry_set_text.
* See comment in dlg_editbox_set() for the reasons. */
char *duppath = dupstr(fn->path);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
assert(uc->ctrl->generic.type == CTRL_FILESELECT);
assert(uc->entry != NULL);
Add code in dlg_filesel_set and dlg_fontsel_set which makes them duplicate the strings they pass to gtk_entry_set_text. I was already doing that in dlg_editbox_set, but forgot to add the same code when I revamped FontSpec and Filename to contain dynamically allocated strings (r9314 and r9316 respectively). This fixes a bug where, on some versions of GTK (but apparently not up-to-date versions), loading a saved session causes gibberish to appear in file-selector edit boxes accompanied by a valgrind error. [originally from svn r9456] [r9314 == 9c75fe9a3fa5e6b709f1c210795d1140ca1be2e8] [r9316 == 62cbc7dc0b33808dc8794c59f60971fbba97894b]
2012-04-13 18:02:30 +00:00
gtk_entry_set_text(GTK_ENTRY(uc->entry), duppath);
sfree(duppath);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Turn 'Filename' into a dynamically allocated type with no arbitrary length limit, just as I did to FontSpec yesterday. [originally from svn r9316]
2011-10-02 11:01:57 +00:00
Filename *dlg_filesel_get(union control *ctrl, void *dlg)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_FILESELECT);
assert(uc->entry != NULL);
Turn 'Filename' into a dynamically allocated type with no arbitrary length limit, just as I did to FontSpec yesterday. [originally from svn r9316]
2011-10-02 11:01:57 +00:00
return filename_from_str(gtk_entry_get_text(GTK_ENTRY(uc->entry)));
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Change the semantics of 'FontSpec' so that it's a dynamically allocated type. The main reason for this is to stop it from taking up a fixed large amount of space in every 'struct value' subunion in conf.c, although that makes little difference so far because Filename is still doing the same thing (and is therefore next on my list). However, the removal of its arbitrary length limit is not to be sneezed at. [originally from svn r9314]
2011-10-01 17:38:59 +00:00
void dlg_fontsel_set(union control *ctrl, void *dlg, FontSpec *fs)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
Add code in dlg_filesel_set and dlg_fontsel_set which makes them duplicate the strings they pass to gtk_entry_set_text. I was already doing that in dlg_editbox_set, but forgot to add the same code when I revamped FontSpec and Filename to contain dynamically allocated strings (r9314 and r9316 respectively). This fixes a bug where, on some versions of GTK (but apparently not up-to-date versions), loading a saved session causes gibberish to appear in file-selector edit boxes accompanied by a valgrind error. [originally from svn r9456] [r9314 == 9c75fe9a3fa5e6b709f1c210795d1140ca1be2e8] [r9316 == 62cbc7dc0b33808dc8794c59f60971fbba97894b]
2012-04-13 18:02:30 +00:00
/* We must copy fs->name before passing it to gtk_entry_set_text.
* See comment in dlg_editbox_set() for the reasons. */
char *dupname = dupstr(fs->name);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
assert(uc->ctrl->generic.type == CTRL_FONTSELECT);
assert(uc->entry != NULL);
Add code in dlg_filesel_set and dlg_fontsel_set which makes them duplicate the strings they pass to gtk_entry_set_text. I was already doing that in dlg_editbox_set, but forgot to add the same code when I revamped FontSpec and Filename to contain dynamically allocated strings (r9314 and r9316 respectively). This fixes a bug where, on some versions of GTK (but apparently not up-to-date versions), loading a saved session causes gibberish to appear in file-selector edit boxes accompanied by a valgrind error. [originally from svn r9456] [r9314 == 9c75fe9a3fa5e6b709f1c210795d1140ca1be2e8] [r9316 == 62cbc7dc0b33808dc8794c59f60971fbba97894b]
2012-04-13 18:02:30 +00:00
gtk_entry_set_text(GTK_ENTRY(uc->entry), dupname);
sfree(dupname);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Change the semantics of 'FontSpec' so that it's a dynamically allocated type. The main reason for this is to stop it from taking up a fixed large amount of space in every 'struct value' subunion in conf.c, although that makes little difference so far because Filename is still doing the same thing (and is therefore next on my list). However, the removal of its arbitrary length limit is not to be sneezed at. [originally from svn r9314]
2011-10-01 17:38:59 +00:00
FontSpec *dlg_fontsel_get(union control *ctrl, void *dlg)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_FONTSELECT);
assert(uc->entry != NULL);
Change the semantics of 'FontSpec' so that it's a dynamically allocated type. The main reason for this is to stop it from taking up a fixed large amount of space in every 'struct value' subunion in conf.c, although that makes little difference so far because Filename is still doing the same thing (and is therefore next on my list). However, the removal of its arbitrary length limit is not to be sneezed at. [originally from svn r9314]
2011-10-01 17:38:59 +00:00
return fontspec_new(gtk_entry_get_text(GTK_ENTRY(uc->entry)));
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
/*
* Bracketing a large set of updates in these two functions will
* cause the front end (if possible) to delay updating the screen
* until it's all complete, thus avoiding flicker.
*/
void dlg_update_start(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
/*
* Apparently we can't do this at all in GTK. GtkCList supports
* freeze and thaw, but not GtkList. Bah.
*/
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_update_done(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
/*
* Apparently we can't do this at all in GTK. GtkCList supports
* freeze and thaw, but not GtkList. Bah.
*/
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_set_focus(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
switch (ctrl->generic.type) {
case CTRL_CHECKBOX:
case CTRL_BUTTON:
/* Check boxes and buttons get the focus _and_ get toggled. */
gtk_widget_grab_focus(uc->toplevel);
break;
case CTRL_FILESELECT:
case CTRL_FONTSELECT:
case CTRL_EDITBOX:
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (uc->entry) {
/* Anything containing an edit box gets that focused. */
gtk_widget_grab_focus(uc->entry);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
else if (uc->combo) {
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
/* Failing that, there'll be a combo box. */
gtk_widget_grab_focus(uc->combo);
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
break;
case CTRL_RADIO:
/*
* Radio buttons: we find the currently selected button and
* focus it.
*/
{
int i;
for (i = 0; i < ctrl->radio.nbuttons; i++)
if (gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(uc->buttons[i]))) {
gtk_widget_grab_focus(uc->buttons[i]);
}
}
break;
case CTRL_LISTBOX:
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (uc->optmenu) {
gtk_widget_grab_focus(uc->optmenu);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
break;
}
#else
if (uc->combo) {
gtk_widget_grab_focus(uc->combo);
break;
}
#endif
#if !GTK_CHECK_VERSION(2,0,0)
if (uc->list) {
/*
* For GTK-1 style list boxes, we tell it to focus one
* of its children, which appears to do the Right
* Thing.
*/
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
gtk_container_focus(GTK_CONTAINER(uc->list), GTK_DIR_TAB_FORWARD);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
break;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
#else
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
if (uc->treeview) {
gtk_widget_grab_focus(uc->treeview);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
break;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
break;
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
/*
* During event processing, you might well want to give an error
* indication to the user. dlg_beep() is a quick and easy generic
* error; dlg_error() puts up a message-box or equivalent.
*/
void dlg_beep(void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
gdk_beep();
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Use GtkMessageDialog for dlg_error(). This is a much simpler way to display simple message-box type dialogs, whose absence I've previously been working around by laboriously constructing something in my usual style.
2015-08-31 13:29:56 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
static void errmsg_button_clicked(GtkButton *button, gpointer data)
{
gtk_widget_destroy(GTK_WIDGET(data));
}
Use GtkMessageDialog for dlg_error(). This is a much simpler way to display simple message-box type dialogs, whose absence I've previously been working around by laboriously constructing something in my usual style.
2015-08-31 13:29:56 +00:00
#endif
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child)
{
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
gint x, y, w, h, dx, dy;
GtkRequisition req;
gtk_window_set_position(GTK_WINDOW(child), GTK_WIN_POS_NONE);
gtk_widget_size_request(GTK_WIDGET(child), &req);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(parent)), &x, &y);
gdk_window_get_size(gtk_widget_get_window(GTK_WIDGET(parent)), &w, &h);
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
/*
* One corner of the transient will be offset inwards, by 1/4
* of the parent window's size, from the corresponding corner
* of the parent window. The corner will be chosen so as to
* place the transient closer to the centre of the screen; this
* should avoid transients going off the edge of the screen on
* a regular basis.
*/
if (x + w/2 < gdk_screen_width() / 2)
dx = x + w/4; /* work from left edges */
else
dx = x + 3*w/4 - req.width; /* work from right edges */
if (y + h/2 < gdk_screen_height() / 2)
dy = y + h/4; /* work from top edges */
else
dy = y + 3*h/4 - req.height; /* work from bottom edges */
gtk_widget_set_uposition(GTK_WIDGET(child), dx, dy);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
#endif
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
}
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
void dlg_error_msg(void *dlg, const char *msg)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
Use GtkMessageDialog for dlg_error(). This is a much simpler way to display simple message-box type dialogs, whose absence I've previously been working around by laboriously constructing something in my usual style.
2015-08-31 13:29:56 +00:00
GtkWidget *window;
#if GTK_CHECK_VERSION(3,0,0)
window = gtk_message_dialog_new(GTK_WINDOW(dp->window),
(GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"%s", msg);
gtk_dialog_run(GTK_DIALOG(window));
gtk_widget_destroy(window);
#else
GtkWidget *hbox, *text, *ok;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
window = gtk_dialog_new();
text = gtk_label_new(msg);
Avoid deprecated gtk_misc_set_alignment(). As of GTK 3.16 (but not in previous GTK 3 versions), there's a new gtk_label_set_xalign which does this job.
2015-08-31 12:57:34 +00:00
align_label_left(GTK_LABEL(text));
Better appearance and positioning for dlg_error_msg box, and also I've just found out that it's easy to ask for the config box to be centred on the screen by default, which is kinda cool. [originally from svn r2962]
2003-03-18 19:47:28 +00:00
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 20);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
Better appearance and positioning for dlg_error_msg box, and also I've just found out that it's easy to ask for the config box to be centred on the screen by default, which is kinda cool. [originally from svn r2962]
2003-03-18 19:47:28 +00:00
hbox, FALSE, FALSE, 20);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
gtk_widget_show(text);
Better appearance and positioning for dlg_error_msg box, and also I've just found out that it's easy to ask for the config box to be centred on the screen by default, which is kinda cool. [originally from svn r2962]
2003-03-18 19:47:28 +00:00
gtk_widget_show(hbox);
gtk_window_set_title(GTK_WINDOW(window), "Error");
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
ok = gtk_button_new_with_label("OK");
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(window))),
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
ok, FALSE, FALSE, 0);
gtk_widget_show(ok);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_widget_set_can_default(ok, TRUE);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
gtk_window_set_default(GTK_WINDOW(window), ok);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(ok), "clicked",
G_CALLBACK(errmsg_button_clicked), window);
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(window_destroy), NULL);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
Better appearance and positioning for dlg_error_msg box, and also I've just found out that it's easy to ask for the config box to be centred on the screen by default, which is kinda cool. [originally from svn r2962]
2003-03-18 19:47:28 +00:00
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(dp->window));
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
set_transient_window_pos(dp->window, window);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
gtk_widget_show(window);
gtk_main();
Use GtkMessageDialog for dlg_error(). This is a much simpler way to display simple message-box type dialogs, whose absence I've previously been working around by laboriously constructing something in my usual style.
2015-08-31 13:29:56 +00:00
#endif
GTK 3 prep: write a replacement for gtk_quit_add(). GTK 2 has deprecated it and provided no replacement; a bug tracker entry I found on the subject suggested that it was functionality that didn't really belong in GTK, and glib ought to provide a replacement instead, which would be a perfectly fine thing to suggest if they had waited for glib to get round to doing so *before* throwing out a function people were actually using. Sigh. Anyway, it turns out that subsidiary invocations of gtk_main() don't happen inside GTK as far as I can see, so all I need to do is to make sure my own invocations of gtk_main() are followed by a cleanup function which runs any quit functions that I've registered. That was the last deprecated GTK function, so we now build cleanly with -DGTK_DISABLE_DEPRECATED. (But, as mentioned a couple of commits ago, we still don't build with -DGDK_DISABLE_DEPRECATED, because that has migrating to Cairo drawing as a prerequisite.)
2015-08-09 10:33:43 +00:00
post_main();
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
/*
* This function signals to the front end that the dialog's
* processing is completed, and passes an integer value (typically
* a success status).
*/
void dlg_end(void *dlg, int value)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
dp->retval = value;
Having created and used uxsel, it actually turns out to be practically trivial to put all the pieces together and create a working prototype of Unix PuTTY! It's missing a lot of things - notably GUI request boxes for host keys and logfiles and so forth, the Event Log, mid-session reconfiguration, session loading and saving, sensible population of the character sets drop-down list and probably other fiddly little things too - but it will put up a config box and then create a GUI window containing an SSH connection to the host you specified, so it's _basically_ there. Woo! [originally from svn r3020]
2003-03-29 19:52:50 +00:00
gtk_widget_destroy(dp->window);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_refresh(union control *ctrl, void *dlg)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc;
if (ctrl) {
if (ctrl->generic.handler != NULL)
ctrl->generic.handler(ctrl, dp, dp->data, EVENT_REFRESH);
} else {
int i;
for (i = 0; (uc = index234(dp->byctrl, i)) != NULL; i++) {
assert(uc->ctrl != NULL);
if (uc->ctrl->generic.handler != NULL)
uc->ctrl->generic.handler(uc->ctrl, dp,
dp->data, EVENT_REFRESH);
}
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
void dlg_coloursel_start(union control *ctrl, void *dlg, int r, int g, int b)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#if GTK_CHECK_VERSION(3,0,0)
GtkWidget *coloursel =
gtk_color_chooser_dialog_new("Select a colour",
GTK_WINDOW(dp->window));
gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(coloursel), FALSE);
#else
GtkWidget *okbutton, *cancelbutton;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
GtkWidget *coloursel =
gtk_color_selection_dialog_new("Select a colour");
GtkColorSelectionDialog *ccs = GTK_COLOR_SELECTION_DIALOG(coloursel);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
GtkColorSelection *cs = GTK_COLOR_SELECTION
(gtk_color_selection_dialog_get_color_selection(ccs));
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
gtk_color_selection_set_has_opacity_control(cs, FALSE);
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
dp->coloursel_result.ok = FALSE;
gtk_window_set_modal(GTK_WINDOW(coloursel), TRUE);
GTK 3 prep: use gtk_color_selection_get_current_color(). Replaces the deprecated gtk_color_selection_set_color() which took an array of four doubles (RGBA), and instead takes a 'GdkColor' struct containing four 16-bit integers. For GTK1, we still have to retain the original version.
2015-08-08 16:32:15 +00:00
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#if GTK_CHECK_VERSION(3,0,0)
{
GdkRGBA rgba;
rgba.red = r / 255.0;
rgba.green = g / 255.0;
rgba.blue = b / 255.0;
rgba.alpha = 1.0; /* fully opaque! */
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(coloursel), &rgba);
}
#elif GTK_CHECK_VERSION(2,0,0)
GTK 3 prep: use gtk_color_selection_get_current_color(). Replaces the deprecated gtk_color_selection_set_color() which took an array of four doubles (RGBA), and instead takes a 'GdkColor' struct containing four 16-bit integers. For GTK1, we still have to retain the original version.
2015-08-08 16:32:15 +00:00
{
GdkColor col;
col.red = r * 0x0101;
col.green = g * 0x0101;
col.blue = b * 0x0101;
gtk_color_selection_set_current_color(cs, &col);
}
#else
{
gdouble cvals[4];
cvals[0] = r / 255.0;
cvals[1] = g / 255.0;
cvals[2] = b / 255.0;
cvals[3] = 1.0; /* fully opaque! */
gtk_color_selection_set_color(cs, cvals);
}
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
g_object_set_data(G_OBJECT(coloursel), "user-data", (gpointer)uc);
#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(coloursel), "response",
G_CALLBACK(colourchoose_response), (gpointer)dp);
#else
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
#if GTK_CHECK_VERSION(2,0,0)
g_object_get(G_OBJECT(ccs),
"ok-button", &okbutton,
"cancel-button", &cancelbutton,
(const char *)NULL);
#else
okbutton = ccs->ok_button;
cancelbutton = ccs->cancel_button;
#endif
g_object_set_data(G_OBJECT(okbutton), "user-data",
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
(gpointer)coloursel);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
g_object_set_data(G_OBJECT(cancelbutton), "user-data",
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
(gpointer)coloursel);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(okbutton), "clicked",
G_CALLBACK(coloursel_ok), (gpointer)dp);
g_signal_connect(G_OBJECT(cancelbutton), "clicked",
G_CALLBACK(coloursel_cancel), (gpointer)dp);
g_signal_connect_swapped(G_OBJECT(okbutton), "clicked",
G_CALLBACK(gtk_widget_destroy),
(gpointer)coloursel);
g_signal_connect_swapped(G_OBJECT(cancelbutton), "clicked",
G_CALLBACK(gtk_widget_destroy),
(gpointer)coloursel);
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
gtk_widget_show(coloursel);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
int dlg_coloursel_results(union control *ctrl, void *dlg,
int *r, int *g, int *b)
{
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam *dp = (struct dlgparam *)dlg;
if (dp->coloursel_result.ok) {
*r = dp->coloursel_result.r;
*g = dp->coloursel_result.g;
*b = dp->coloursel_result.b;
return 1;
} else
return 0;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
/* ----------------------------------------------------------------------
* Signal handlers while the dialog box is active.
*/
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
static gboolean widget_focus(GtkWidget *widget, GdkEventFocus *event,
gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, widget);
union control *focus;
if (uc && uc->ctrl)
focus = uc->ctrl;
else
focus = NULL;
if (focus != dp->currfocus) {
dp->lastfocus = dp->currfocus;
dp->currfocus = focus;
}
return FALSE;
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void button_clicked(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
}
static void button_toggled(GtkToggleButton *tb, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(tb));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_VALCHANGE);
}
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
static gboolean editbox_key(GtkWidget *widget, GdkEventKey *event,
gpointer data)
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
{
/*
* GtkEntry has a nasty habit of eating the Return key, which
* is unhelpful since it doesn't actually _do_ anything with it
* (it calls gtk_widget_activate, but our edit boxes never need
* activating). So I catch Return before GtkEntry sees it, and
* pass it straight on to the parent widget. Effect: hitting
* Return in an edit box will now activate the default button
* in the dialog just like it will everywhere else.
*/
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
GtkWidget *parent = gtk_widget_get_parent(widget);
GTK 3 prep: use GDK_KEY_<keyname> constants, not GDK_<keyname>. GTK 2 doesn't _documentedly_ provide a helpful compile option to let us check this one in advance of GTK 3, but you can fake one anyway by compiling with -D__GDK_KEYSYMS_COMPAT_H__, so that gdkkeysyms-compat.h will believe that it's already been included :-) We now build cleanly under GTK 2 with that predefine.
2015-08-08 15:23:54 +00:00
if (event->keyval == GDK_KEY_Return && parent != NULL) {
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
gboolean return_val;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
g_signal_emit_by_name(G_OBJECT(parent), "key_press_event",
event, &return_val);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
return return_val;
}
return FALSE;
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void editbox_changed(GtkEditable *ed, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
if (!(dp->flags & FLAG_UPDATING_COMBO_LIST)) {
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(ed));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_VALCHANGE);
}
}
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
static gboolean editbox_lostfocus(GtkWidget *ed, GdkEventFocus *event,
gpointer data)
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(ed));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_REFRESH);
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
return FALSE;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
/*
* GTK 1 list box event handlers.
*/
static gboolean listitem_key(GtkWidget *item, GdkEventKey *event,
gpointer data, int multiple)
{
GtkAdjustment *adj = GTK_ADJUSTMENT(data);
if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up ||
event->keyval == GDK_Down || event->keyval == GDK_KP_Down ||
event->keyval == GDK_Page_Up || event->keyval == GDK_KP_Page_Up ||
event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down) {
/*
* Up, Down, PgUp or PgDn have been pressed on a ListItem
* in a list box. So, if the list box is single-selection:
*
* - if the list item in question isn't already selected,
* we simply select it.
* - otherwise, we find the next one (or next
* however-far-away) in whichever direction we're going,
* and select that.
* + in this case, we must also fiddle with the
* scrollbar to ensure the newly selected item is
* actually visible.
*
* If it's multiple-selection, we do all of the above
* except actually selecting anything, so we move the focus
* and fiddle the scrollbar to follow it.
*/
GtkWidget *list = item->parent;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_stop_emission_by_name(G_OBJECT(item), "key_press_event");
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (!multiple &&
GTK_WIDGET_STATE(item) != GTK_STATE_SELECTED) {
gtk_list_select_child(GTK_LIST(list), item);
} else {
int direction =
(event->keyval==GDK_Up || event->keyval==GDK_KP_Up ||
event->keyval==GDK_Page_Up || event->keyval==GDK_KP_Page_Up)
? -1 : +1;
int step =
(event->keyval==GDK_Page_Down ||
event->keyval==GDK_KP_Page_Down ||
event->keyval==GDK_Page_Up || event->keyval==GDK_KP_Page_Up)
? 2 : 1;
int i, n;
GList *children, *chead;
chead = children = gtk_container_children(GTK_CONTAINER(list));
n = g_list_length(children);
if (step == 2) {
/*
* Figure out how many list items to a screenful,
* and adjust the step appropriately.
*/
step = 0.5 + adj->page_size * n / (adj->upper - adj->lower);
step--; /* go by one less than that */
}
i = 0;
while (children != NULL) {
if (item == children->data)
break;
children = children->next;
i++;
}
while (step > 0) {
if (direction < 0 && i > 0)
children = children->prev, i--;
else if (direction > 0 && i < n-1)
children = children->next, i++;
step--;
}
if (children && children->data) {
if (!multiple)
gtk_list_select_child(GTK_LIST(list),
GTK_WIDGET(children->data));
gtk_widget_grab_focus(GTK_WIDGET(children->data));
gtk_adjustment_clamp_page
(adj,
adj->lower + (adj->upper-adj->lower) * i / n,
adj->lower + (adj->upper-adj->lower) * (i+1) / n);
}
g_list_free(chead);
}
return TRUE;
}
return FALSE;
}
static gboolean listitem_single_key(GtkWidget *item, GdkEventKey *event,
gpointer data)
{
return listitem_key(item, event, data, FALSE);
}
static gboolean listitem_multi_key(GtkWidget *item, GdkEventKey *event,
gpointer data)
{
return listitem_key(item, event, data, TRUE);
}
static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
switch (event->type) {
default:
case GDK_BUTTON_PRESS: uc->nclicks = 1; break;
case GDK_2BUTTON_PRESS: uc->nclicks = 2; break;
case GDK_3BUTTON_PRESS: uc->nclicks = 3; break;
}
return FALSE;
}
static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
if (uc->nclicks>1) {
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
return TRUE;
}
return FALSE;
}
static void list_selchange(GtkList *list, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(list));
if (!uc) return;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
}
static void draglist_move(struct dlgparam *dp, struct uctrl *uc, int direction)
{
int index = dlg_listbox_index(uc->ctrl, dp);
GList *children = gtk_container_children(GTK_CONTAINER(uc->list));
GtkWidget *child;
if ((index < 0) ||
(index == 0 && direction < 0) ||
(index == g_list_length(children)-1 && direction > 0)) {
gdk_beep();
return;
}
child = g_list_nth_data(children, index);
gtk_widget_ref(child);
gtk_list_clear_items(GTK_LIST(uc->list), index, index+1);
g_list_free(children);
children = NULL;
children = g_list_append(children, child);
gtk_list_insert_items(GTK_LIST(uc->list), children, index + direction);
gtk_list_select_item(GTK_LIST(uc->list), index + direction);
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_VALCHANGE);
}
static void draglist_up(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button));
draglist_move(dp, uc, -1);
}
static void draglist_down(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button));
draglist_move(dp, uc, +1);
}
#else /* !GTK_CHECK_VERSION(2,0,0) */
/*
* GTK 2 list box event handlers.
*/
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
static void listbox_doubleclick(GtkTreeView *treeview, GtkTreePath *path,
GtkTreeViewColumn *column, gpointer data)
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
{
struct dlgparam *dp = (struct dlgparam *)data;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(treeview));
if (uc)
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
static void listbox_selchange(GtkTreeSelection *treeselection,
gpointer data)
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
{
struct dlgparam *dp = (struct dlgparam *)data;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
GtkTreeView *tree = gtk_tree_selection_get_tree_view(treeselection);
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(tree));
if (uc)
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
struct draglist_valchange_ctx {
struct uctrl *uc;
struct dlgparam *dp;
};
static gboolean draglist_valchange(gpointer data)
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
{
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
struct draglist_valchange_ctx *ctx =
(struct draglist_valchange_ctx *)data;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
ctx->uc->ctrl->generic.handler(ctx->uc->ctrl, ctx->dp,
ctx->dp->data, EVENT_VALCHANGE);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
sfree(ctx);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
return FALSE;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
static void listbox_reorder(GtkTreeModel *treemodel, GtkTreePath *path,
GtkTreeIter *iter, gpointer data)
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
{
struct dlgparam *dp = (struct dlgparam *)data;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
gpointer tree;
struct uctrl *uc;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (dp->flags & FLAG_UPDATING_LISTBOX)
return; /* not a user drag operation */
tree = g_object_get_data(G_OBJECT(treemodel), "user-data");
uc = dlg_find_bywidget(dp, GTK_WIDGET(tree));
if (uc) {
/*
* We should cause EVENT_VALCHANGE on the list box, now
* that its rows have been reordered. However, the GTK 2
* docs say that at the point this signal is received the
* new row might not have actually been filled in yet.
*
* (So what smegging use is it then, eh? Don't suppose it
* occurred to you at any point that letting the
* application know _after_ the reordering was compelete
* might be helpful to someone?)
*
* To get round this, I schedule an idle function, which I
* hope won't be called until the main event loop is
* re-entered after the drag-and-drop handler has finished
* furtling with the list store.
*/
struct draglist_valchange_ctx *ctx =
snew(struct draglist_valchange_ctx);
ctx->uc = uc;
ctx->dp = dp;
g_idle_add(draglist_valchange, ctx);
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif /* !GTK_CHECK_VERSION(2,0,0) */
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
static void menuitem_activate(GtkMenuItem *item, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
GtkWidget *menushell = GTK_WIDGET(item)->parent;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
gpointer optmenu = g_object_get_data(G_OBJECT(menushell), "user-data");
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(optmenu));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
}
#else
static void droplist_selchange(GtkComboBox *combo, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(combo));
if (uc)
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
}
#endif /* !GTK_CHECK_VERSION(2,4,0) */
GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog. I've put in a special #define to control this selection, in case I decide that for reasons of taste I'd prefer to switch back to GtkFileSelection in GTK2 which supports both!
2015-08-08 16:34:25 +00:00
#ifdef USE_GTK_FILE_CHOOSER_DIALOG
static void filechoose_response(GtkDialog *dialog, gint response,
gpointer data)
{
/* struct dlgparam *dp = (struct dlgparam *)data; */
struct uctrl *uc = g_object_get_data(G_OBJECT(dialog), "user-data");
if (response == GTK_RESPONSE_ACCEPT) {
gchar *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
g_free(name);
}
gtk_widget_destroy(GTK_WIDGET(dialog));
}
#else
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void filesel_ok(GtkButton *button, gpointer data)
{
Having created and used uxsel, it actually turns out to be practically trivial to put all the pieces together and create a working prototype of Unix PuTTY! It's missing a lot of things - notably GUI request boxes for host keys and logfiles and so forth, the Event Log, mid-session reconfiguration, session loading and saving, sensible population of the character sets drop-down list and probably other fiddly little things too - but it will put up a config box and then create a GUI window containing an SSH connection to the host you specified, so it's _basically_ there. Woo! [originally from svn r3020]
2003-03-29 19:52:50 +00:00
/* struct dlgparam *dp = (struct dlgparam *)data; */
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
gpointer filesel = g_object_get_data(G_OBJECT(button), "user-data");
struct uctrl *uc = g_object_get_data(G_OBJECT(filesel), "user-data");
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
const char *name = gtk_file_selection_get_filename
(GTK_FILE_SELECTION(filesel));
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
}
GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog. I've put in a special #define to control this selection, in case I decide that for reasons of taste I'd prefer to switch back to GtkFileSelection in GTK2 which supports both!
2015-08-08 16:34:25 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void fontsel_ok(GtkButton *button, gpointer data)
{
Having created and used uxsel, it actually turns out to be practically trivial to put all the pieces together and create a working prototype of Unix PuTTY! It's missing a lot of things - notably GUI request boxes for host keys and logfiles and so forth, the Event Log, mid-session reconfiguration, session loading and saving, sensible population of the character sets drop-down list and probably other fiddly little things too - but it will put up a config box and then create a GUI window containing an SSH connection to the host you specified, so it's _basically_ there. Woo! [originally from svn r3020]
2003-03-29 19:52:50 +00:00
/* struct dlgparam *dp = (struct dlgparam *)data; */
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
gpointer fontsel = g_object_get_data(G_OBJECT(button), "user-data");
struct uctrl *uc = g_object_get_data(G_OBJECT(fontsel), "user-data");
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
const char *name = gtk_font_selection_dialog_get_font_name
(GTK_FONT_SELECTION_DIALOG(fontsel));
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
#else
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
unifontsel *fontsel = (unifontsel *)g_object_get_data
(G_OBJECT(button), "user-data");
Unified font selector dialog box. _Extremely_ unfinished - there's a sizable TODO at the top of gtkfont.c - but it's basically functional enough to select fonts of both types, so I'm checking it in now before I accidentally break it. [originally from svn r7938]
2008-03-25 21:49:14 +00:00
struct uctrl *uc = (struct uctrl *)fontsel->user_data;
char *name = unifontsel_get_name(fontsel);
Deal with the possibility of no valid font being selected at all during an entire run of unifontsel (because unifontsel_set_name was either not called at all, or called with a name that didn't correspond to any known font). In this situation we grey out the OK button until a valid font is selected, and we have unifontsel_get_name return NULL rather than failing an assertion if it should be called in that state. The current client code in gtkdlg.c should never encounter a NULL return, since it only calls it after the OK button is clicked, but I've stuck an assertion in there too on general principles. [originally from svn r7953]
2008-03-29 14:21:25 +00:00
assert(name); /* should always be ok after OK pressed */
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
Unified font selector dialog box. _Extremely_ unfinished - there's a sizable TODO at the top of gtkfont.c - but it's basically functional enough to select fonts of both types, so I'm checking it in now before I accidentally break it. [originally from svn r7938]
2008-03-25 21:49:14 +00:00
sfree(name);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#if GTK_CHECK_VERSION(3,0,0)
static void colourchoose_response(GtkDialog *dialog,
gint response_id, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = g_object_get_data(G_OBJECT(dialog), "user-data");
if (response_id == GTK_RESPONSE_OK) {
GdkRGBA rgba;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dialog), &rgba);
dp->coloursel_result.r = (int) (255 * rgba.red);
dp->coloursel_result.g = (int) (255 * rgba.green);
dp->coloursel_result.b = (int) (255 * rgba.blue);
dp->coloursel_result.ok = TRUE;
} else {
dp->coloursel_result.ok = FALSE;
}
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK);
gtk_widget_destroy(GTK_WIDGET(dialog));
}
#else /* GTK 1/2 coloursel response handlers */
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void coloursel_ok(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
gpointer coloursel = g_object_get_data(G_OBJECT(button), "user-data");
struct uctrl *uc = g_object_get_data(G_OBJECT(coloursel), "user-data");
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
GTK 3 prep: use gtk_color_selection_get_current_color(). Replaces the deprecated gtk_color_selection_set_color() which took an array of four doubles (RGBA), and instead takes a 'GdkColor' struct containing four 16-bit integers. For GTK1, we still have to retain the original version.
2015-08-08 16:32:15 +00:00
#if GTK_CHECK_VERSION(2,0,0)
{
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
GtkColorSelection *cs = GTK_COLOR_SELECTION
(gtk_color_selection_dialog_get_color_selection
(GTK_COLOR_SELECTION_DIALOG(coloursel)));
GTK 3 prep: use gtk_color_selection_get_current_color(). Replaces the deprecated gtk_color_selection_set_color() which took an array of four doubles (RGBA), and instead takes a 'GdkColor' struct containing four 16-bit integers. For GTK1, we still have to retain the original version.
2015-08-08 16:32:15 +00:00
GdkColor col;
gtk_color_selection_get_current_color(cs, &col);
dp->coloursel_result.r = col.red / 0x0100;
dp->coloursel_result.g = col.green / 0x0100;
dp->coloursel_result.b = col.blue / 0x0100;
}
#else
{
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
GtkColorSelection *cs = GTK_COLOR_SELECTION
(gtk_color_selection_dialog_get_color_selection
(GTK_COLOR_SELECTION_DIALOG(coloursel)));
GTK 3 prep: use gtk_color_selection_get_current_color(). Replaces the deprecated gtk_color_selection_set_color() which took an array of four doubles (RGBA), and instead takes a 'GdkColor' struct containing four 16-bit integers. For GTK1, we still have to retain the original version.
2015-08-08 16:32:15 +00:00
gdouble cvals[4];
gtk_color_selection_get_color(cs, cvals);
dp->coloursel_result.r = (int) (255 * cvals[0]);
dp->coloursel_result.g = (int) (255 * cvals[1]);
dp->coloursel_result.b = (int) (255 * cvals[2]);
}
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
dp->coloursel_result.ok = TRUE;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK);
}
static void coloursel_cancel(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
gpointer coloursel = g_object_get_data(G_OBJECT(button), "user-data");
struct uctrl *uc = g_object_get_data(G_OBJECT(coloursel), "user-data");
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
dp->coloursel_result.ok = FALSE;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK);
}
In GTK3, use the new GtkColorChooserDialog. This replaces the old GtkColorSelectionDialog, and has the convenience advantage that the actual chooser (with all the 'set colour', 'get colour' methods) and the containing dialog box are now the same object implementing multiple interfaces, so I don't keep having to call 'get me the underlying chooser for this dialog' accessors. Also you now hook into both the OK and Cancel buttons (and all other response codes) at the same time with a single event.
2015-08-22 13:49:02 +00:00
#endif /* end of coloursel response handlers */
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
static void filefont_clicked(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button));
if (uc->ctrl->generic.type == CTRL_FILESELECT) {
GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog. I've put in a special #define to control this selection, in case I decide that for reasons of taste I'd prefer to switch back to GtkFileSelection in GTK2 which supports both!
2015-08-08 16:34:25 +00:00
#ifdef USE_GTK_FILE_CHOOSER_DIALOG
GtkWidget *filechoose = gtk_file_chooser_dialog_new
(uc->ctrl->fileselect.title, GTK_WINDOW(dp->window),
(uc->ctrl->fileselect.for_writing ?
GTK_FILE_CHOOSER_ACTION_SAVE :
GTK_FILE_CHOOSER_ACTION_OPEN),
Stop using deprecated GTK_STOCK_* in GTK3. According to the GTK3 docs, we're now supposed to use fixed label strings instead.
2015-08-22 12:50:56 +00:00
STANDARD_CANCEL_LABEL, GTK_RESPONSE_CANCEL,
STANDARD_OPEN_LABEL, GTK_RESPONSE_ACCEPT,
GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog. I've put in a special #define to control this selection, in case I decide that for reasons of taste I'd prefer to switch back to GtkFileSelection in GTK2 which supports both!
2015-08-08 16:34:25 +00:00
(const gchar *)NULL);
gtk_window_set_modal(GTK_WINDOW(filechoose), TRUE);
g_object_set_data(G_OBJECT(filechoose), "user-data", (gpointer)uc);
g_signal_connect(G_OBJECT(filechoose), "response",
G_CALLBACK(filechoose_response), (gpointer)dp);
gtk_widget_show(filechoose);
#else
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
GtkWidget *filesel =
gtk_file_selection_new(uc->ctrl->fileselect.title);
gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data
(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "user-data",
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
(gpointer)filesel);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data(G_OBJECT(filesel), "user-data", (gpointer)uc);
g_signal_connect
(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
G_CALLBACK(filesel_ok), (gpointer)dp);
g_signal_connect_swapped
(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
G_CALLBACK(gtk_widget_destroy), (gpointer)filesel);
g_signal_connect_swapped
(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked",
G_CALLBACK(gtk_widget_destroy), (gpointer)filesel);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
gtk_widget_show(filesel);
GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog. I've put in a special #define to control this selection, in case I decide that for reasons of taste I'd prefer to switch back to GtkFileSelection in GTK2 which supports both!
2015-08-08 16:34:25 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
if (uc->ctrl->generic.type == CTRL_FONTSELECT) {
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
const gchar *fontname = gtk_entry_get_text(GTK_ENTRY(uc->entry));
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
/*
* Use the GTK 1 standard font selector.
*/
gchar *spacings[] = { "c", "m", NULL };
GtkWidget *fontsel =
gtk_font_selection_dialog_new("Select a font");
gtk_window_set_modal(GTK_WINDOW(fontsel), TRUE);
gtk_font_selection_dialog_set_filter
(GTK_FONT_SELECTION_DIALOG(fontsel),
GTK_FONT_FILTER_BASE, GTK_FONT_ALL,
NULL, NULL, NULL, NULL, spacings, NULL);
if (!gtk_font_selection_dialog_set_font_name
(GTK_FONT_SELECTION_DIALOG(fontsel), fontname)) {
/*
* If the font name wasn't found as it was, try opening
* it and extracting its FONT property. This should
* have the effect of mapping short aliases into true
* XLFDs.
*/
GdkFont *font = gdk_font_load(fontname);
if (font) {
XFontStruct *xfs = GDK_FONT_XFONT(font);
Display *disp = GDK_FONT_XDISPLAY(font);
Atom fontprop = XInternAtom(disp, "FONT", False);
unsigned long ret;
gdk_font_ref(font);
if (XGetFontProperty(xfs, fontprop, &ret)) {
char *name = XGetAtomName(disp, (Atom)ret);
if (name)
gtk_font_selection_dialog_set_font_name
(GTK_FONT_SELECTION_DIALOG(fontsel), name);
}
gdk_font_unref(font);
}
}
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data
(G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button),
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
"user-data", (gpointer)fontsel);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data(G_OBJECT(fontsel), "user-data", (gpointer)uc);
g_signal_connect
(G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button),
"clicked", G_CALLBACK(fontsel_ok), (gpointer)dp);
g_signal_connect_swapped
(G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button),
"clicked", G_CALLBACK(gtk_widget_destroy),
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
(gpointer)fontsel);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect_swapped
(G_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->cancel_button),
"clicked", G_CALLBACK(gtk_widget_destroy),
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
(gpointer)fontsel);
gtk_widget_show(fontsel);
#else /* !GTK_CHECK_VERSION(2,0,0) */
/*
* Use the unifontsel code provided in gtkfont.c.
*/
Unified font selector dialog box. _Extremely_ unfinished - there's a sizable TODO at the top of gtkfont.c - but it's basically functional enough to select fonts of both types, so I'm checking it in now before I accidentally break it. [originally from svn r7938]
2008-03-25 21:49:14 +00:00
unifontsel *fontsel = unifontsel_new("Select a font");
gtk_window_set_modal(fontsel->window, TRUE);
unifontsel_set_name(fontsel, fontname);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data(G_OBJECT(fontsel->ok_button),
"user-data", (gpointer)fontsel);
Unified font selector dialog box. _Extremely_ unfinished - there's a sizable TODO at the top of gtkfont.c - but it's basically functional enough to select fonts of both types, so I'm checking it in now before I accidentally break it. [originally from svn r7938]
2008-03-25 21:49:14 +00:00
fontsel->user_data = uc;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(fontsel->ok_button), "clicked",
G_CALLBACK(fontsel_ok), (gpointer)dp);
g_signal_connect_swapped(G_OBJECT(fontsel->ok_button), "clicked",
G_CALLBACK(unifontsel_destroy),
(gpointer)fontsel);
g_signal_connect_swapped(G_OBJECT(fontsel->cancel_button),"clicked",
G_CALLBACK(unifontsel_destroy),
(gpointer)fontsel);
Unified font selector dialog box. _Extremely_ unfinished - there's a sizable TODO at the top of gtkfont.c - but it's basically functional enough to select fonts of both types, so I'm checking it in now before I accidentally break it. [originally from svn r7938]
2008-03-25 21:49:14 +00:00
gtk_widget_show(GTK_WIDGET(fontsel->window));
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif /* !GTK_CHECK_VERSION(2,0,0) */
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
}
}
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
static void label_sizealloc(GtkWidget *widget, GtkAllocation *alloc,
gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, widget);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
gtk_widget_set_size_request(uc->text, alloc->width, -1);
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
gtk_label_set_text(GTK_LABEL(uc->text), uc->ctrl->generic.label);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_handler_disconnect(G_OBJECT(uc->text), uc->textsig);
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
}
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
#endif
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
/* ----------------------------------------------------------------------
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
* This function does the main layout work: it reads a controlset,
* it creates the relevant GTK controls, and returns a GtkWidget
* containing the result. (This widget might be a title of some
* sort, it might be a Columns containing many controls, or it
* might be a GtkFrame containing a Columns; whatever it is, it's
* definitely a GtkWidget and should probably be added to a
* GtkVbox.)
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
*
* `win' is required for setting the default button. If it is
* non-NULL, all buttons created will be default-capable (so they
* have extra space round them for the default highlight).
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
*/
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
struct controlset *s, GtkWindow *win)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Columns *cols;
GtkWidget *ret;
int i;
if (!s->boxname && s->boxtitle) {
/* This controlset is a panel title. */
return gtk_label_new(s->boxtitle);
}
/*
* Otherwise, we expect to be laying out actual controls, so
* we'll start by creating a Columns for the purpose.
*/
cols = COLUMNS(columns_new(4));
ret = GTK_WIDGET(cols);
gtk_widget_show(ret);
/*
* Create a containing frame if we have a box name.
*/
if (*s->boxname) {
ret = gtk_frame_new(s->boxtitle); /* NULL is valid here */
gtk_container_set_border_width(GTK_CONTAINER(cols), 4);
gtk_container_add(GTK_CONTAINER(ret), GTK_WIDGET(cols));
gtk_widget_show(ret);
}
/*
* Now iterate through the controls themselves, create them,
* and add them to the Columns.
*/
for (i = 0; i < s->ncontrols; i++) {
union control *ctrl = s->ctrls[i];
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
struct uctrl *uc;
int left = FALSE;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
GtkWidget *w = NULL;
switch (ctrl->generic.type) {
case CTRL_COLUMNS:
{
static const int simplecols[1] = { 100 };
columns_set_cols(cols, ctrl->columns.ncols,
(ctrl->columns.percentages ?
ctrl->columns.percentages : simplecols));
}
continue; /* no actual control created */
case CTRL_TABDELAY:
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
{
struct uctrl *uc = dlg_find_byctrl(dp, ctrl->tabdelay.ctrl);
if (uc)
columns_taborder_last(cols, uc->toplevel);
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
continue; /* no actual control created */
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
}
Introduced wrapper macros snew(), snewn() and sresize() for the malloc functions, which automatically cast to the same type they're allocating the size of. Should prevent any future errors involving mallocing the size of the wrong structure type, and will also make life easier if we ever need to turn the PuTTY core code from real C into C++-friendly C. I haven't touched the Mac frontend in this checkin because I couldn't compile or test it. [originally from svn r3014]
2003-03-29 16:14:26 +00:00
uc = snew(struct uctrl);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
uc->ctrl = ctrl;
uc->buttons = NULL;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
uc->entry = NULL;
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
uc->list = uc->menu = uc->optmenu = NULL;
#else
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
uc->combo = NULL;
#endif
#if GTK_CHECK_VERSION(2,0,0)
uc->treeview = NULL;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
uc->listmodel = NULL;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
uc->button = uc->text = NULL;
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
uc->label = NULL;
Patch from John Sullivan: process double-clicks in the session list box on button-up rather than button-down. The effect of this is that if a saved session is already selected in the list box and then you double-click it, it will open rather than beeping annoyingly. [originally from svn r7414]
2007-03-27 18:16:36 +00:00
uc->nclicks = 0;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
switch (ctrl->generic.type) {
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
case CTRL_BUTTON:
w = gtk_button_new_with_label(ctrl->generic.label);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
if (win) {
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_widget_set_can_default(w, TRUE);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
if (ctrl->button.isdefault)
gtk_window_set_default(win, w);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
if (ctrl->button.iscancel)
dp->cancelbutton = w;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
}
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(button_clicked), dp);
g_signal_connect(G_OBJECT(w), "focus_in_event",
G_CALLBACK(widget_focus), dp);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
shortcut_add(scs, gtk_bin_get_child(GTK_BIN(w)),
ctrl->button.shortcut, SHORTCUT_UCTRL, uc);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
break;
case CTRL_CHECKBOX:
w = gtk_check_button_new_with_label(ctrl->generic.label);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(w), "toggled",
G_CALLBACK(button_toggled), dp);
g_signal_connect(G_OBJECT(w), "focus_in_event",
G_CALLBACK(widget_focus), dp);
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
shortcut_add(scs, gtk_bin_get_child(GTK_BIN(w)),
ctrl->checkbox.shortcut, SHORTCUT_UCTRL, uc);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
left = TRUE;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
break;
case CTRL_RADIO:
/*
* Radio buttons get to go inside their own Columns, no
* matter what.
*/
{
gint i, *percentages;
GSList *group;
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
w = columns_new(0);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
if (ctrl->generic.label) {
GtkWidget *label = gtk_label_new(ctrl->generic.label);
columns_add(COLUMNS(w), label, 0, 1);
columns_force_left_align(COLUMNS(w), label);
gtk_widget_show(label);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
shortcut_add(scs, label, ctrl->radio.shortcut,
SHORTCUT_UCTRL, uc);
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
uc->label = label;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
percentages = g_new(gint, ctrl->radio.ncolumns);
for (i = 0; i < ctrl->radio.ncolumns; i++) {
percentages[i] =
((100 * (i+1) / ctrl->radio.ncolumns) -
100 * i / ctrl->radio.ncolumns);
}
columns_set_cols(COLUMNS(w), ctrl->radio.ncolumns,
percentages);
g_free(percentages);
group = NULL;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
uc->nbuttons = ctrl->radio.nbuttons;
Introduced wrapper macros snew(), snewn() and sresize() for the malloc functions, which automatically cast to the same type they're allocating the size of. Should prevent any future errors involving mallocing the size of the wrong structure type, and will also make life easier if we ever need to turn the PuTTY core code from real C into C++-friendly C. I haven't touched the Mac frontend in this checkin because I couldn't compile or test it. [originally from svn r3014]
2003-03-29 16:14:26 +00:00
uc->buttons = snewn(uc->nbuttons, GtkWidget *);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
for (i = 0; i < ctrl->radio.nbuttons; i++) {
GtkWidget *b;
gint colstart;
b = (gtk_radio_button_new_with_label
(group, ctrl->radio.buttons[i]));
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
uc->buttons[i] = b;
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(b));
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
colstart = i % ctrl->radio.ncolumns;
columns_add(COLUMNS(w), b, colstart,
(i == ctrl->radio.nbuttons-1 ?
ctrl->radio.ncolumns - colstart : 1));
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
columns_force_left_align(COLUMNS(w), b);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_widget_show(b);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(b), "toggled",
G_CALLBACK(button_toggled), dp);
g_signal_connect(G_OBJECT(b), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
if (ctrl->radio.shortcuts) {
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
shortcut_add(scs, gtk_bin_get_child(GTK_BIN(b)),
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
ctrl->radio.shortcuts[i],
SHORTCUT_UCTRL, uc);
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
}
break;
case CTRL_EDITBOX:
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
{
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
GtkWidget *signalobject;
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
if (ctrl->editbox.has_list) {
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
/*
* GTK 1 combo box.
*/
w = gtk_combo_new();
gtk_combo_set_value_in_list(GTK_COMBO(w), FALSE, TRUE);
uc->entry = GTK_COMBO(w)->entry;
uc->list = GTK_COMBO(w)->list;
signalobject = uc->entry;
#else
/*
* GTK 2 combo box.
*/
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
uc->listmodel = gtk_list_store_new(2, G_TYPE_INT,
G_TYPE_STRING);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
w = gtk_combo_box_new_with_model_and_entry
(GTK_TREE_MODEL(uc->listmodel));
Set "entry-text-column" on our combo boxes. When we provide an editable text box with a drop-down list of useful preset values, such as the one full of character sets in the Translation panel, we implement it on GTK 2.4+ as a GtkComboBox pointing at a two-column GtkListStore, in which the second column is the actual text (the first being a numeric id). Therefore, we need to set the "entry-text-column" property to tell GtkComboBox which of those columns to look in for the value corresponding to the edit-box text. Thanks to Robert de Bath for spotting the problem and tracing it as far as commit 5fa22495c. That commit replaced a widget construction call via gtk_combo_box_entry_new_with_model() with one using the newer gtk_combo_box_new_with_model_and_entry(), overlooking the fact that the former provided the text column number as a parameter, and the latter didn't.
2015-12-06 07:23:59 +00:00
g_object_set(G_OBJECT(w), "entry-text-column", 1,
(const char *)NULL);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
/* We cannot support password combo boxes. */
assert(!ctrl->editbox.password);
uc->combo = w;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
signalobject = uc->combo;
#endif
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
} else {
w = gtk_entry_new();
if (ctrl->editbox.password)
gtk_entry_set_visibility(GTK_ENTRY(w), FALSE);
uc->entry = w;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
signalobject = w;
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
uc->entrysig =
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(signalobject), "changed",
G_CALLBACK(editbox_changed), dp);
g_signal_connect(G_OBJECT(signalobject), "key_press_event",
G_CALLBACK(editbox_key), dp);
g_signal_connect(G_OBJECT(signalobject), "focus_in_event",
G_CALLBACK(widget_focus), dp);
g_signal_connect(G_OBJECT(signalobject), "focus_out_event",
G_CALLBACK(editbox_lostfocus), dp);
g_signal_connect(G_OBJECT(signalobject), "focus_out_event",
G_CALLBACK(editbox_lostfocus), dp);
Use GTK3's method of setting GtkEntry min width. The config box setup code wants a lot of very narrow edit boxes, so it decreases their minimum width from the GTK default of 150 pixels. In GTK 3, we have to do this using gtk_entry_set_width_chars() rather than gtk_widget_set_size_request() as we were previously using, or it won't work. This change by itself seems to restore the GTK3 config box to a sensible layout, in spite of the fact that my Columns layout class is still doing all its size allocation the GTK2 way, with no attention paid to the shiny new GTK3 height-for-width system.
2015-08-22 09:37:48 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
/*
* Edit boxes, for some strange reason, have a minimum
* width of 150 in GTK 1.2. We don't want this - we'd
* rather the edit boxes acquired their natural width
* from the column layout of the rest of the box.
*/
Use columns_force_same_height() for vertical centring. In cases where two controls sit alongside one another such as a label alongside an edit box, I've previously been arranging for them to be vertically centred by fiddling with the size request and alignment of what I assume will be the shorter control. But now I've written columns_force_same_height(), that's a much easier approach, and it's also compatible with GTK3 without using a deprecated method; so this change switches over all vertical centring to doing it that way. Also, while I'm here, I noticed that the edit box and button of CTRL_FILESELECT / CTRL_FONTSELECT were not vertically centred, and since it's now really easy to make sure they are, I've added another use of columns_force_same_height() there.
2015-08-24 18:23:38 +00:00
{
GtkRequisition req;
gtk_widget_size_request(w, &req);
gtk_widget_set_size_request(w, 10, req.height);
}
Use GTK3's method of setting GtkEntry min width. The config box setup code wants a lot of very narrow edit boxes, so it decreases their minimum width from the GTK default of 150 pixels. In GTK 3, we have to do this using gtk_entry_set_width_chars() rather than gtk_widget_set_size_request() as we were previously using, or it won't work. This change by itself seems to restore the GTK3 config box to a sensible layout, in spite of the fact that my Columns layout class is still doing all its size allocation the GTK2 way, with no attention paid to the shiny new GTK3 height-for-width system.
2015-08-22 09:37:48 +00:00
#else
/*
* In GTK 3, this is still true, but there's a special
* method for GtkEntry in particular to fix it.
*/
if (GTK_IS_ENTRY(w))
gtk_entry_set_width_chars(GTK_ENTRY(w), 1);
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
if (ctrl->generic.label) {
GtkWidget *label, *container;
label = gtk_label_new(ctrl->generic.label);
shortcut_add(scs, label, ctrl->editbox.shortcut,
SHORTCUT_FOCUS, uc->entry);
container = columns_new(4);
if (ctrl->editbox.percentwidth == 100) {
columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label);
columns_add(COLUMNS(container), w, 0, 1);
} else {
gint percentages[2];
percentages[1] = ctrl->editbox.percentwidth;
percentages[0] = 100 - ctrl->editbox.percentwidth;
columns_set_cols(COLUMNS(container), 2, percentages);
columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label);
columns_add(COLUMNS(container), w, 1, 1);
Use columns_force_same_height() for vertical centring. In cases where two controls sit alongside one another such as a label alongside an edit box, I've previously been arranging for them to be vertically centred by fiddling with the size request and alignment of what I assume will be the shorter control. But now I've written columns_force_same_height(), that's a much easier approach, and it's also compatible with GTK3 without using a deprecated method; so this change switches over all vertical centring to doing it that way. Also, while I'm here, I noticed that the edit box and button of CTRL_FILESELECT / CTRL_FONTSELECT were not vertically centred, and since it's now really easy to make sure they are, I've added another use of columns_force_same_height() there.
2015-08-24 18:23:38 +00:00
columns_force_same_height(COLUMNS(container),
label, w);
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
}
gtk_widget_show(label);
gtk_widget_show(w);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
w = container;
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
uc->label = label;
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
}
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
break;
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
case CTRL_FILESELECT:
case CTRL_FONTSELECT:
{
GtkWidget *ww;
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
const char *browsebtn =
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
(ctrl->generic.type == CTRL_FILESELECT ?
"Browse..." : "Change...");
gint percentages[] = { 75, 25 };
w = columns_new(4);
columns_set_cols(COLUMNS(w), 2, percentages);
if (ctrl->generic.label) {
ww = gtk_label_new(ctrl->generic.label);
columns_add(COLUMNS(w), ww, 0, 2);
columns_force_left_align(COLUMNS(w), ww);
gtk_widget_show(ww);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
shortcut_add(scs, ww,
(ctrl->generic.type == CTRL_FILESELECT ?
ctrl->fileselect.shortcut :
ctrl->fontselect.shortcut),
SHORTCUT_UCTRL, uc);
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
uc->label = ww;
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
}
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
uc->entry = ww = gtk_entry_new();
Another GTK3 fix for GtkEntry width. When I committed 5e738877b the other day, I missed another case of the same thing in the file/font selector handling.
2015-08-24 18:04:37 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
{
GtkRequisition req;
gtk_widget_size_request(ww, &req);
gtk_widget_set_size_request(ww, 10, req.height);
}
#else
gtk_entry_set_width_chars(GTK_ENTRY(ww), 1);
#endif
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
columns_add(COLUMNS(w), ww, 0, 1);
gtk_widget_show(ww);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
uc->button = ww = gtk_button_new_with_label(browsebtn);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
columns_add(COLUMNS(w), ww, 1, 1);
gtk_widget_show(ww);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Use columns_force_same_height() for vertical centring. In cases where two controls sit alongside one another such as a label alongside an edit box, I've previously been arranging for them to be vertically centred by fiddling with the size request and alignment of what I assume will be the shorter control. But now I've written columns_force_same_height(), that's a much easier approach, and it's also compatible with GTK3 without using a deprecated method; so this change switches over all vertical centring to doing it that way. Also, while I'm here, I noticed that the edit box and button of CTRL_FILESELECT / CTRL_FONTSELECT were not vertically centred, and since it's now really easy to make sure they are, I've added another use of columns_force_same_height() there.
2015-08-24 18:23:38 +00:00
columns_force_same_height(COLUMNS(w), uc->entry, uc->button);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(uc->entry), "key_press_event",
G_CALLBACK(editbox_key), dp);
A nasty GTK signal cascade was causing any edit box whose contents was modified on session load to be blanked. More details in the comment in dlg_editbox_set(). [originally from svn r7161]
2007-01-25 19:47:36 +00:00
uc->entrysig =
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(uc->entry), "changed",
G_CALLBACK(editbox_changed), dp);
g_signal_connect(G_OBJECT(uc->entry), "focus_in_event",
G_CALLBACK(widget_focus), dp);
g_signal_connect(G_OBJECT(uc->button), "focus_in_event",
G_CALLBACK(widget_focus), dp);
g_signal_connect(G_OBJECT(ww), "clicked",
G_CALLBACK(filefont_clicked), dp);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
}
break;
case CTRL_LISTBOX:
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if GTK_CHECK_VERSION(2,0,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
/*
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
* First construct the list data store, with the right
* number of columns.
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
*/
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
# if !GTK_CHECK_VERSION(2,4,0)
/* (For GTK 2.0 to 2.3, we do this for full listboxes only,
* because combo boxes are still done the old GTK1 way.) */
if (ctrl->listbox.height > 0)
# endif
{
GType *types;
int i;
int cols;
cols = ctrl->listbox.ncols;
cols = cols ? cols : 1;
types = snewn(1 + cols, GType);
types[0] = G_TYPE_INT;
for (i = 0; i < cols; i++)
types[i+1] = G_TYPE_STRING;
uc->listmodel = gtk_list_store_newv(1 + cols, types);
sfree(types);
}
#endif
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
/*
* See if it's a drop-down list (non-editable combo
* box).
*/
if (ctrl->listbox.height == 0) {
#if !GTK_CHECK_VERSION(2,4,0)
/*
* GTK1 and early-GTK2 option-menu style of
* drop-down list.
*/
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
uc->optmenu = w = gtk_option_menu_new();
uc->menu = gtk_menu_new();
gtk_option_menu_set_menu(GTK_OPTION_MENU(w), uc->menu);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set_data(G_OBJECT(uc->menu), "user-data",
(gpointer)uc->optmenu);
g_signal_connect(G_OBJECT(uc->optmenu), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#else
/*
* Late-GTK2 style using a GtkComboBox.
*/
GtkCellRenderer *cr;
/*
* Create a non-editable GtkComboBox (that is, not
* its subclass GtkComboBoxEntry).
*/
w = gtk_combo_box_new_with_model
(GTK_TREE_MODEL(uc->listmodel));
uc->combo = w;
/*
* Tell it how to render a list item (i.e. which
* column to look at in the list model).
*/
cr = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(w), cr, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(w), cr,
"text", 1, NULL);
/*
* And tell it to notify us when the selection
* changes.
*/
g_signal_connect(G_OBJECT(w), "changed",
G_CALLBACK(droplist_selchange), dp);
Add some missing GTK focus-in event handlers. Fixes a behaviour which I intended all along but apparently didn't work before on GTK: if you start PuTTY, _select_ a saved session in the list box but don't hit Load, and then just hit Open, then it will be implicitly loaded and run for you, as a special case to save you an extra button-press. This depends on noticing that the saved-sessions list box last had the focus, for which I need my widget_focus() handler to be called for basically all config widgets so that I can track what _did_ last have focus. Unfortunately, I missed a couple out.
2015-09-26 10:48:21 +00:00
g_signal_connect(G_OBJECT(w), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#endif
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
} else {
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
/*
* GTK1-style full list box.
*/
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
uc->list = gtk_list_new();
if (ctrl->listbox.multisel == 2) {
gtk_list_set_selection_mode(GTK_LIST(uc->list),
GTK_SELECTION_EXTENDED);
} else if (ctrl->listbox.multisel == 1) {
gtk_list_set_selection_mode(GTK_LIST(uc->list),
GTK_SELECTION_MULTIPLE);
} else {
gtk_list_set_selection_mode(GTK_LIST(uc->list),
GTK_SELECTION_SINGLE);
}
w = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(w),
uc->list);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
uc->adj = gtk_scrolled_window_get_vadjustment
(GTK_SCROLLED_WINDOW(w));
gtk_widget_show(uc->list);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(uc->list), "selection-changed",
G_CALLBACK(list_selchange), dp);
g_signal_connect(G_OBJECT(uc->list), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
/*
* Adjust the height of the scrolled window to the
* minimum given by the height parameter.
*
* This piece of guesswork is a horrid hack based
* on looking inside the GTK 1.2 sources
* (specifically gtkviewport.c, which appears to be
* the widget which provides the border around the
* scrolling area). Anyone lets me know how I can
* do this in a way which isn't at risk from GTK
* upgrades, I'd be grateful.
*/
{
int edge;
edge = GTK_WIDGET(uc->list)->style->klass->ythickness;
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
gtk_widget_set_size_request(w, 10,
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
2*edge + (ctrl->listbox.height *
get_listitemheight(w)));
}
if (ctrl->listbox.draglist) {
/*
* GTK doesn't appear to make it easy to
* implement a proper draggable list; so
* instead I'm just going to have to put an Up
* and a Down button to the right of the actual
* list box. Ah well.
*/
GtkWidget *cols, *button;
static const gint percentages[2] = { 80, 20 };
cols = columns_new(4);
columns_set_cols(COLUMNS(cols), 2, percentages);
columns_add(COLUMNS(cols), w, 0, 1);
gtk_widget_show(w);
button = gtk_button_new_with_label("Up");
columns_add(COLUMNS(cols), button, 1, 1);
gtk_widget_show(button);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(draglist_up), dp);
g_signal_connect(G_OBJECT(button), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
button = gtk_button_new_with_label("Down");
columns_add(COLUMNS(cols), button, 1, 1);
gtk_widget_show(button);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(draglist_down), dp);
g_signal_connect(G_OBJECT(button), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
w = cols;
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
/*
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
* GTK2 treeview-based full list box.
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
*/
GtkTreeSelection *sel;
/*
* Create the list box itself, its columns, and
* its containing scrolled window.
*/
w = gtk_tree_view_new_with_model
(GTK_TREE_MODEL(uc->listmodel));
g_object_set_data(G_OBJECT(uc->listmodel), "user-data",
(gpointer)w);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(w));
gtk_tree_selection_set_mode
(sel, ctrl->listbox.multisel ? GTK_SELECTION_MULTIPLE :
GTK_SELECTION_SINGLE);
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
uc->treeview = w;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(w), "row-activated",
G_CALLBACK(listbox_doubleclick), dp);
Add some missing GTK focus-in event handlers. Fixes a behaviour which I intended all along but apparently didn't work before on GTK: if you start PuTTY, _select_ a saved session in the list box but don't hit Load, and then just hit Open, then it will be implicitly loaded and run for you, as a special case to save you an extra button-press. This depends on noticing that the saved-sessions list box last had the focus, for which I need my widget_focus() handler to be called for basically all config widgets so that I can track what _did_ last have focus. Unfortunately, I missed a couple out.
2015-09-26 10:48:21 +00:00
g_signal_connect(G_OBJECT(w), "focus_in_event",
G_CALLBACK(widget_focus), dp);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
g_signal_connect(G_OBJECT(sel), "changed",
G_CALLBACK(listbox_selchange), dp);
if (ctrl->listbox.draglist) {
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(w), TRUE);
g_signal_connect(G_OBJECT(uc->listmodel), "row-inserted",
G_CALLBACK(listbox_reorder), dp);
}
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
{
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
int i;
int cols;
cols = ctrl->listbox.ncols;
cols = cols ? cols : 1;
for (i = 0; i < cols; i++) {
GtkTreeViewColumn *column;
Add an option to suppress horizontal scroll bars in list boxes. I'm about to add a list box which expects to contain some very long but uninformative strings, and which is also quite vertically squashed so there's not much room for a horizontal scroll bar to appear in it. So here's an option in the list box specification structure which causes the constructed GTKTreeView to use the 'ellipsize' option for all its cell renderers, i.e. too-long strings are truncated with an ellipsis. Windows needs no change, because its list boxes already work this way. [originally from svn r10219]
2014-09-09 11:46:14 +00:00
GtkCellRenderer *cellrend;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
/*
* It appears that GTK 2 doesn't leave us any
* particularly sensible way to honour the
* "percentages" specification in the ctrl
* structure.
*/
Add an option to suppress horizontal scroll bars in list boxes. I'm about to add a list box which expects to contain some very long but uninformative strings, and which is also quite vertically squashed so there's not much room for a horizontal scroll bar to appear in it. So here's an option in the list box specification structure which causes the constructed GTKTreeView to use the 'ellipsize' option for all its cell renderers, i.e. too-long strings are truncated with an ellipsis. Windows needs no change, because its list boxes already work this way. [originally from svn r10219]
2014-09-09 11:46:14 +00:00
cellrend = gtk_cell_renderer_text_new();
if (!ctrl->listbox.hscroll) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_set(G_OBJECT(cellrend),
"ellipsize", PANGO_ELLIPSIZE_END,
"ellipsize-set", TRUE,
Add a missing cast in g_object_set. When NULL appears in variadic argument lists, it should be cast to the pointer type that the function will be expecting, because otherwise it might end up as a type not even the same size as a pointer.
2015-08-31 13:36:12 +00:00
(const char *)NULL);
Add an option to suppress horizontal scroll bars in list boxes. I'm about to add a list box which expects to contain some very long but uninformative strings, and which is also quite vertically squashed so there's not much room for a horizontal scroll bar to appear in it. So here's an option in the list box specification structure which causes the constructed GTKTreeView to use the 'ellipsize' option for all its cell renderers, i.e. too-long strings are truncated with an ellipsis. Windows needs no change, because its list boxes already work this way. [originally from svn r10219]
2014-09-09 11:46:14 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
column = gtk_tree_view_column_new_with_attributes
Add an option to suppress horizontal scroll bars in list boxes. I'm about to add a list box which expects to contain some very long but uninformative strings, and which is also quite vertically squashed so there's not much room for a horizontal scroll bar to appear in it. So here's an option in the list box specification structure which causes the constructed GTKTreeView to use the 'ellipsize' option for all its cell renderers, i.e. too-long strings are truncated with an ellipsis. Windows needs no change, because its list boxes already work this way. [originally from svn r10219]
2014-09-09 11:46:14 +00:00
("heading", cellrend, "text", i+1, (char *)NULL);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
gtk_tree_view_column_set_sizing
(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
}
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
{
GtkWidget *scroll;
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type
(GTK_SCROLLED_WINDOW(scroll), GTK_SHADOW_IN);
gtk_widget_show(w);
gtk_container_add(GTK_CONTAINER(scroll), w);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_widget_set_size_request
(scroll, -1,
ctrl->listbox.height * get_listitemheight(w));
w = scroll;
}
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#endif
}
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (ctrl->generic.label) {
GtkWidget *label, *container;
label = gtk_label_new(ctrl->generic.label);
Compile fixes for GTK1 after recent work. The whole of get_label_text_dimensions() should have been outside the GTK 2 ifdef; I'd left a gtk_label_set_width_chars() unconditional; and GDK1's gdk_window_set_background() lacks a const in its prototype. Serves me right for not test-compiling in all three versions!
2015-08-25 18:50:23 +00:00
#if GTK_CHECK_VERSION(3,0,0)
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
gtk_label_set_width_chars(GTK_LABEL(label), 3);
Compile fixes for GTK1 after recent work. The whole of get_label_text_dimensions() should have been outside the GTK 2 ifdef; I'd left a gtk_label_set_width_chars() unconditional; and GDK1's gdk_window_set_background() lacks a const in its prototype. Serves me right for not test-compiling in all three versions!
2015-08-25 18:50:23 +00:00
#endif
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
shortcut_add(scs, label, ctrl->listbox.shortcut,
Fix GTK keyboard-shortcut focusing of CTRL_LISTBOX. I had put an entire piece of code into win_key_press's SHORTCUT_UCTRL handler to carefully handle all the different kinds of list box control and do something sensible with each one, and then I just went and used a generic SHORTCUT_FOCUS type shortcut instead of actually _calling_ all that carefully prepared code. Now selecting (say) the character-classes list box in the Selection panel using its Alt-e shortcut works; also, shortcut-selecting a popup menu such as the ones in the Bugs panel causes the menu to pop up, which I think is nicer than what previously happened.
2015-09-26 12:22:49 +00:00
SHORTCUT_UCTRL, uc);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
container = columns_new(4);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
if (ctrl->listbox.percentwidth == 100) {
columns_add(COLUMNS(container), label, 0, 1);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
columns_force_left_align(COLUMNS(container), label);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
columns_add(COLUMNS(container), w, 0, 1);
} else {
gint percentages[2];
percentages[1] = ctrl->listbox.percentwidth;
percentages[0] = 100 - ctrl->listbox.percentwidth;
columns_set_cols(COLUMNS(container), 2, percentages);
columns_add(COLUMNS(container), label, 0, 1);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
columns_force_left_align(COLUMNS(container), label);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
columns_add(COLUMNS(container), w, 1, 1);
Use columns_force_same_height() for vertical centring. In cases where two controls sit alongside one another such as a label alongside an edit box, I've previously been arranging for them to be vertically centred by fiddling with the size request and alignment of what I assume will be the shorter control. But now I've written columns_force_same_height(), that's a much easier approach, and it's also compatible with GTK3 without using a deprecated method; so this change switches over all vertical centring to doing it that way. Also, while I'm here, I noticed that the edit box and button of CTRL_FILESELECT / CTRL_FONTSELECT were not vertically centred, and since it's now really easy to make sure they are, I've added another use of columns_force_same_height() there.
2015-08-24 18:23:38 +00:00
columns_force_same_height(COLUMNS(container),
label, w);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
}
gtk_widget_show(label);
gtk_widget_show(w);
w = container;
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
uc->label = label;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
}
break;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
case CTRL_TEXT:
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
/*
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
* Wrapping text widgets don't sit well with the GTK2
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
* layout model, in which widgets state a minimum size
* and the whole window then adjusts to the smallest
* size it can sensibly take given its contents. A
* wrapping text widget _has_ no clear minimum size;
* instead it has a range of possibilities. It can be
* one line deep but 2000 wide, or two lines deep and
* 1000 pixels, or three by 867, or four by 500 and so
* on. It can be as short as you like provided you
* don't mind it being wide, or as narrow as you like
* provided you don't mind it being tall.
*
* Therefore, it fits very badly into the layout model.
* Hence the only thing to do is pick a width and let
* it choose its own number of lines. To do this I'm
* going to cheat a little. All new wrapping text
* widgets will be created with a minimal text content
* "X"; then, after the rest of the dialog box is set
* up and its size calculated, the text widgets will be
* told their width and given their real text, which
* will cause the size to be recomputed in the y
* direction (because many of them will expand to more
* than one line).
*/
uc->text = w = gtk_label_new("X");
uc->textsig =
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(w), "size-allocate",
G_CALLBACK(label_sizealloc), dp);
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
#else
/*
* In GTK3, this is all fixed, because the main aim of the
* new 'height-for-width' geometry management is to make
* wrapping labels behave sensibly. So now we can just do
* the obvious thing.
*/
uc->text = w = gtk_label_new(uc->ctrl->generic.label);
#endif
Avoid deprecated gtk_misc_set_alignment(). As of GTK 3.16 (but not in previous GTK 3 versions), there's a new gtk_label_set_xalign which does this job.
2015-08-31 12:57:34 +00:00
align_label_left(GTK_LABEL(w));
In GTK3, omit our GTK 1/2 workaround for wrapping labels. Now we're properly implementing the GTK3 height-for-width layout model, this bodge is no longer necessary.
2015-08-23 14:01:07 +00:00
gtk_label_set_line_wrap(GTK_LABEL(w), TRUE);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
break;
}
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
assert(w != NULL);
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
columns_add(cols, w,
COLUMN_START(ctrl->generic.column),
COLUMN_SPAN(ctrl->generic.column));
if (left)
columns_force_left_align(cols, w);
gtk_widget_show(w);
uc->toplevel = w;
dlg_add_uctrl(dp, uc);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
return ret;
}
struct selparam {
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
struct dlgparam *dp;
Colin Watson points out that there was no need for me to write the custom Panels container widget for the PuTTY config box, since the perfectly standard GtkNotebook does the same job. Hence, let's remove Panels completely in favour of doing it the proper way. [originally from svn r7034]
2006-12-29 14:35:34 +00:00
GtkNotebook *panels;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
GtkWidget *panel;
#if !GTK_CHECK_VERSION(2,0,0)
GtkWidget *treeitem;
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
#else
int depth;
GtkTreePath *treepath;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
struct Shortcuts shortcuts;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
};
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
static void treeselection_changed(GtkTreeSelection *treeselection,
gpointer data)
{
struct selparam *sps = (struct selparam *)data, *sp;
GtkTreeModel *treemodel;
GtkTreeIter treeiter;
gint spindex;
gint page_num;
if (!gtk_tree_selection_get_selected(treeselection, &treemodel, &treeiter))
return;
gtk_tree_model_get(treemodel, &treeiter, TREESTORE_PARAMS, &spindex, -1);
sp = &sps[spindex];
page_num = gtk_notebook_page_num(sp->panels, sp->panel);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
gtk_notebook_set_current_page(sp->panels, page_num);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
dlg_refresh(NULL, sp->dp);
sp->dp->shortcuts = &sp->shortcuts;
}
#else
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
static void treeitem_sel(GtkItem *item, gpointer data)
{
struct selparam *sp = (struct selparam *)data;
Colin Watson points out that there was no need for me to write the custom Panels container widget for the PuTTY config box, since the perfectly standard GtkNotebook does the same job. Hence, let's remove Panels completely in favour of doing it the proper way. [originally from svn r7034]
2006-12-29 14:35:34 +00:00
gint page_num;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Colin Watson points out that there was no need for me to write the custom Panels container widget for the PuTTY config box, since the perfectly standard GtkNotebook does the same job. Hence, let's remove Panels completely in favour of doing it the proper way. [originally from svn r7034]
2006-12-29 14:35:34 +00:00
page_num = gtk_notebook_page_num(sp->panels, sp->panel);
gtk_notebook_set_page(sp->panels, page_num);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
dlg_refresh(NULL, sp->dp);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
sp->dp->shortcuts = &sp->shortcuts;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
sp->dp->currtreeitem = sp->treeitem;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
static void window_destroy(GtkWidget *widget, gpointer data)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
gtk_main_quit();
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
static int tree_grab_focus(struct dlgparam *dp)
{
int i, f;
/*
* See if any of the treeitems has the focus.
*/
f = -1;
for (i = 0; i < dp->ntreeitems; i++)
if (GTK_WIDGET_HAS_FOCUS(dp->treeitems[i])) {
f = i;
break;
}
if (f >= 0)
return FALSE;
else {
gtk_widget_grab_focus(dp->currtreeitem);
return TRUE;
}
}
gint tree_focus(GtkContainer *container, GtkDirectionType direction,
gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_stop_emission_by_name(G_OBJECT(container), "focus");
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
/*
* If there's a focused treeitem, we return FALSE to cause the
* focus to move on to some totally other control. If not, we
* focus the selected one.
*/
return tree_grab_focus(dp);
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
GTK 3 prep: use GDK_KEY_<keyname> constants, not GDK_<keyname>. GTK 2 doesn't _documentedly_ provide a helpful compile option to let us check this one in advance of GTK 3, but you can fake one anyway by compiling with -D__GDK_KEYSYMS_COMPAT_H__, so that gdkkeysyms-compat.h will believe that it's already been included :-) We now build cleanly under GTK 2 with that predefine.
2015-08-08 15:23:54 +00:00
if (event->keyval == GDK_KEY_Escape && dp->cancelbutton) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_emit_by_name(G_OBJECT(dp->cancelbutton), "clicked");
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
return TRUE;
}
if ((event->state & GDK_MOD1_MASK) &&
(unsigned char)event->string[0] > 0 &&
(unsigned char)event->string[0] <= 127) {
int schr = (unsigned char)event->string[0];
struct Shortcut *sc = &dp->shortcuts->sc[schr];
switch (sc->action) {
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
case SHORTCUT_TREE:
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
gtk_widget_grab_focus(sc->widget);
#else
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
tree_grab_focus(dp);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
break;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
case SHORTCUT_FOCUS:
gtk_widget_grab_focus(sc->widget);
break;
case SHORTCUT_UCTRL:
/*
* We must do something sensible with a uctrl.
* Precisely what this is depends on the type of
* control.
*/
switch (sc->uc->ctrl->generic.type) {
case CTRL_CHECKBOX:
case CTRL_BUTTON:
/* Check boxes and buttons get the focus _and_ get toggled. */
gtk_widget_grab_focus(sc->uc->toplevel);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_emit_by_name(G_OBJECT(sc->uc->toplevel), "clicked");
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
break;
case CTRL_FILESELECT:
case CTRL_FONTSELECT:
/* File/font selectors have their buttons pressed (ooer),
* and focus transferred to the edit box. */
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_emit_by_name(G_OBJECT(sc->uc->button), "clicked");
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
gtk_widget_grab_focus(sc->uc->entry);
break;
case CTRL_RADIO:
/*
* Radio buttons are fun, because they have
* multiple shortcuts. We must find whether the
* activated shortcut is the shortcut for the whole
* group, or for a particular button. In the former
* case, we find the currently selected button and
* focus it; in the latter, we focus-and-click the
* button whose shortcut was pressed.
*/
if (schr == sc->uc->ctrl->radio.shortcut) {
int i;
for (i = 0; i < sc->uc->ctrl->radio.nbuttons; i++)
if (gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(sc->uc->buttons[i]))) {
gtk_widget_grab_focus(sc->uc->buttons[i]);
}
} else if (sc->uc->ctrl->radio.shortcuts) {
int i;
for (i = 0; i < sc->uc->ctrl->radio.nbuttons; i++)
if (schr == sc->uc->ctrl->radio.shortcuts[i]) {
gtk_widget_grab_focus(sc->uc->buttons[i]);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_emit_by_name
(G_OBJECT(sc->uc->buttons[i]), "clicked");
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
}
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
break;
case CTRL_LISTBOX:
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
#if !GTK_CHECK_VERSION(2,4,0)
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
if (sc->uc->optmenu) {
GdkEventButton bev;
gint returnval;
gtk_widget_grab_focus(sc->uc->optmenu);
/* Option menus don't work using the "clicked" signal.
* We need to manufacture a button press event :-/ */
bev.type = GDK_BUTTON_PRESS;
bev.button = 1;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_emit_by_name(G_OBJECT(sc->uc->optmenu),
"button_press_event",
&bev, &returnval);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
break;
}
#else
if (sc->uc->combo) {
gtk_widget_grab_focus(sc->uc->combo);
gtk_combo_box_popup(GTK_COMBO_BOX(sc->uc->combo));
break;
}
#endif
#if !GTK_CHECK_VERSION(2,0,0)
if (sc->uc->list) {
/*
* For GTK-1 style list boxes, we tell it to
* focus one of its children, which appears to
* do the Right Thing.
*/
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
gtk_container_focus(GTK_CONTAINER(sc->uc->list),
GTK_DIR_TAB_FORWARD);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
break;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
}
#else
I apparently missed out a piece of code when doing the new GTK2 list box: shortcut activations for list boxes are missing. That's the last thing on the to-do list. We're now ready to merge back to the trunk, given only some final testing! [originally from svn r7967]
2008-04-04 11:02:26 +00:00
if (sc->uc->treeview) {
gtk_widget_grab_focus(sc->uc->treeview);
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
break;
I apparently missed out a piece of code when doing the new GTK2 list box: shortcut activations for list boxes are missing. That's the last thing on the to-do list. We're now ready to merge back to the trunk, given only some final testing! [originally from svn r7967]
2008-04-04 11:02:26 +00:00
}
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Re-jig the combo box handling ifdefs so that we can compile with GTK versions >= 2.0 (when the new list boxes came in) but < 2.4 (when the new combo boxes came in). Since some combo boxes are handled using the old list-box code, this means that the two lots of code can both be compiled in at once in some situations! [originally from svn r8031]
2008-05-31 19:23:45 +00:00
assert(!"We shouldn't get here");
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
break;
}
break;
}
}
return FALSE;
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up ||
event->keyval == GDK_Down || event->keyval == GDK_KP_Down) {
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
int dir, i, j = -1;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
for (i = 0; i < dp->ntreeitems; i++)
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
if (widget == dp->treeitems[i])
break;
if (i < dp->ntreeitems) {
if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
dir = -1;
else
dir = +1;
while (1) {
i += dir;
if (i < 0 || i >= dp->ntreeitems)
break; /* nothing in that dir to select */
/*
* Determine if this tree item is visible.
*/
{
GtkWidget *w = dp->treeitems[i];
int vis = TRUE;
Having created and used uxsel, it actually turns out to be practically trivial to put all the pieces together and create a working prototype of Unix PuTTY! It's missing a lot of things - notably GUI request boxes for host keys and logfiles and so forth, the Event Log, mid-session reconfiguration, session loading and saving, sensible population of the character sets drop-down list and probably other fiddly little things too - but it will put up a config box and then create a GUI window containing an SSH connection to the host you specified, so it's _basically_ there. Woo! [originally from svn r3020]
2003-03-29 19:52:50 +00:00
while (w && (GTK_IS_TREE_ITEM(w) || GTK_IS_TREE(w))) {
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
if (!GTK_WIDGET_VISIBLE(w)) {
vis = FALSE;
break;
}
w = w->parent;
}
if (vis) {
j = i; /* got one */
break;
}
}
}
}
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
if (j >= 0) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_emit_by_name(G_OBJECT(dp->treeitems[j]), "toggle");
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
gtk_widget_grab_focus(dp->treeitems[j]);
}
return TRUE;
}
/*
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
* It's nice for Left and Right to expand and collapse tree
* branches.
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
*/
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
gtk_tree_item_collapse(GTK_TREE_ITEM(widget));
return TRUE;
}
if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
gtk_tree_item_expand(GTK_TREE_ITEM(widget));
return TRUE;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
}
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
return FALSE;
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
static void shortcut_highlight(GtkWidget *labelw, int chr)
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
{
GtkLabel *label = GTK_LABEL(labelw);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
const gchar *currstr;
gchar *pattern;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
int i;
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
{
gchar *currstr_nonconst;
gtk_label_get(label, &currstr_nonconst);
currstr = currstr_nonconst;
}
#else
currstr = gtk_label_get_text(label);
#endif
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
for (i = 0; currstr[i]; i++)
if (tolower((unsigned char)currstr[i]) == chr) {
pattern = dupprintf("%*s_", i, "");
gtk_label_set_pattern(label, pattern);
sfree(pattern);
break;
}
}
void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
int chr, int action, void *ptr)
{
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
if (chr == NO_SHORTCUT)
return;
chr = tolower((unsigned char)chr);
assert(scs->sc[chr].action == SHORTCUT_EMPTY);
scs->sc[chr].action = action;
Permit the config box treeview to be keyboard-selected. I'd failed to set the widget field in its shortcut structure, leading to an annoying GTK warning log message and no useful UI action when Alt-G was pressed in the config box.
2015-09-26 12:12:25 +00:00
if (action == SHORTCUT_FOCUS || action == SHORTCUT_TREE) {
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
scs->sc[chr].uc = NULL;
scs->sc[chr].widget = (GtkWidget *)ptr;
} else {
scs->sc[chr].widget = NULL;
scs->sc[chr].uc = (struct uctrl *)ptr;
}
Serial back end for Unix. Due to hardware limitations (no Linux box I own has both an X display and a working serial port) I have been unable to give this the full testing it deserves; I've managed to demonstrate the basic functionality of Unix Plink talking to a serial port, but I haven't been able to test the GTK front end. I have no reason to think it will fail, but I'll be more comfortable once somebody has actually tested it. [originally from svn r6822]
2006-08-28 14:29:02 +00:00
shortcut_highlight(labelw, chr);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
int get_listitemheight(GtkWidget *w)
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
{
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
GtkWidget *listitem = gtk_list_item_new_with_label("foo");
GtkRequisition req;
gtk_widget_size_request(listitem, &req);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_ref_sink(G_OBJECT(listitem));
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
return req.height;
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
int height;
GtkCellRenderer *cr = gtk_cell_renderer_text_new();
Avoid deprecated gtk_cell_renderer_get_size in GTK3. gtk_cell_renderer_get_preferred_size() is the new way to do it.
2015-08-22 12:53:29 +00:00
#if GTK_CHECK_VERSION(3,0,0)
{
GtkRequisition req;
/*
* Since none of my list items wraps in this GUI, no
* interesting width-for-height behaviour should be happening,
* so I don't think it should matter here whether I ask for
* the minimum or natural height.
*/
gtk_cell_renderer_get_preferred_size(cr, w, &req, NULL);
height = req.height;
}
#else
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
gtk_cell_renderer_get_size(cr, w, NULL, NULL, NULL, NULL, &height);
Avoid deprecated gtk_cell_renderer_get_size in GTK3. gtk_cell_renderer_get_preferred_size() is the new way to do it.
2015-08-22 12:53:29 +00:00
#endif
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
g_object_ref(G_OBJECT(cr));
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_object_ref_sink(G_OBJECT(cr));
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
g_object_unref(G_OBJECT(cr));
return height;
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
}
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
#if GTK_CHECK_VERSION(2,0,0)
void initial_treeview_collapse(struct dlgparam *dp, GtkWidget *tree)
{
/*
* Collapse the deeper branches of the treeview into the state we
* like them to start off in. See comment below in do_config_box.
*/
int i;
for (i = 0; i < dp->nselparams; i++)
if (dp->selparams[i].depth >= 2)
gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree),
dp->selparams[i].treepath);
}
#endif
#if GTK_CHECK_VERSION(3,0,0)
void treeview_map_event(GtkWidget *tree, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
GtkAllocation alloc;
gtk_widget_get_allocation(tree, &alloc);
gtk_widget_set_size_request(tree, alloc.width, -1);
initial_treeview_collapse(dp, tree);
}
#endif
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
int do_config_box(const char *title, Conf *conf, int midsession,
Loose end from r5031: the Kex panel should only be displayed in mid-session if we are not using SSHv1. I've done this by introducing a generic `cfg_info' function which every back end can use to communicate an int's worth of data to setup_config_box; in SSH that's the protocol version in use, and in everything else it's currently zero. [originally from svn r5040] [r5031 == d77102a8d535a7000d6d909529a61a1564f6d678]
2004-12-29 12:32:25 +00:00
int protcfginfo)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
GtkWidget *window, *hbox, *vbox, *cols, *label,
*tree, *treescroll, *panels, *panelvbox;
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
int index, level, protocol;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
struct controlbox *ctrlbox;
char *path;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
GtkTreeStore *treestore;
GtkCellRenderer *treerenderer;
GtkTreeViewColumn *treecolumn;
GtkTreeSelection *treeselection;
GtkTreeIter treeiterlevels[8];
#else
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
GtkTreeItem *treeitemlevels[8];
GtkTree *treelevels[8];
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
struct dlgparam dp;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
struct Shortcuts scs;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
struct selparam *selparams = NULL;
int nselparams = 0, selparamsize = 0;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
dlg_init(&dp);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
for (index = 0; index < lenof(scs.sc); index++) {
scs.sc[index].action = SHORTCUT_EMPTY;
}
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
window = our_dialog_new();
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
ctrlbox = ctrl_new_box();
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
protocol = conf_get_int(conf, CONF_protocol);
setup_config_box(ctrlbox, midsession, protocol, protcfginfo);
unix_setup_config_box(ctrlbox, midsession, protocol);
Saw uxcfg.c in half down the middle, to separate out config changes that apply to all Unix-like systems from those which apply specifically to the GTK front end. [originally from svn r5292]
2005-02-14 07:41:41 +00:00
gtk_setup_config_box(ctrlbox, midsession, window);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
gtk_window_set_title(GTK_WINDOW(window), title);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
hbox = gtk_hbox_new(FALSE, 4);
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_add_to_content_area(GTK_WINDOW(window), hbox, TRUE, TRUE, 0);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_widget_show(hbox);
vbox = gtk_vbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show(vbox);
cols = columns_new(4);
gtk_box_pack_start(GTK_BOX(vbox), cols, FALSE, FALSE, 0);
gtk_widget_show(cols);
label = gtk_label_new("Category:");
columns_add(COLUMNS(cols), label, 0, 1);
columns_force_left_align(COLUMNS(cols), label);
gtk_widget_show(label);
treescroll = gtk_scrolled_window_new(NULL, NULL);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
treestore = gtk_tree_store_new
(TREESTORE_NUM, G_TYPE_STRING, G_TYPE_INT);
tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(treestore));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
treerenderer = gtk_cell_renderer_text_new();
treecolumn = gtk_tree_view_column_new_with_attributes
("Label", treerenderer, "text", 0, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree), treecolumn);
treeselection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
gtk_tree_selection_set_mode(treeselection, GTK_SELECTION_BROWSE);
gtk_container_add(GTK_CONTAINER(treescroll), tree);
#else
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
tree = gtk_tree_new();
gtk_tree_set_view_mode(GTK_TREE(tree), GTK_TREE_VIEW_ITEM);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
gtk_tree_set_selection_mode(GTK_TREE(tree), GTK_SELECTION_BROWSE);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(tree), "focus",
G_CALLBACK(tree_focus), &dp);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(tree), "focus_in_event",
G_CALLBACK(widget_focus), &dp);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
shortcut_add(&scs, label, 'g', SHORTCUT_TREE, tree);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_widget_show(treescroll);
gtk_box_pack_start(GTK_BOX(vbox), treescroll, TRUE, TRUE, 0);
Colin Watson points out that there was no need for me to write the custom Panels container widget for the PuTTY config box, since the perfectly standard GtkNotebook does the same job. Hence, let's remove Panels completely in favour of doing it the proper way. [originally from svn r7034]
2006-12-29 14:35:34 +00:00
panels = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(panels), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(panels), FALSE);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_box_pack_start(GTK_BOX(hbox), panels, TRUE, TRUE, 0);
gtk_widget_show(panels);
panelvbox = NULL;
path = NULL;
level = 0;
for (index = 0; index < ctrlbox->nctrlsets; index++) {
struct controlset *s = ctrlbox->ctrlsets[index];
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
GtkWidget *w;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
if (!*s->pathname) {
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
w = layout_ctrls(&dp, &scs, s, GTK_WINDOW(window));
Fix the incorrect layout of the buttons at the bottom of the main config box. [originally from svn r7160]
2007-01-25 19:45:50 +00:00
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_set_action_area(GTK_WINDOW(window), w);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
} else {
int j = path ? ctrl_path_compare(s->pathname, path) : 0;
if (j != INT_MAX) { /* add to treeview, start new panel */
char *c;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
GtkTreeIter treeiter;
#else
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
GtkWidget *treeitem;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
int first;
/*
* We expect never to find an implicit path
* component. For example, we expect never to see
* A/B/C followed by A/D/E, because that would
* _implicitly_ create A/D. All our path prefixes
* are expected to contain actual controls and be
* selectable in the treeview; so we would expect
* to see A/D _explicitly_ before encountering
* A/D/E.
*/
assert(j == ctrl_path_elements(s->pathname) - 1);
c = strrchr(s->pathname, '/');
if (!c)
c = s->pathname;
else
c++;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
path = s->pathname;
first = (panelvbox == NULL);
panelvbox = gtk_vbox_new(FALSE, 4);
gtk_widget_show(panelvbox);
gtk_notebook_append_page(GTK_NOTEBOOK(panels), panelvbox,
NULL);
if (first) {
gint page_num;
page_num = gtk_notebook_page_num(GTK_NOTEBOOK(panels),
panelvbox);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
gtk_notebook_set_current_page(GTK_NOTEBOOK(panels),
page_num);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
}
if (nselparams >= selparamsize) {
selparamsize += 16;
selparams = sresize(selparams, selparamsize,
struct selparam);
}
selparams[nselparams].dp = &dp;
selparams[nselparams].panels = GTK_NOTEBOOK(panels);
selparams[nselparams].panel = panelvbox;
selparams[nselparams].shortcuts = scs; /* structure copy */
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
assert(j-1 < level);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
if (j > 0)
/* treeiterlevels[j-1] will always be valid because we
* don't allow implicit path components; see above.
*/
gtk_tree_store_append(treestore, &treeiter,
&treeiterlevels[j-1]);
else
gtk_tree_store_append(treestore, &treeiter, NULL);
gtk_tree_store_set(treestore, &treeiter,
TREESTORE_PATH, c,
TREESTORE_PARAMS, nselparams,
-1);
treeiterlevels[j] = treeiter;
Collapse tree view branches deeper than level 2, bringing the GTK2 tree code into line with the GTK1. [originally from svn r7165]
2007-01-26 08:01:47 +00:00
Ensure the new `depth' and `treepath' structure fields in struct selparam are always properly initialised. [originally from svn r7972]
2008-04-05 12:53:32 +00:00
selparams[nselparams].depth = j;
Collapse tree view branches deeper than level 2, bringing the GTK2 tree code into line with the GTK1. [originally from svn r7165]
2007-01-26 08:01:47 +00:00
if (j > 0) {
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
selparams[nselparams].treepath =
gtk_tree_model_get_path(GTK_TREE_MODEL(treestore),
&treeiterlevels[j-1]);
/*
* We are going to collapse all tree branches
* at depth greater than 2, but not _yet_; see
* the comment at the call to
* gtk_tree_view_collapse_row below.
*/
gtk_tree_view_expand_row(GTK_TREE_VIEW(tree),
selparams[nselparams].treepath,
FALSE);
Ensure the new `depth' and `treepath' structure fields in struct selparam are always properly initialised. [originally from svn r7972]
2008-04-05 12:53:32 +00:00
} else {
selparams[nselparams].treepath = NULL;
Collapse tree view branches deeper than level 2, bringing the GTK2 tree code into line with the GTK1. [originally from svn r7165]
2007-01-26 08:01:47 +00:00
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#else
treeitem = gtk_tree_item_new_with_label(c);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
if (j > 0) {
if (!treelevels[j-1]) {
treelevels[j-1] = GTK_TREE(gtk_tree_new());
gtk_tree_item_set_subtree
(treeitemlevels[j-1],
GTK_WIDGET(treelevels[j-1]));
Fold up the `SSH' branch of the treeview by default; it's getting quite big and tends to hide the existence of the `Serial' config panel. This is implemented by folding up every branch of depth 2 or more, which with any luck might turn out to be general enough to carry over unchanged if other branches start expanding. Then again, we may have to fiddle with it again when that time comes; who knows? [originally from svn r7117]
2007-01-16 18:48:47 +00:00
if (j < 2)
gtk_tree_item_expand(treeitemlevels[j-1]);
else
gtk_tree_item_collapse(treeitemlevels[j-1]);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
gtk_tree_append(treelevels[j-1], treeitem);
} else {
gtk_tree_append(GTK_TREE(tree), treeitem);
}
treeitemlevels[j] = GTK_TREE_ITEM(treeitem);
treelevels[j] = NULL;
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(treeitem), "key_press_event",
G_CALLBACK(tree_key_press), &dp);
g_signal_connect(G_OBJECT(treeitem), "focus_in_event",
G_CALLBACK(widget_focus), &dp);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_widget_show(treeitem);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
if (first)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_tree_select_child(GTK_TREE(tree), treeitem);
selparams[nselparams].treeitem = treeitem;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
level = j+1;
nselparams++;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
w = layout_ctrls(&dp, &selparams[nselparams-1].shortcuts, s, NULL);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_box_pack_start(GTK_BOX(panelvbox), w, FALSE, FALSE, 0);
Continuing work on the GTK config box. Created uxcfg.c for the Unix-specific config items; moved a stray Windows-specific config item (scrollbar-in-fullscreen) out into wincfg.c to stop it appearing on Unix; continued updates to gtkdlg.c. I now believe the GTK config box looks basically correct (modulo minor cosmetic issues and keyboard accelerators). Next step, add the event handling so it's actually functional. [originally from svn r2933]
2003-03-14 18:35:01 +00:00
gtk_widget_show(w);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
}
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
#if GTK_CHECK_VERSION(2,0,0)
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
/*
* We want our tree view to come up with all branches at depth 2
* or more collapsed. However, if we start off with those branches
* collapsed, then the tree view's size request will be calculated
* based on the width of the collapsed tree, and then when the
* collapsed branches are expanded later, the tree view will
* jarringly change size.
*
* So instead we start with everything expanded; then, once the
* tree view has computed its resulting width requirement, we
* collapse the relevant rows, but force the width to be the value
* we just retrieved. This arranges that the tree view is wide
* enough to have all branches expanded without further resizing.
*/
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
dp.nselparams = nselparams;
dp.selparams = selparams;
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
#if !GTK_CHECK_VERSION(3,0,0)
{
/*
* In GTK2, we can just do the job right now.
*/
GtkRequisition req;
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
gtk_widget_size_request(tree, &req);
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
initial_treeview_collapse(&dp, tree);
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
gtk_widget_set_size_request(tree, req.width, -1);
}
Fix the config box treeview width in GTK3. My trickery in GTK2 to start with some branches of the tree collapsed but give the widget all the width it will need when they open later was not working in GTK3, for the same reason I've needed several other fixes recently: just after creation, GTK3 widgets report their preferred size as zero. Fixed by doing basically the same trick I was doing in GTK2, but deferring it until the "map" event happens later on.
2015-08-25 18:44:44 +00:00
#else
/*
* But in GTK3, we have to wait until the widget is about to be
* mapped, because the size computation won't have been done yet.
*/
g_signal_connect(G_OBJECT(tree), "map",
G_CALLBACK(treeview_map_event), &dp);
#endif /* GTK 2 vs 3 */
#endif /* GTK 2+ vs 1 */
Fix the jarring change of window size on expanding the SSH branch of the configuration tree. [originally from svn r7968]
2008-04-04 11:37:06 +00:00
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if GTK_CHECK_VERSION(2,0,0)
g_signal_connect(G_OBJECT(treeselection), "changed",
G_CALLBACK(treeselection_changed), selparams);
#else
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
dp.ntreeitems = nselparams;
Introduced wrapper macros snew(), snewn() and sresize() for the malloc functions, which automatically cast to the same type they're allocating the size of. Should prevent any future errors involving mallocing the size of the wrong structure type, and will also make life easier if we ever need to turn the PuTTY core code from real C into C++-friendly C. I haven't touched the Mac frontend in this checkin because I couldn't compile or test it. [originally from svn r3014]
2003-03-29 16:14:26 +00:00
dp.treeitems = snewn(dp.ntreeitems, GtkWidget *);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
for (index = 0; index < nselparams; index++) {
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(selparams[index].treeitem), "select",
G_CALLBACK(treeitem_sel),
&selparams[index]);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
dp.treeitems[index] = selparams[index].treeitem;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Post-release destabilisation! Completely remove the struct type 'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
2011-07-14 18:52:21 +00:00
dp.data = conf;
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
dlg_refresh(NULL, &dp);
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
dp.shortcuts = &selparams[0].shortcuts;
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
dp.currtreeitem = dp.treeitems[0];
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
dp.lastfocus = NULL;
dp.retval = 0;
Better appearance and positioning for dlg_error_msg box, and also I've just found out that it's easy to ask for the config box to be centred on the screen by default, which is kinda cool. [originally from svn r2962]
2003-03-18 19:47:28 +00:00
dp.window = window;
Further work on the GTK config box; mostly implemented keyboard shortcuts now (only treeviews and list boxes to go, which currently do very weird things and I need to overhaul them completely). [originally from svn r2944]
2003-03-16 12:37:48 +00:00
No, I tell a lie: GTK 1 _does_ support icons, at least partially. Ooh. [originally from svn r7064]
2007-01-06 18:27:00 +00:00
{
/* in gtkwin.c */
extern void set_window_icon(GtkWidget *window,
const char *const *const *icon,
int n_icon);
extern const char *const *const cfg_icon[];
extern const int n_cfg_icon;
set_window_icon(window, cfg_icon, n_cfg_icon);
}
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#if !GTK_CHECK_VERSION(2,0,0)
Fold up the `SSH' branch of the treeview by default; it's getting quite big and tends to hide the existence of the `Serial' config panel. This is implemented by folding up every branch of depth 2 or more, which with any luck might turn out to be general enough to carry over unchanged if other branches start expanding. Then again, we may have to fiddle with it again when that time comes; who knows? [originally from svn r7117]
2007-01-16 18:48:47 +00:00
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(treescroll),
tree);
Commit Colin Watson's original GTK2 patch, exactly as mailed to me on 1st January except that I've had to fiddle with it a bit to take account of r7117 having happened since then. [originally from svn r7157] [r7117 == 174bb7f1fd1b1a4823905ca931eec67ab0fc9976]
2007-01-25 19:33:29 +00:00
#endif
Fold up the `SSH' branch of the treeview by default; it's getting quite big and tends to hide the existence of the `Serial' config panel. This is implemented by folding up every branch of depth 2 or more, which with any luck might turn out to be general enough to carry over unchanged if other branches start expanding. Then again, we may have to fiddle with it again when that time comes; who knows? [originally from svn r7117]
2007-01-16 18:48:47 +00:00
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(treescroll),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_widget_show(tree);
Better appearance and positioning for dlg_error_msg box, and also I've just found out that it's easy to ask for the config box to be centred on the screen by default, which is kinda cool. [originally from svn r2962]
2003-03-18 19:47:28 +00:00
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_widget_show(window);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
/*
* Set focus into the first available control.
*/
for (index = 0; index < ctrlbox->nctrlsets; index++) {
struct controlset *s = ctrlbox->ctrlsets[index];
int done = 0;
int j;
if (*s->pathname) {
for (j = 0; j < s->ncontrols; j++)
if (s->ctrls[j]->generic.type != CTRL_TABDELAY &&
s->ctrls[j]->generic.type != CTRL_COLUMNS &&
s->ctrls[j]->generic.type != CTRL_TEXT) {
dlg_set_focus(s->ctrls[j], &dp);
dp.lastfocus = s->ctrls[j];
done = 1;
break;
}
}
if (done)
break;
}
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(window_destroy), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(win_key_press), &dp);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
gtk_main();
GTK 3 prep: write a replacement for gtk_quit_add(). GTK 2 has deprecated it and provided no replacement; a bug tracker entry I found on the subject suggested that it was functionality that didn't really belong in GTK, and glib ought to provide a replacement instead, which would be a perfectly fine thing to suggest if they had waited for glib to get round to doing so *before* throwing out a function people were actually using. Sigh. Anyway, it turns out that subsidiary invocations of gtk_main() don't happen inside GTK as far as I can see, so all I need to do is to make sure my own invocations of gtk_main() are followed by a cleanup function which runs any quit functions that I've registered. That was the last deprecated GTK function, so we now build cleanly with -DGTK_DISABLE_DEPRECATED. (But, as mentioned a couple of commits ago, we still don't build with -DGDK_DISABLE_DEPRECATED, because that has migrating to Cairo drawing as a prerequisite.)
2015-08-09 10:33:43 +00:00
post_main();
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Event handling in the GTK dialog engine is now basically present and correct. All the callbacks are getting called, all the dialog actions are working (the port forwarding, colour and charclass configurers are all completely functional), file, font and colour selectors happen, and it's all looking pretty cool. [originally from svn r2938]
2003-03-15 15:50:42 +00:00
dlg_cleanup(&dp);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
sfree(selparams);
Big sprawling dialog-box commit covering all sorts of things. Buttons now have an `iscancel' flag to go with `isdefault'; dlg_last_focused() now explicitly passes the control it _doesn't_ care about (`I want the last control that had focus and isn't this one'); and in the GTK implementation, various fixes have happened, notably including arrow keys working sensibly in list boxes and the treeview and short font aliases being expanded correctly to initialise the font selectors. [originally from svn r2958]
2003-03-18 19:06:51 +00:00
return dp.retval;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
static void messagebox_handler(union control *ctrl, void *dlg,
void *data, int event)
{
if (event == EVENT_ACTION)
dlg_end(dlg, ctrl->generic.context.i);
}
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
int minwid, int selectable, ...)
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
{
GtkWidget *window, *w0, *w1;
struct controlbox *ctrlbox;
struct controlset *s0, *s1;
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
union control *c, *textctrl;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
struct dlgparam dp;
struct Shortcuts scs;
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
int index, ncols, min_type;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
va_list ap;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
dlg_init(&dp);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
for (index = 0; index < lenof(scs.sc); index++) {
scs.sc[index].action = SHORTCUT_EMPTY;
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
ctrlbox = ctrl_new_box();
Various cosmetic fixes to the GTK config box: vertical alignment of edit box labels, Left/Right on the treeview to collapse and expand branches, a window title, and the best treatment of wrapping text widgets I could think of within the product-order-oriented GTK layout model. I think this thing is now pretty much as good as it's going to get before GTK v2 (which should fix one or two remaining minor nasties which I really couldn't be bothered to work around in GTK 1.2), so the next step is to actually start _using_ it. [originally from svn r2979]
2003-03-22 17:00:06 +00:00
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
/*
* Preliminary pass over the va_list, to count up the number of
* buttons and find out what kinds there are.
*/
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
ncols = 0;
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
va_start(ap, selectable);
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
min_type = +1;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
while (va_arg(ap, char *) != NULL) {
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
int type;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
(void) va_arg(ap, int); /* shortcut */
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
type = va_arg(ap, int); /* normal/default/cancel */
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
(void) va_arg(ap, int); /* end value */
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
ncols++;
if (min_type > type)
min_type = type;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
}
va_end(ap);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
s0 = ctrl_getset(ctrlbox, "", "", "");
c = ctrl_columns(s0, 2, 50, 50);
c->columns.ncols = s0->ncolumns = ncols;
c->columns.percentages = sresize(c->columns.percentages, ncols, int);
for (index = 0; index < ncols; index++)
c->columns.percentages[index] = (index+1)*100/ncols - index*100/ncols;
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
va_start(ap, selectable);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
index = 0;
while (1) {
char *title = va_arg(ap, char *);
int shortcut, type, value;
if (title == NULL)
break;
shortcut = va_arg(ap, int);
type = va_arg(ap, int);
value = va_arg(ap, int);
c = ctrl_pushbutton(s0, title, shortcut, HELPCTX(no_help),
messagebox_handler, I(value));
c->generic.column = index++;
if (type > 0)
c->button.isdefault = TRUE;
Make sure Escape in a message box always does something. The askalg() dialog, and several one-button things like the licence box, have no button labelled 'cancel'. But in all cases we do want Escape to terminate the box, with as negative an answer as is available. So now we assign the 'iscancel' flag to any button whose numeric value is the smallest of the ones given as input to messagebox(). (In a one-button box, this leads to isdefault and iscancel _both_ being set for that button. That's fine; it works.)
2015-09-26 12:57:12 +00:00
/* We always arrange that _some_ button is labelled as
* 'iscancel', so that pressing Escape will always cause
* win_key_press to do something. The button we choose is
* whichever has the smallest type value: this means that real
* cancel buttons (labelled -1) will be picked if one is
* there, or in cases where the options are yes/no (1,0) then
* no will be picked, and if there's only one option (a box
* that really is just showing a _message_ and not even asking
* a question) then that will be picked. */
if (type == min_type)
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
c->button.iscancel = TRUE;
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
va_end(ap);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
s1 = ctrl_getset(ctrlbox, "x", "", "");
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
textctrl = ctrl_text(s1, msg, HELPCTX(no_help));
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
window = our_dialog_new();
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_window_set_title(GTK_WINDOW(window), title);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
w0 = layout_ctrls(&dp, &scs, s0, GTK_WINDOW(window));
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_set_action_area(GTK_WINDOW(window), w0);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_widget_show(w0);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
w1 = layout_ctrls(&dp, &scs, s1, GTK_WINDOW(window));
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_container_set_border_width(GTK_CONTAINER(w1), 10);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
gtk_widget_set_size_request(w1, minwid+20, -1);
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_widget_show(w1);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
dp.shortcuts = &scs;
dp.lastfocus = NULL;
dp.retval = 0;
dp.window = window;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
if (selectable) {
#if GTK_CHECK_VERSION(2,0,0)
struct uctrl *uc = dlg_find_byctrl(&dp, textctrl);
gtk_label_set_selectable(GTK_LABEL(uc->text), TRUE);
/*
* GTK selectable labels have a habit of selecting their
* entire contents when they gain focus. It's ugly to have
* text in a message box start up all selected, so we suppress
* this by manually selecting none of it - but we must do this
* when the widget _already has_ focus, otherwise our work
* will be undone when it gains it shortly.
*/
gtk_widget_grab_focus(uc->text);
gtk_label_select_region(GTK_LABEL(uc->text), 0, 0);
#else
(void)textctrl; /* placate warning */
#endif
}
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
if (parentwin) {
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
set_transient_window_pos(parentwin, window);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_window_set_transient_for(GTK_WINDOW(window),
GTK_WINDOW(parentwin));
} else
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
gtk_container_set_focus_child(GTK_CONTAINER(window), NULL);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_widget_show(window);
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
gtk_window_set_focus(GTK_WINDOW(window), NULL);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(window_destroy), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(win_key_press), &dp);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
gtk_main();
GTK 3 prep: write a replacement for gtk_quit_add(). GTK 2 has deprecated it and provided no replacement; a bug tracker entry I found on the subject suggested that it was functionality that didn't really belong in GTK, and glib ought to provide a replacement instead, which would be a perfectly fine thing to suggest if they had waited for glib to get round to doing so *before* throwing out a function people were actually using. Sigh. Anyway, it turns out that subsidiary invocations of gtk_main() don't happen inside GTK as far as I can see, so all I need to do is to make sure my own invocations of gtk_main() are followed by a cleanup function which runs any quit functions that I've registered. That was the last deprecated GTK function, so we now build cleanly with -DGTK_DISABLE_DEPRECATED. (But, as mentioned a couple of commits ago, we still don't build with -DGDK_DISABLE_DEPRECATED, because that has migrating to Cairo drawing as a prerequisite.)
2015-08-09 10:33:43 +00:00
post_main();
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
dlg_cleanup(&dp);
ctrl_free_box(ctrlbox);
return dp.retval;
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Implement Warn On Close. [originally from svn r3099]
2003-04-11 18:15:47 +00:00
int reallyclose(void *frontend)
{
char *title = dupcat(appname, " Exit Confirmation", NULL);
int ret = messagebox(GTK_WIDGET(get_window(frontend)),
title, "Are you sure you want to close this session?",
string_width("Most of the width of the above text"),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
FALSE,
Implement Warn On Close. [originally from svn r3099]
2003-04-11 18:15:47 +00:00
"Yes", 'y', +1, 1,
"No", 'n', -1, 0,
NULL);
sfree(title);
return ret;
}
Const-correctness of name fields in struct ssh_*. All the name strings in ssh_cipher, ssh_mac, ssh_hash, ssh_signkey point to compile-time string literals, hence should obviously be const char *. Most of these const-correctness patches are just a mechanical job of adding a 'const' in the one place you need it right now, and then chasing the implications through the code adding further consts until it compiles. But this one has actually shown up a bug: the 'algorithm' output parameter in ssh2_userkey_loadpub was sometimes returning a pointer to a string literal, and sometimes a pointer to dynamically allocated memory, so callers were forced to either sometimes leak memory or sometimes free a bad thing. Now it's consistently dynamically allocated, and should be freed everywhere too.
2015-05-15 09:12:06 +00:00
int verify_ssh_host_key(void *frontend, char *host, int port,
const char *keytype, char *keystr, char *fingerprint,
Revamp interface to verify_ssh_host_key() and askalg(). Each of them now returns an integer: 0 means cancel the SSH connection and 1 means continue with it. Additionally, they can return -1, which means `front end has set an asynchronous alert box in motion, please wait to be called back with the result', and each one is passed a callback function pointer and context for this purpose. I have not yet done the same to askappend() yet, because it will take a certain amount of reorganisation of logging.c. Importantly, this checkin means the host key dialog box now works on OS X. [originally from svn r5330]
2005-02-17 18:34:24 +00:00
void (*callback)(void *ctx, int result), void *ctx)
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
{
static const char absenttxt[] =
"The server's host key is not cached. You have no guarantee "
"that the server is the computer you think it is.\n"
Implement hostkey-prompt-type everywhere except Macintosh. [originally from svn r3307]
2003-06-26 14:19:33 +00:00
"The server's %s key fingerprint is:\n"
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
"%s\n"
"If you trust this host, press \"Accept\" to add the key to "
"PuTTY's cache and carry on connecting.\n"
"If you want to carry on connecting just once, without "
"adding the key to the cache, press \"Connect Once\".\n"
"If you do not trust this host, press \"Cancel\" to abandon the "
"connection.";
static const char wrongtxt[] =
"WARNING - POTENTIAL SECURITY BREACH!\n"
"The server's host key does not match the one PuTTY has "
"cached. This means that either the server administrator "
"has changed the host key, or you have actually connected "
"to another computer pretending to be the server.\n"
Implement hostkey-prompt-type everywhere except Macintosh. [originally from svn r3307]
2003-06-26 14:19:33 +00:00
"The new %s key fingerprint is:\n"
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
"%s\n"
"If you were expecting this change and trust the new key, "
"press \"Accept\" to update PuTTY's cache and continue connecting.\n"
"If you want to carry on connecting but without updating "
"the cache, press \"Connect Once\".\n"
"If you want to abandon the connection completely, press "
"\"Cancel\" to cancel. Pressing \"Cancel\" is the ONLY guaranteed "
"safe choice.";
char *text;
int ret;
/*
* Verify the key.
*/
ret = verify_host_key(host, port, keytype, keystr);
if (ret == 0) /* success - key matched OK */
Revamp interface to verify_ssh_host_key() and askalg(). Each of them now returns an integer: 0 means cancel the SSH connection and 1 means continue with it. Additionally, they can return -1, which means `front end has set an asynchronous alert box in motion, please wait to be called back with the result', and each one is passed a callback function pointer and context for this purpose. I have not yet done the same to askappend() yet, because it will take a certain amount of reorganisation of logging.c. Importantly, this checkin means the host key dialog box now works on OS X. [originally from svn r5330]
2005-02-17 18:34:24 +00:00
return 1;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
Implement hostkey-prompt-type everywhere except Macintosh. [originally from svn r3307]
2003-06-26 14:19:33 +00:00
text = dupprintf((ret == 2 ? wrongtxt : absenttxt), keytype, fingerprint);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
ret = messagebox(GTK_WIDGET(get_window(frontend)),
"PuTTY Security Alert", text,
string_width(fingerprint),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
TRUE,
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
"Accept", 'a', 0, 2,
"Connect Once", 'o', 0, 1,
"Cancel", 'c', -1, 0,
NULL);
sfree(text);
Rearrange verify_ssh_host_key() for robustness in the face of strangeness, in the same manner as windows/windlg.c (but tested this time :) [originally from svn r5380]
2005-02-21 23:43:49 +00:00
if (ret == 2) {
store_host_key(host, port, keytype, keystr);
return 1; /* continue with connection */
} else if (ret == 1)
return 1; /* continue with connection */
return 0; /* do not continue with connection */
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
/*
Add a preference list for SSH-2 key exchange algorithms, on a new "Kex" panel (which will gain more content anon). Retire BUG_SSH2_DH_GEX and add a backwards-compatibility wart, since we never did find a way of automatically detecting this alleged server bug, and in any case there was only ever one report (<3D91F3B5.7030309@inwind.it>, FWIW). Also generalise askcipher() to a new askalg() (thus touching all the front-ends). I've made some attempt to document what SSH key exchange is and why you care, but it could use some review for clarity (and outright lies). [originally from svn r5022]
2004-12-23 02:24:07 +00:00
* Ask whether the selected algorithm is acceptable (since it was
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
* below the configured 'warn' threshold).
*/
Revamp interface to verify_ssh_host_key() and askalg(). Each of them now returns an integer: 0 means cancel the SSH connection and 1 means continue with it. Additionally, they can return -1, which means `front end has set an asynchronous alert box in motion, please wait to be called back with the result', and each one is passed a callback function pointer and context for this purpose. I have not yet done the same to askappend() yet, because it will take a certain amount of reorganisation of logging.c. Importantly, this checkin means the host key dialog box now works on OS X. [originally from svn r5330]
2005-02-17 18:34:24 +00:00
int askalg(void *frontend, const char *algtype, const char *algname,
void (*callback)(void *ctx, int result), void *ctx)
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
{
static const char msg[] =
Add a preference list for SSH-2 key exchange algorithms, on a new "Kex" panel (which will gain more content anon). Retire BUG_SSH2_DH_GEX and add a backwards-compatibility wart, since we never did find a way of automatically detecting this alleged server bug, and in any case there was only ever one report (<3D91F3B5.7030309@inwind.it>, FWIW). Also generalise askcipher() to a new askalg() (thus touching all the front-ends). I've made some attempt to document what SSH key exchange is and why you care, but it could use some review for clarity (and outright lies). [originally from svn r5022]
2004-12-23 02:24:07 +00:00
"The first %s supported by the server is "
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
"%s, which is below the configured warning threshold.\n"
"Continue with connection?";
char *text;
int ret;
Add a preference list for SSH-2 key exchange algorithms, on a new "Kex" panel (which will gain more content anon). Retire BUG_SSH2_DH_GEX and add a backwards-compatibility wart, since we never did find a way of automatically detecting this alleged server bug, and in any case there was only ever one report (<3D91F3B5.7030309@inwind.it>, FWIW). Also generalise askcipher() to a new askalg() (thus touching all the front-ends). I've made some attempt to document what SSH key exchange is and why you care, but it could use some review for clarity (and outright lies). [originally from svn r5022]
2004-12-23 02:24:07 +00:00
text = dupprintf(msg, algtype, algname);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
ret = messagebox(GTK_WIDGET(get_window(frontend)),
"PuTTY Security Alert", text,
Widen the GTK askalg() message box. In GTK3, the line 'Continue with connection?' got wrapped (in spite of my attempt to enforce via string_width() that it didn't - probably a few pixels were needed on top of that for various padding and furniture) so it looked even sillier. But it looked a bit narrow to be sensible even in GTK2, so the simplest answer is just to widen it considerably.
2015-09-26 13:13:56 +00:00
string_width("Reasonably long line of text as a width"
" template"),
Special host key warning when a better key exists. If you're connecting to a new server and it _only_ provides host key types you've configured to be below the warning threshold, it's OK to give the standard askalg() message. But if you've newly demoted a host key type and now reconnect to some server for which that type was the best key you had cached, the askalg() wording isn't really appropriate (it's not that the key we've settled on is the first type _supported by the server_, it's that it's the first type _cached by us_), and also it's potentially helpful to list the better algorithms so that the user can pick one to cross-certify.
2016-03-27 17:08:49 +00:00
FALSE,
"Yes", 'y', 0, 1,
"No", 'n', 0, 0,
NULL);
sfree(text);
if (ret) {
return 1;
} else {
return 0;
}
}
int askhk(void *frontend, const char *algname, const char *betteralgs,
void (*callback)(void *ctx, int result), void *ctx)
{
static const char msg[] =
"The first host key type we have stored for this server\n"
"is %s, which is below the configured warning threshold.\n"
"The server also provides the following types of host key\n"
"above the threshold, which we do not have stored:\n"
"%s\n"
"Continue with connection?";
char *text;
int ret;
text = dupprintf(msg, algname, betteralgs);
ret = messagebox(GTK_WIDGET(get_window(frontend)),
"PuTTY Security Alert", text,
string_width("is ecdsa-nistp521, which is"
" below the configured warning threshold."),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
FALSE,
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
"Yes", 'y', 0, 1,
"No", 'n', 0, 0,
NULL);
sfree(text);
if (ret) {
Revamp interface to verify_ssh_host_key() and askalg(). Each of them now returns an integer: 0 means cancel the SSH connection and 1 means continue with it. Additionally, they can return -1, which means `front end has set an asynchronous alert box in motion, please wait to be called back with the result', and each one is passed a callback function pointer and context for this purpose. I have not yet done the same to askappend() yet, because it will take a certain amount of reorganisation of logging.c. Importantly, this checkin means the host key dialog box now works on OS X. [originally from svn r5330]
2005-02-17 18:34:24 +00:00
return 1;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
} else {
Revamp interface to verify_ssh_host_key() and askalg(). Each of them now returns an integer: 0 means cancel the SSH connection and 1 means continue with it. Additionally, they can return -1, which means `front end has set an asynchronous alert box in motion, please wait to be called back with the result', and each one is passed a callback function pointer and context for this purpose. I have not yet done the same to askappend() yet, because it will take a certain amount of reorganisation of logging.c. Importantly, this checkin means the host key dialog box now works on OS X. [originally from svn r5330]
2005-02-17 18:34:24 +00:00
return 0;
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
}
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
void old_keyfile_warning(void)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
/*
* This should never happen on Unix. We hope.
*/
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
void fatal_message_box(void *window, const char *msg)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Various error-handling fixes, mostly in Unix PuTTY but one (failure to save a session) crosses over into the platform-independent side. [originally from svn r3041]
2003-04-01 18:10:25 +00:00
messagebox(window, "PuTTY Fatal Error", msg,
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
FALSE, "OK", 'o', 1, 1, NULL);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Various error-handling fixes, mostly in Unix PuTTY but one (failure to save a session) crosses over into the platform-independent side. [originally from svn r3041]
2003-04-01 18:10:25 +00:00
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
void nonfatal_message_box(void *window, const char *msg)
Add a nonfatal() function everywhere, to be used for reporting things that the user really ought to know but that are not actually fatal to continued operation of PuTTY or a single network connection. [originally from svn r9932]
2013-07-19 17:44:28 +00:00
{
messagebox(window, "PuTTY Error", msg,
string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
FALSE, "OK", 'o', 1, 1, NULL);
Add a nonfatal() function everywhere, to be used for reporting things that the user really ought to know but that are not actually fatal to continued operation of PuTTY or a single network connection. [originally from svn r9932]
2013-07-19 17:44:28 +00:00
}
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
void fatalbox(const char *p, ...)
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
{
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
va_list ap;
char *msg;
va_start(ap, p);
msg = dupvprintf(p, ap);
va_end(ap);
Various error-handling fixes, mostly in Unix PuTTY but one (failure to save a session) crosses over into the platform-independent side. [originally from svn r3041]
2003-04-01 18:10:25 +00:00
fatal_message_box(NULL, msg);
Checkin of last night's work on GTK message boxes. Unix PuTTY now has proper GUI prompts for host keys etc, so it should now be usable without a controlling tty. [originally from svn r3028]
2003-03-31 11:21:07 +00:00
sfree(msg);
cleanup_exit(1);
First stab at a GTK layout engine. It's missing all sorts of stuff (list boxes are particularly conspicuously absent), it has no event handling at all, and it isn't in any way integrated into pterm - you have to build it specially using the test stubs in gtkdlg.c. But what there is so far seems to work plausibly well, so it's a start. Rather than browbeat the existing GTK container/layout widgets into doing what I wanted, I decided to implement two subclasses of GtkContainer myself, which implement precisely the layout model assumed by the config box specification; this has the rather cool consequence that the box can be resized and will maintain the same layout at all times that it would have had if initially created at that size. [originally from svn r2931]
2003-03-13 19:52:28 +00:00
}
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
Giant const-correctness patch of doom! Having found a lot of unfixed constness issues in recent development, I thought perhaps it was time to get proactive, so I compiled the whole codebase with -Wwrite-strings. That turned up a huge load of const problems, which I've fixed in this commit: the Unix build now goes cleanly through with -Wwrite-strings, and the Windows build is as close as I could get it (there are some lingering issues due to occasional Windows API functions like AcquireCredentialsHandle not having the right constness). Notable fallout beyond the purely mechanical changing of types: - the stuff saved by cmdline_save_param() is now explicitly dupstr()ed, and freed in cmdline_run_saved. - I couldn't make both string arguments to cmdline_process_param() const, because it intentionally writes to one of them in the case where it's the argument to -pw (in the vain hope of being at least slightly friendly to 'ps'), so elsewhere I had to temporarily dupstr() something for the sake of passing it to that function - I had to invent a silly parallel version of const_cmp() so I could pass const string literals in to lookup functions. - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
2015-05-15 10:15:42 +00:00
void nonfatal(const char *p, ...)
Add a nonfatal() function everywhere, to be used for reporting things that the user really ought to know but that are not actually fatal to continued operation of PuTTY or a single network connection. [originally from svn r9932]
2013-07-19 17:44:28 +00:00
{
va_list ap;
char *msg;
va_start(ap, p);
msg = dupvprintf(p, ap);
va_end(ap);
Fix cut-and-paste errors in nonfatal() implementations. Unix GUI programs should not say 'Fatal Error' in the message box title, and Plink should not destroy its logging context as a side effect of printing a non-fatal error. Both appear to have been due to inattentive cut and paste from the pre-existing fatal error functions. [originally from svn r10044]
2013-09-23 14:35:08 +00:00
nonfatal_message_box(NULL, msg);
Add a nonfatal() function everywhere, to be used for reporting things that the user really ought to know but that are not actually fatal to continued operation of PuTTY or a single network connection. [originally from svn r9932]
2013-07-19 17:44:28 +00:00
sfree(msg);
}
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
static GtkWidget *aboutbox = NULL;
static void about_close_clicked(GtkButton *button, gpointer data)
{
gtk_widget_destroy(aboutbox);
aboutbox = NULL;
}
Make sure Escape terminates the About box. I think it only did so in GTK2 by virtue of the About box being a GtkDialog. But in GTK3 I've abandoned GtkDialog for not being flexible enough, so I have to process the Escape key myself.
2015-09-26 13:09:27 +00:00
static void about_key_press(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
if (event->keyval == GDK_KEY_Escape && aboutbox) {
gtk_widget_destroy(aboutbox);
aboutbox = NULL;
}
}
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
static void licence_clicked(GtkButton *button, gpointer data)
{
char *title;
title = dupcat(appname, " Licence", NULL);
assert(aboutbox != NULL);
Stop copying the licence text into C source code. Now all the uses of the licence text or the short copyright notice get it from a new header "licence.h", which in turn is built by a Perl script licence.pl invoked by mkfiles.pl, using LICENCE itself as the source. Hence, I can completely remove a whole section from the list of licence locations in CHECKLST.txt :-)
2015-12-22 12:43:31 +00:00
messagebox(aboutbox, title, LICENCE_TEXT("\n\n"),
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
string_width("LONGISH LINE OF TEXT SO THE LICENCE"
" BOX ISN'T EXCESSIVELY TALL AND THIN"),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
TRUE, "OK", 'o', 1, 1, NULL);
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
sfree(title);
}
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
void about_box(void *window)
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
{
GtkWidget *w;
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
GtkBox *action_area;
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
char *title;
if (aboutbox) {
gtk_widget_grab_focus(aboutbox);
return;
}
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
aboutbox = our_dialog_new();
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
gtk_container_set_border_width(GTK_CONTAINER(aboutbox), 10);
title = dupcat("About ", appname, NULL);
gtk_window_set_title(GTK_WINDOW(aboutbox), title);
sfree(title);
w = gtk_button_new_with_label("Close");
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_widget_set_can_default(w, TRUE);
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
gtk_window_set_default(GTK_WINDOW(aboutbox), w);
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
action_area = our_dialog_make_action_hbox(GTK_WINDOW(aboutbox));
gtk_box_pack_end(action_area, w, FALSE, FALSE, 0);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(about_close_clicked), NULL);
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
gtk_widget_show(w);
w = gtk_button_new_with_label("View Licence");
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_widget_set_can_default(w, TRUE);
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
gtk_box_pack_end(action_area, w, FALSE, FALSE, 0);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(licence_clicked), NULL);
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
gtk_widget_show(w);
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
{
char *label_text = dupprintf
("%s\n\n%s\n\n%s",
appname, ver,
Stop copying the licence text into C source code. Now all the uses of the licence text or the short copyright notice get it from a new header "licence.h", which in turn is built by a Perl script licence.pl invoked by mkfiles.pl, using LICENCE itself as the source. Hence, I can completely remove a whole section from the list of licence locations in CHECKLST.txt :-)
2015-12-22 12:43:31 +00:00
"Copyright " SHORT_COPYRIGHT_DETAILS ". All rights reserved");
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
w = gtk_label_new(label_text);
gtk_label_set_justify(GTK_LABEL(w), GTK_JUSTIFY_CENTER);
#if GTK_CHECK_VERSION(2,0,0)
gtk_label_set_selectable(GTK_LABEL(w), TRUE);
#endif
sfree(label_text);
}
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 0);
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
#if GTK_CHECK_VERSION(2,0,0)
/*
* Same precautions against initial select-all as in messagebox().
*/
gtk_widget_grab_focus(w);
gtk_label_select_region(GTK_LABEL(w), 0, 0);
#endif
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
gtk_widget_show(w);
Make sure Escape terminates the About box. I think it only did so in GTK2 by virtue of the About box being a GtkDialog. But in GTK3 I've abandoned GtkDialog for not being flexible enough, so I have to process the Escape key myself.
2015-09-26 13:09:27 +00:00
g_signal_connect(G_OBJECT(aboutbox), "key_press_event",
G_CALLBACK(about_key_press), NULL);
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
set_transient_window_pos(GTK_WIDGET(window), aboutbox);
Set WM_TRANSIENT_FOR appropriately on the "about" box so that fvwm doesn't insist on finding a bit of spare screen to put it in. Still pondering whether it's sensible to do this with the "change settings" box as well. [originally from svn r8970]
2010-06-29 22:00:43 +00:00
gtk_window_set_transient_for(GTK_WINDOW(aboutbox),
GTK_WINDOW(window));
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
gtk_container_set_focus_child(GTK_CONTAINER(aboutbox), NULL);
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
gtk_widget_show(aboutbox);
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
gtk_window_set_focus(GTK_WINDOW(aboutbox), NULL);
Ctrl+rightclick now pops up a context menu in Unix PuTTY and pterm. This menu is not yet fully populated, but it has an About box (yet another licence location :-/ ) and supports the new configurable specials menu (thus making Unix PuTTY do one tiny thing which OpenSSH-in-a-pterm can't :-). [originally from svn r3062]
2003-04-05 16:05:00 +00:00
}
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
struct eventlog_stuff {
GtkWidget *parentwin, *window;
struct controlbox *eventbox;
struct Shortcuts scs;
struct dlgparam dp;
union control *listctrl;
char **events;
int nevents, negsize;
Cutting and pasting from the Unix Event Log. [originally from svn r3095]
2003-04-11 17:40:52 +00:00
char *seldata;
int sellen;
int ignore_selchange;
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
};
static void eventlog_destroy(GtkWidget *widget, gpointer data)
{
struct eventlog_stuff *es = (struct eventlog_stuff *)data;
es->window = NULL;
Cutting and pasting from the Unix Event Log. [originally from svn r3095]
2003-04-11 17:40:52 +00:00
sfree(es->seldata);
Fix a double-free in the Gtk event log. It could occur some time after a line was selected in the event log window.
2014-11-08 22:22:34 +00:00
es->seldata = NULL;
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
dlg_cleanup(&es->dp);
ctrl_free_box(es->eventbox);
}
static void eventlog_ok_handler(union control *ctrl, void *dlg,
void *data, int event)
{
if (event == EVENT_ACTION)
dlg_end(dlg, 0);
}
static void eventlog_list_handler(union control *ctrl, void *dlg,
void *data, int event)
{
struct eventlog_stuff *es = (struct eventlog_stuff *)data;
if (event == EVENT_REFRESH) {
int i;
dlg_update_start(ctrl, dlg);
dlg_listbox_clear(ctrl, dlg);
for (i = 0; i < es->nevents; i++) {
dlg_listbox_add(ctrl, dlg, es->events[i]);
}
dlg_update_done(ctrl, dlg);
Cutting and pasting from the Unix Event Log. [originally from svn r3095]
2003-04-11 17:40:52 +00:00
} else if (event == EVENT_SELCHANGE) {
int i;
int selsize = 0;
/*
* If this SELCHANGE event is happening as a result of
* deliberate deselection because someone else has grabbed
* the selection, the last thing we want to do is pre-empt
* them.
*/
if (es->ignore_selchange)
return;
/*
* Construct the data to use as the selection.
*/
sfree(es->seldata);
es->seldata = NULL;
es->sellen = 0;
for (i = 0; i < es->nevents; i++) {
if (dlg_listbox_issel(ctrl, dlg, i)) {
int extralen = strlen(es->events[i]);
if (es->sellen + extralen + 2 > selsize) {
selsize = es->sellen + extralen + 512;
es->seldata = sresize(es->seldata, selsize, char);
}
strcpy(es->seldata + es->sellen, es->events[i]);
es->sellen += extralen;
es->seldata[es->sellen++] = '\n';
}
}
if (gtk_selection_owner_set(es->window, GDK_SELECTION_PRIMARY,
GDK_CURRENT_TIME)) {
extern GdkAtom compound_text_atom;
gtk_selection_add_target(es->window, GDK_SELECTION_PRIMARY,
GDK_SELECTION_TYPE_STRING, 1);
gtk_selection_add_target(es->window, GDK_SELECTION_PRIMARY,
compound_text_atom, 1);
}
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
}
}
Cutting and pasting from the Unix Event Log. [originally from svn r3095]
2003-04-11 17:40:52 +00:00
void eventlog_selection_get(GtkWidget *widget, GtkSelectionData *seldata,
guint info, guint time_stamp, gpointer data)
{
struct eventlog_stuff *es = (struct eventlog_stuff *)data;
GTK 3 prep: use accessor functions for object data fields. We now build cleanly in GTK2 with -DGSEAL_ENABLE.
2015-08-08 14:53:43 +00:00
gtk_selection_data_set(seldata, gtk_selection_data_get_target(seldata), 8,
Patch from Colin Watson intended to give a clean Unix compile with GCC 4. (Since we choose to compile with -Werror, this is particularly important.) I haven't yet checked that the resulting source actually compiles cleanly with GCC 4, hence not marking `gcc4-warnings' as fixed just yet. [originally from svn r7041]
2006-12-30 23:00:14 +00:00
(unsigned char *)es->seldata, es->sellen);
Cutting and pasting from the Unix Event Log. [originally from svn r3095]
2003-04-11 17:40:52 +00:00
}
gint eventlog_selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
gpointer data)
{
struct eventlog_stuff *es = (struct eventlog_stuff *)data;
struct uctrl *uc;
/*
* Deselect everything in the list box.
*/
uc = dlg_find_byctrl(&es->dp, es->listctrl);
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
es->ignore_selchange = 1;
#if !GTK_CHECK_VERSION(2,0,0)
assert(uc->list);
gtk_list_unselect_all(GTK_LIST(uc->list));
#else
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
assert(uc->treeview);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
gtk_tree_selection_unselect_all
Rename a structure field to avoid clashing with one of the old GTK1 ones. (I'm going to merge the GTK1 list code back in under ifdefs, and I want none of the disputed structure fields to have the same names, so that I'll reliably be told by the compiler if I keep the wrong piece of code outside the ifdef.) [originally from svn r7965]
2008-04-04 10:16:24 +00:00
(gtk_tree_view_get_selection(GTK_TREE_VIEW(uc->treeview)));
Reinstate all the GTK1-specific code under ifdefs, and verify that we can now build and run successfully using both GTK1 and GTK2 by giving appropriate options to make. (Specifically, to override the default of GTK2 in favour of GTK1, "make GTK_CONFIG=gtk-config".) [originally from svn r7966]
2008-04-04 10:56:26 +00:00
#endif
es->ignore_selchange = 0;
Cutting and pasting from the Unix Event Log. [originally from svn r3095]
2003-04-11 17:40:52 +00:00
sfree(es->seldata);
es->sellen = 0;
es->seldata = NULL;
return TRUE;
}
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
void showeventlog(void *estuff, void *parentwin)
{
struct eventlog_stuff *es = (struct eventlog_stuff *)estuff;
GtkWidget *window, *w0, *w1;
GtkWidget *parent = GTK_WIDGET(parentwin);
struct controlset *s0, *s1;
union control *c;
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
int index;
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
char *title;
if (es->window) {
gtk_widget_grab_focus(es->window);
return;
}
dlg_init(&es->dp);
for (index = 0; index < lenof(es->scs.sc); index++) {
es->scs.sc[index].action = SHORTCUT_EMPTY;
}
es->eventbox = ctrl_new_box();
s0 = ctrl_getset(es->eventbox, "", "", "");
ctrl_columns(s0, 3, 33, 34, 33);
c = ctrl_pushbutton(s0, "Close", 'c', HELPCTX(no_help),
eventlog_ok_handler, P(NULL));
c->button.column = 1;
c->button.isdefault = TRUE;
s1 = ctrl_getset(es->eventbox, "x", "", "");
es->listctrl = c = ctrl_listbox(s1, NULL, NO_SHORTCUT, HELPCTX(no_help),
eventlog_list_handler, P(es));
c->listbox.height = 10;
c->listbox.multisel = 2;
c->listbox.ncols = 3;
c->listbox.percentages = snewn(3, int);
c->listbox.percentages[0] = 25;
c->listbox.percentages[1] = 10;
c->listbox.percentages[2] = 65;
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
es->window = window = our_dialog_new();
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
title = dupcat(appname, " Event Log", NULL);
gtk_window_set_title(GTK_WINDOW(window), title);
sfree(title);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
w0 = layout_ctrls(&es->dp, &es->scs, s0, GTK_WINDOW(window));
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_set_action_area(GTK_WINDOW(window), w0);
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
gtk_widget_show(w0);
Update all the list box code in gtkdlg.c to use the new-style GTK2 GtkTreeView, GtkComboBox and GtkComboBoxEntry instead of the various old deprecated stuff. Immediate benefit: GTK2 natively supports real drag lists, hooray! [originally from svn r7959]
2008-04-02 14:48:06 +00:00
w1 = layout_ctrls(&es->dp, &es->scs, s1, GTK_WINDOW(window));
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
gtk_container_set_border_width(GTK_CONTAINER(w1), 10);
GTK 3 prep: stop using *nearly* all GTK deprecated functions. Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile failure, for the use of gtk_quit_add() in idle_toplevel_callback_func. That function is apparently removed with no replacement in GTK 3, so I'll need to find a completely different approach to getting toplevel callbacks to run only in the outermost instance of gtk_main(). Also, this change doesn't do anything about the use of *GDK* deprecated functions, because those include the entire family of old-style drawing functions - i.e. the only way to build cleanly with -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.
2015-08-08 17:02:01 +00:00
gtk_widget_set_size_request(w1, 20 + string_width
("LINE OF TEXT GIVING WIDTH OF EVENT LOG IS "
"QUITE LONG 'COS SSH LOG ENTRIES ARE WIDE"),
-1);
Stop using GtkDialog (for most purposes) in GTK 3! They've now deprecated gtk_dialog_get_action_area, because they really want a dialog box's action area to be filled with nothing but buttons controlled by GTK which end the dialog with a response code. But we're accustomed to putting all sorts of other things in our action area - non-buttons, buttons that don't end the dialog, and sub-widgets that do layout - and so I think it's no longer sensible to be trying to coerce our use cases into GtkDialog. Hence, I'm introducing a set of wrapper functions which equivocate between a GtkDialog for GTK1 and GTK2, and a GtkWindow with a vbox in it for GTK3, and I'll lay out the action area by hand. (Not everything has sensible layout and margins in the new GTK3 system yet, but I can sort that out later.) Because the new functions are needed by gtkask.c, which doesn't link against gtkdlg.c or include putty.h, I've put them in a new source file and header file pair gtkmisc.[ch] which is common to gtkask and the main GTK edifice.
2015-08-31 14:45:18 +00:00
our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0);
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
gtk_widget_show(w1);
es->dp.data = es;
es->dp.shortcuts = &es->scs;
es->dp.lastfocus = NULL;
es->dp.retval = 0;
es->dp.window = window;
dlg_refresh(NULL, &es->dp);
if (parent) {
Minor improvements to subsidiary window placement; with any luck the Event Log should go off the side of the screen rather less often now. [originally from svn r3088]
2003-04-10 08:53:43 +00:00
set_transient_window_pos(parent, window);
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
gtk_window_set_transient_for(GTK_WINDOW(window),
GTK_WINDOW(parent));
} else
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_widget_show(window);
GTK 3 prep: use the glib names for base object types. All the things like GtkType, GtkObject, gtk_signal_connect and so on should now consistently have the new-style glib names like GType, GObject, g_signal_connect, etc.
2015-08-08 16:29:02 +00:00
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(eventlog_destroy), es);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(win_key_press), &es->dp);
g_signal_connect(G_OBJECT(window), "selection_get",
G_CALLBACK(eventlog_selection_get), es);
g_signal_connect(G_OBJECT(window), "selection_clear_event",
G_CALLBACK(eventlog_selection_clear), es);
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
}
void *eventlogstuff_new(void)
{
struct eventlog_stuff *es;
es = snew(struct eventlog_stuff);
memset(es, 0, sizeof(*es));
return es;
}
Colin's const-fixing Patch Of Death. Seems to build fine on Windows as well as Unix, so it can go in. [originally from svn r3162]
2003-05-04 14:18:18 +00:00
void logevent_dlg(void *estuff, const char *string)
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
{
struct eventlog_stuff *es = (struct eventlog_stuff *)estuff;
char timebuf[40];
New function ltime() returns a struct tm of the current local time. Fixes crashes when time() returns (time_t)-1 on Windows by using the Win32 GetLocalTime() function. (The Unix implementation still just uses time() and localtime().) [originally from svn r5086]
2005-01-09 14:27:48 +00:00
struct tm tm;
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
if (es->nevents >= es->negsize) {
es->negsize += 64;
es->events = sresize(es->events, es->negsize, char *);
}
New function ltime() returns a struct tm of the current local time. Fixes crashes when time() returns (time_t)-1 on Windows by using the Win32 GetLocalTime() function. (The Unix implementation still just uses time() and localtime().) [originally from svn r5086]
2005-01-09 14:27:48 +00:00
tm=ltime();
strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm);
Event Log for Unix PuTTY. Doesn't yet allow X selection of its contents, and doesn't automatically maintain scroll position at the bottom when new entries are added while the list is open, but it's a start. [originally from svn r3087]
2003-04-09 18:46:45 +00:00
es->events[es->nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
strcpy(es->events[es->nevents], timebuf);
strcat(es->events[es->nevents], string);
if (es->window) {
dlg_listbox_add(es->listctrl, &es->dp, es->events[es->nevents]);
}
es->nevents++;
}
When I implemented the GTK messagebox() function and everything that needed to use it, I completely forgot about askappend(). D'oh. [originally from svn r3101]
2003-04-11 18:44:05 +00:00
Turn 'Filename' into a dynamically allocated type with no arbitrary length limit, just as I did to FontSpec yesterday. [originally from svn r9316]
2011-10-02 11:01:57 +00:00
int askappend(void *frontend, Filename *filename,
Add asynchronous callback capability to the askappend() alert box. This was harder than verify_ssh_host_key() and askalg() put together, because: (a) askappend() can be called at any time, since it's a side effect of data-logging functions. Therefore there can be an unfinished askappend() alert at any time, and hence the OS X front end has to be prepared to _queue_ other alerts which occur during that time. (b) logging.c has to do something with data that comes in while it's waiting for an answer to askappend(). It buffers it until it knows what the user wants done with it. This involved something of a reorganisation of logging.c. [originally from svn r5344]
2005-02-18 18:33:31 +00:00
void (*callback)(void *ctx, int result), void *ctx)
When I implemented the GTK messagebox() function and everything that needed to use it, I completely forgot about askappend(). D'oh. [originally from svn r3101]
2003-04-11 18:44:05 +00:00
{
static const char msgtemplate[] =
"The session log file \"%.*s\" already exists. "
"You can overwrite it with a new session log, "
"append your session log to the end of it, "
"or disable session logging for this session.";
char *message;
char *mbtitle;
int mbret;
Turn 'Filename' into a dynamically allocated type with no arbitrary length limit, just as I did to FontSpec yesterday. [originally from svn r9316]
2011-10-02 11:01:57 +00:00
message = dupprintf(msgtemplate, FILENAME_MAX, filename->path);
When I implemented the GTK messagebox() function and everything that needed to use it, I completely forgot about askappend(). D'oh. [originally from svn r3101]
2003-04-11 18:44:05 +00:00
mbtitle = dupprintf("%s Log to File", appname);
mbret = messagebox(get_window(frontend), mbtitle, message,
string_width("LINE OF TEXT SUITABLE FOR THE"
" ASKAPPEND WIDTH"),
Make some static text in GTK dialogs selectable. I've made the licence text, the About box, and the host key dialog into GTK selectable edit controls. (The former because it contains a lot of text; the About box because pasting version numbers into bug reports is obviously useful; the host key because of the fingerprint.)
2015-12-22 12:32:48 +00:00
FALSE,
When I implemented the GTK messagebox() function and everything that needed to use it, I completely forgot about askappend(). D'oh. [originally from svn r3101]
2003-04-11 18:44:05 +00:00
"Overwrite", 'o', 1, 2,
"Append", 'a', 0, 1,
"Disable", 'd', -1, 0,
NULL);
sfree(message);
sfree(mbtitle);
return mbret;
}
Reference in New Issue Copy Permalink