Puppy Linux Discussion Forum

[amigo]

I'm anxious to see your notebook code.

This afternoon I took another tactic. I looked pretty hard at the 0.7. x series code and from the very first 0.7.4 it has really big changes all the way through, while 0.59.8 still looks much the same as 0.58.11. So, I started over with fresh 0.59.8 sources and did as I had with 0.58.1. I simply changed the configure.in and src/Makefile.am so that it would configure for gtk1. Then, I started running 'make 2> errors.txt' and looked at the result. For each error I found the spot in the sources and put 'ifdef USE_GTK' around the non-working lines. After about a half hour I had the thing compiling and linking -with nearly nothing working of course. Then, I cross-referenced with the last code from 0.58.10c and started pasting in your working code for the '#else'. In some places you seem to have replaced the original gtk2 with an equivalent which would work for either gtk1 or gtk2 -which is porbably a good thing in the long run. However, for now I have left the original gtk version and added the '#else' for your working gtk1/dual code. I also added in the pixmaps.h and misc.c which now holds the pixbuf-scaling routines. After just a little while I had the thing compiling and able to run the most basic widgets like the buttons, pixmaps, etc. I think there is still more to be done in some of the other files, but it will have to wait till tomorrow. I've left the original stuff in place with hardly any formatting changes (just a few of the same ones you had changed).

I think that it may be helpful to get this working and then aim for the 0.7.x series from this starting point. The changes in 0.7.x are, from the first, too many and complex for my abilities. You might find it easy enough to simply jump to 0.7.20 and dig in as you did before. Or it might be easier to start from this new base and work up through the original changes.

If you do start from 0.59.8, I'd recommend that you go through each official patch one-by-one and incorporate all the upstream changes, plus any minor details to make gtk1 work there as well. Hold off on adding extra features and even fixes for potential problems you see, until you get to the last version you want to target. Then, go through the whole code, make the formatting changes you want as a single patch/release without any real code changes *at all* -just formatting, whitespace, etc, whatever bother you. Then, go through again and start adding the fixes that see are useful, and then, finally, add in any extra features you have dreamed up along the way.

You don't need to make a new release for *every* one of the official versions which you have upgraded to -but I would, if I were you. Keep your versions limited to a manageable size, keep them easy to get an overview of and you won't be sorry. Usually when I do something like this, I create intermediate patches for each feature or fix which I implement. The patches may be useful to you later when you work on something else. Having each one contain just one 'bite', but a complete 'bite' of code which does just one thing, makes this lots easier.

We'll see how I do on the rest of 0.59.8 tomorrow. If it seems to be mostly working, we can easily switch to working there. If you have a chance to post or PM me your notebook code, I'll look at putting it into the base I am currently on -at the moment it is disabled, as are any other widgets which don't have corresponding gtk1 code.

[goingnuts]

I am touching the 0.7.20... Following amigos advices above to leave the original code intact if possible. On top of that I would like to make a more general approach to back porting. So to avoid some of the "#ifdef USE_GTK2 stuff" and rewriting for (almost) simple syntax differences between gtk1&2 I have been experimenting with redefining gtk2 stuff that gtk1 does not understand. Made a new code and a new header file, compat.c and compat.h. compat.h is included in gtkdialog.h (just add #include "compat.h" to gtkdialog.h).
Content in compat.h is like this:

[technosaurus]

aren't macros great!
I was doing about the same thing with sdialog, but got sidetracked so its not very useful as is, but may save you time looking it up...
some(/most?) of them may actually need to be functions (if one function maps to several like gdk_atom_*) or at least have the function parameters defined in the macro (where number/position of args changes)

[goingnuts]

technosaurus: Yes they are - and thanks for the list!
Now most of the pieces are in place - amigos 0.59 takes unmodified syntax (that is gtkdialog2 in puppy-world) and runs most of the widgets!
(@amigo: I revised it and have send the source).

The 0.7.20 compiles and takes original syntax as well (that is gtkdialog3 in puppy-world) although the widgets are hardly working and somewhat unstable...

[amigo]

Sorry guys, I've been out of the loop since Thursday -having some blood-pressure problems. I owe you both a PM.

Technosaurus, that compat-header is a great idea and a great compendium of differences between gtk1/gtk2. Could we add some psuedo-stock-icon support got gtk1 in there?

About the syntax -is it just the '--program ???' vs. '--program=???' (MAIN_DIALOG as default) or are there other differences? Could a snippet be written which would accept either syntax?

[goingnuts]

I have almost finalized a wrapper for the gtk2 syntax:
gtk_image_new_from_stock

which will support the script syntax:

<input file stock="gtk-zoom-out"></input>

and

<input file icon="about_kde"></input>

so at least the image files are recognized and used if found.

[amigo]

Super! I've got your 0.59.8b running here. notebook widget seems to be fine.

I see you've even got some text functions in your wrapper -very nice!

[goingnuts]

The wrapper for
gtk_image_new_from_file and gtk_image_new_from_stock
works now - and gives the gtk1 version support for stock and icon syntax.
Some of the examples wont run as we have disabled the chooser, gvim and tree. Thought that we should fix the code so the scripts run...
If the fileselect widget could be embedded it might replace chooser. I have to get a gvim to see if it is actually working already...and for the tree -
First try below:

[amigo]

"disabled the chooser, gvim and tree" still enabled in the parser, so you only need to remove the ifdefs in the variuos spots in automaton.c

Yes, a fileselector could be used as the chooser -it is implemented but as an action so it's in action.c. I think the right form for the chooser would be to use gtk_fileselection_hide_fileops instead of gtk_fileselection_new

Nice about the tree -I figured you were gonna get there. Looking forward to a tarball soon so I can update stuff there. BTW, I had left out a couple of extra block of code where you added some actions to some widget -a quick comparison with your original sources will show them, or I'll look back and find them if you don't. Looking really great, man!

[technosaurus]

looks nice!
you know ... putting some of these nuance macros (the general gtk1-gtk2 ones) into a single header file "gtk2compat.h" could be portable to other apps as well and significantly reduce the porting time for mainstream apps (not to mention making it easier to add to individual files within the project, just by adding a single #include) I'd be interested to take a look at this whenever you push another tarball.

[goingnuts]

I might have given the impression that the tree is running - its not. Above image is a hard coded tree...but the structure should be there. I think it is even more complex than the tree in 0.59.8 which seems to be more or less like a table...no sub levels as far as I can see - EDIT: wrong - there are sublevels.
I will try to pipe tree-requests to the table widget - script syntax seems to be equal. EDIT: Did not work.
I think I might have found a good gtk1 replacement for the chooser in amigos repo: mytreefilesel. Image of it running below EDIT:Removed image. It will add to the size but should be possible to embed it. And it looks good!
EDIT: mytreefilesel is also a topwidget (as the fileselect widget) so wont easily embed in the main window (its a pop up/dialog...). Found a way to embed fileselect widget and the method should work for myfileselect as well. Still having problems with the signal connections though..but below the present parts of the gtk1 chooser wrapper:

[amigo]

I was just hacking around on mytreefilesel yesterday in fact, to clean up the interface abit. Thta comes from the sources of gtk-extra -I split it out long ago. Yes, it is lovely compared to anything else out there -it would be so nice to get this hacked into gtk itself as the file selector. It also gives some ideas on how to give rox a tree-view -as an option.

Note that, internally, mytreefilesel uses a ctree instead of a regular tree.

[goingnuts]

Ok - I am stuck. Have spend a lot of time trying to modify the gtk1 fileselect popup-dialog to be more like the gtk2-chooser. The problem is how to get the path of the selected file. I have the code to get the filename but cant figure how to pull the path. Cant set up the right gtk_signal_connect it seems. The path is present in the pulldown_hbox and in the selection label, both are updated when directory are changed...

A have attached a simple example script which demonstrate the reparent process of the fileselect-popup to a main-widget and the callback that gets the filename (run it from console to view filename selected).

Any help would be appreciated. Basically 0.59.8 chooser only do the following as far as I can see:

GTK_FILE_CHOOSER_ACTION_OPEN
Indicates open mode. The file chooser will only let the user pick an existing file.

So its just a file chooser - but embedded in the main gtkdialog window - and not a pop-up dialog.

[technosaurus]

This link led me to dir_list
http://www.gtk.org/tutorial1.2/gtk_tut-9.html#ss9.14

found an example (gimp_path_editor_get_path) here:
http://www.rpi.edu/dept/acm/packages/gimp/gimp-1.2.3/libgimp/gimppatheditor.c

but maybe this is better as it does the base_dir
http://fossies.org/linux/misc/gcombust-0.1.55.tar.gz:a/gcombust-0.1.55/src/modify_file_set.c

[goingnuts]

technosaurus: Thanks! Your links brought me further - what a great place this is! I will post the working inline/embedded fileselect-example later today (will try to do some modifications of the widgets places first).

It now gives the full path + filename when the "selection_entry" change.

Update: Attached source for the skeleton code for the fileselect gtk1 widget that might be the chooser wrapper.