- Dillo-dev - lists.mailman3.com

[INFRINGEMENT... errr PATCH] Html_image_menu signal propagation cleanup

by Frank de Lange

Hi'all, First, forgive me the snide remark in the title, I am not that fond of lawyer-speak. Second, this is a small cleanup for html.c which removes the need for an explicit signal emission stop in Html_image_menu. The comment in html.c:Html_image_menu() reads: /* If the signal is not stopped, Dw_image_button_press will be called, * and return FALSE, so that the "button_press_event" signal is regarded * as not processed. The fact that here, TRUE is returned, does not seem * to play a role!? */ No, signal return values do not influence the current *emission*, only the *propagation* of it. And, when connected with gtk_signal_connect, the default handler is the last one to run - so it is the return value for the default handler which decides whether the signal will be propagated or not. To have the return value for a custom handler decide this, it needs to be connected with gtk_signal_connect_after so it is the last handler to run. That is all this simple patch does. Cheers//Frank -- WWWWW ________________________ ## o o\ / Frank de Lange \ }# \| / +46-734352015 \ \ `--| _/ <Hacker for Hire> \ `---' \ +31-640037120 / \ frank(a)unternet.org / `------------------------' [ "Omnis enim res, quae dando non deficit, dum habetur et non datur, nondum habetur, quomodo habenda est." ] --- dillo/src/html.c 2003-11-21 22:33:49.000000000 +0100 +++ dillo_patched/src/html.c 2003-12-02 12:59:46.455306584 +0100 @@ -355,11 +355,6 @@ a_Menu_popup_set_url(bw, image->url); gtk_menu_popup(GTK_MENU(bw->menu_popup.over_image), NULL, NULL, NULL, NULL, event->button, event->time); - /* If the signal is not stopped, Dw_image_button_press will be called, - * and return FALSE, so that the "button_press_event" signal is regarded - * as not processed. The fact that here, TRUE is returned, does not seem - * to play a role!? */ - gtk_signal_emit_stop_by_name (GTK_OBJECT (image), "button_press_event"); return TRUE; } @@ -2248,8 +2243,8 @@ Image = Html_add_new_image(html, tag, tagsize, &style_attrs, TRUE); Html_connect_signals(html, GTK_OBJECT(Image->dw)); - gtk_signal_connect(GTK_OBJECT(Image->dw), "button_press_event", - GTK_SIGNAL_FUNC(Html_image_menu), html->bw); + gtk_signal_connect_after(GTK_OBJECT(Image->dw), "button_press_event", + GTK_SIGNAL_FUNC(Html_image_menu), html->bw); /* Image maps */ if (Html_get_attr(html, tag, tagsize, "ismap")) {

Dec. 2, 2003

Official Statement

by Sebastian Geerken

Hi! This is an official statement about Dillo project's management, by the Dillo core team (mainly core and steady developers). About project management: ------------------------- There's an interesting difference between a: "code contribution" and a "code modification". The Dillo project, as a SW project, is not simply its code base. Among others, it has a core team that defines the development plans, policies, time frames, and technical details. If a "patch" happens to be aligned with the goals and technical guidelines defined by the core team, it's regarded as a "code contribution". If it doesn't follow them, or clearly infringes them, it is a "code modification". A "code modification" doesn't belong to the project, and must be hosted and supported elsewhere. Obviously, the code modification author can try to convince the core team of the idea (with reasonable arguments, not rants nor pejorative sentences, according to our mailing list etiquette). The final decision is up to Dillo's core team, and if the patch continues to be regarded as a "code modification" it must be hosted, discussed and supported elsewhere. About the dillo-dev mailing list: --------------------------------- dillo-dev is not the standard discussion forum of the web. It has an outstanding tradition of polite and respectful communication. dillo-dev is being flooded with rude emails from "code modifiers" that not only disregard the mailing list guidelines, but also refer to the core team's work in pejorative terms. This creates a very unfriendly atmosphere which has been severely detrimental to the continued development of Dillo. This situation has led some members of the team to communicate directly with each other. This is very bad because it has resulted in a lot of messages unrelated to the project which confuse subscribers about the current direction of Dillo development. Messages which are outside the bounds defined in the guidelines at http://www.dillo.org/MList.html are ignored and will remain unanswered. We strongly urge the "code modifiers" to find their own mailing list for discussing their "code modification" ideas, and to stop violating our mailing list etiquette. Please do not post any replies to this statement on dillo-dev. If any comments about this statement are posted to dillo-dev we urge all our subscribers not to follow the thread. Sincerely, Dillo core team.

Dec. 1, 2003

Re: [Dillo-dev] Patch to allow setting of initial position

by Eric GAUDET

It works for me with today's CVS and your patch. in dillorc: geometry=320x200+50+50 dillo.pos/src>./dillo Setting geometry from rc to 320x200 50 50 ... The only problem, it seems, is that it still prints the dillorc setting, even when the CLI option is used: dillo.pos/src>./dillo -geometry 700x100+10+400 Setting geometry from CLI to 700x100 10 400 Setting geometry from rc to 320x200 50 50 ... The first one is actually used, but having the second message is confusing. Best, EG -- En reponse de "Re: [Dillo-dev] Patch to allow setting of initial position" de Jan Dittmer, le 30-Nov-2003 : > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Jorge Arellano Cid wrote: >| >| I understand. Maybe the "canonical" solution to this problem is >| to add support for the geometry CLI option. >| >| That is: >| >| -geometry <width>x<height>{+-}<x>{+-}<y> >| >| Can you make the patch this way? >| > > Here is a preliminary version. Only problem is that entering it in the > dillorc doesn't work, because the parser doesn't recognize the + as part > of a string resulting in these errors: > > dillorc:2: unexpected character `+', expected symbol > dillorc:2: unexpected character `0', expected symbol > dillorc:2: unexpected character `+', expected symbol > dillorc:2: unexpected character `0', expected symbol > dillorc:2: error: unexpected character `0', expected symbol > > So I tried changing > > - - "~-_:&%#/.0123456789" > + "~-_:&%#/.0123456789+" > > in prefs.c, which doesn't work. How the parse be changed that it > recognizes + as part of the value? > > Thanks, > > Jan > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.2.3 (GNU/Linux) > Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org > > iD8DBQE/ygYdLqMJRclVKIYRApfZAJ4jb1fc3Dd8OrMB+Csgyekz74VikwCfaFv5 > s7AZVApr+hS8dRtKK97kS0Y= > =axoU > -----END PGP SIGNATURE----- ------------------------------------------------------------------------ Eric GAUDET <eric(a)rti-zone.org> Le 30-Nov-2003 a 13:41:12 "Parler pour ne rien dire et ne rien dire pour parler sont les deux principes majeurs et rigoureux de tous ceux qui feraient mieux de la fermer avant de l'ouvrir." ------------------------------------------------------------------------

Nov. 30, 2003

Re: [Dillo-dev] Patch to allow setting of initial position

by Jan Dittmer

Eric GAUDET wrote: > It works for me with today's CVS and your patch. > > in dillorc: > geometry=320x200+50+50 > > dillo.pos/src>./dillo > Setting geometry from rc to 320x200 50 50 > ... > > The only problem, it seems, is that it still prints the dillorc setting, > even when the CLI option is used: > > dillo.pos/src>./dillo -geometry 700x100+10+400 > Setting geometry from CLI to 700x100 10 400 > Setting geometry from rc to 320x200 50 50 > ... > > The first one is actually used, but having the second message is confusing. Those can probably both go entirely. It was more for debug uses. Here is an updated patch with those removed. Jan Common subdirectories: org/src/IO and jan/src/IO diff -u org/src/dillo.c jan/src/dillo.c --- org/src/dillo.c Tue Jul 22 22:51:22 2003 +++ jan/src/dillo.c Sun Nov 30 22:48:24 2003 @@ -21,6 +21,7 @@ #include <stdio.h> #include <gtk/gtk.h> +#include <X11/Xlib.h> #include <sys/types.h> #include <sys/stat.h> @@ -66,6 +67,7 @@ DILLO_CLI_HELP = 1 << 3, DILLO_CLI_VERSION = 1 << 4, DILLO_CLI_LOCAL = 1 << 5, + DILLO_CLI_GEOMETRY = 1 << 6, DILLO_CLI_ERROR = 1 << 31 }; @@ -98,6 +100,9 @@ " -f, --fullwindow Start in full window mode."}, {"-l", "--local", 0, DILLO_CLI_LOCAL, " -l, --local Don't follow links for this URL(s)."}, + {"-g", "-geometry", 1, DILLO_CLI_GEOMETRY, + " -g, -geometry GEO Set initial window position where GEO is\n" + " <width>x<height>{+-}<x>{+-}<y>"}, {NULL, NULL, 0, 0, NULL} }; @@ -194,6 +199,8 @@ guint opt_flg; gint i; char **opt_argv = NULL; + gint xpos = D_GEOMETRY_DEFAULT_XPOS, ypos = D_GEOMETRY_DEFAULT_YPOS; + gint width = D_GEOMETRY_DEFAULT_WIDTH, height = D_GEOMETRY_DEFAULT_HEIGHT; /* set locale */ curr_locale = g_strdup(setlocale(LC_ALL, NULL)); @@ -226,6 +233,9 @@ case DILLO_CLI_FULLWINDOW: case DILLO_CLI_LOCAL: break; + case DILLO_CLI_GEOMETRY: + if ( XParseGeometry(opt_argv[0], &xpos, &ypos, &width, &height) ) + break; default: g_print("Error in command line options.\n"); return -1; @@ -265,9 +275,18 @@ if (options_got & DILLO_CLI_FULLWINDOW) prefs.fullwindow_start = TRUE; + /* override dillorc geometry */ + if (options_got & DILLO_CLI_GEOMETRY) { + prefs.width = width; + prefs.height = height; + prefs.xpos = xpos; + prefs.ypos = ypos; + } /* a_Nav_init() has been moved into this call because it needs to be * initialized with the new browser_window structure */ bw = a_Interface_browser_window_new(prefs.width, prefs.height, xid); + if ( (prefs.xpos != D_GEOMETRY_DEFAULT_XPOS) && (prefs.ypos != D_GEOMETRY_DEFAULT_YPOS) ) + gtk_widget_set_uposition(bw->main_window, prefs.xpos, prefs.ypos); a_Bookmarks_init(); diff -u org/src/prefs.c jan/src/prefs.c --- org/src/prefs.c Mon Jul 7 17:40:15 2003 +++ jan/src/prefs.c Sun Nov 30 22:48:36 2003 @@ -19,6 +19,8 @@ */ #include <glib.h> +#include <gtk/gtk.h> +#include <X11/Xlib.h> #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> @@ -104,14 +106,8 @@ /* assign value and exit successfully */ switch (symbol) { case DRC_TOKEN_GEOMETRY: { - gchar *ptr, *str = scanner->value.v_string; - gint width, height; - - if ( (ptr = strchr(str, 'x')) && (width = strtol(str,NULL,10)) && - (height = strtol(++ptr,NULL,10)) ){ - prefs.width = width; - prefs.height = height; - } + gchar *str = scanner->value.v_string; + XParseGeometry(str, &prefs.xpos, &prefs.ypos, &prefs.width, &prefs.height); } break; case DRC_TOKEN_PROXY: @@ -261,7 +257,7 @@ /* Specifies the chars which can be used in identifiers */ scanner->config->cset_identifier_nth = ( G_CSET_a_2_z - "~-_:&%#/.0123456789" + "~-_:&%#/.0123456789+" G_CSET_A_2_Z G_CSET_LATINS /*??? I don't know if we need these two */ G_CSET_LATINC /*??? */ @@ -329,6 +325,8 @@ prefs.width = D_GEOMETRY_DEFAULT_WIDTH; prefs.height = D_GEOMETRY_DEFAULT_HEIGHT; + prefs.xpos = D_GEOMETRY_DEFAULT_XPOS; + prefs.ypos = D_GEOMETRY_DEFAULT_YPOS; prefs.http_proxy = NULL; prefs.no_proxy = NULL; prefs.no_proxy_vec = NULL; diff -u org/src/prefs.h jan/src/prefs.h --- org/src/prefs.h Thu Jul 10 00:00:34 2003 +++ jan/src/prefs.h Sun Nov 30 15:29:57 2003 @@ -10,6 +10,8 @@ #define DILLO_HOME "http://www.dillo.org/" #define D_GEOMETRY_DEFAULT_WIDTH 640 #define D_GEOMETRY_DEFAULT_HEIGHT 550 +#define D_GEOMETRY_DEFAULT_XPOS -9999 +#define D_GEOMETRY_DEFAULT_YPOS -9999 #define DW_COLOR_DEFAULT_GREY 0xd6d6d6 #define DW_COLOR_DEFAULT_BLACK 0x000000 @@ -70,6 +72,8 @@ struct _DilloPrefs { gint width; gint height; + gint xpos; + gint ypos; DilloUrl *http_proxy; gchar *no_proxy; gchar **no_proxy_vec;

Nov. 30, 2003

Re: [Dillo-dev] How do you un-subscribe to this list

by Patrick Shanahan

* Ronald W. Henderson <rwhalb(a)nycap.rr.com> [11-30-03 12:27]: > Folks: > > I looked on this site and do not know how to un-subscribe to this list. > Thanks in advance... > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)lists.auriga.wearlab.de > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev Almost all mail-lists have subscribe/unsubscribe info in their headers, as does the one you posted: List-Unsubscribe: <http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev>, <mailto:dillo-dev-request@lists.auriga.wearlab.de?subject=unsubscribe> and the url listed at the bottom of every posting, included above. -- Patrick Shanahan Registered Linux User #207535 http://wahoo.no-ip.org @ http://counter.li.org

Nov. 30, 2003

Re: [Dillo-dev] How do you un-subscribe to this list

by Mattias Östergren

On Sun, 30 Nov 2003 11:34:20 -0500 "Ronald W. Henderson" <rwhalb(a)nycap.rr.com> wrote: > Folks: > > I looked on this site and do not know how to un-subscribe to this list. > Thanks in advance... Go to the URL in the bottom of this mail and then fill in your email address in the box at the bottom of that page.

Nov. 30, 2003

How do you un-subscribe to this list

by Ronald W. Henderson

Folks: I looked on this site and do not know how to un-subscribe to this list. Thanks in advance...

Nov. 30, 2003

Re: [Dillo-dev] Patch to allow setting of initial position

by Jan Dittmer

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Jorge Arellano Cid wrote: | | I understand. Maybe the "canonical" solution to this problem is | to add support for the geometry CLI option. | | That is: | | -geometry <width>x<height>{+-}<x>{+-}<y> | | Can you make the patch this way? | Here is a preliminary version. Only problem is that entering it in the dillorc doesn't work, because the parser doesn't recognize the + as part of a string resulting in these errors: dillorc:2: unexpected character `+', expected symbol dillorc:2: unexpected character `0', expected symbol dillorc:2: unexpected character `+', expected symbol dillorc:2: unexpected character `0', expected symbol dillorc:2: error: unexpected character `0', expected symbol So I tried changing - - "~-_:&%#/.0123456789" + "~-_:&%#/.0123456789+" in prefs.c, which doesn't work. How the parse be changed that it recognizes + as part of the value? Thanks, Jan -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQE/ygYdLqMJRclVKIYRApfZAJ4jb1fc3Dd8OrMB+Csgyekz74VikwCfaFv5 s7AZVApr+hS8dRtKK97kS0Y= =axoU -----END PGP SIGNATURE----- Common subdirectories: org/src/IO and jan/src/IO diff -u org/src/dillo.c jan/src/dillo.c --- org/src/dillo.c Tue Jul 22 22:51:22 2003 +++ jan/src/dillo.c Sun Nov 30 15:59:29 2003 @@ -21,6 +21,7 @@ #include <stdio.h> #include <gtk/gtk.h> +#include <X11/Xlib.h> #include <sys/types.h> #include <sys/stat.h> @@ -66,6 +67,7 @@ DILLO_CLI_HELP = 1 << 3, DILLO_CLI_VERSION = 1 << 4, DILLO_CLI_LOCAL = 1 << 5, + DILLO_CLI_GEOMETRY = 1 << 6, DILLO_CLI_ERROR = 1 << 31 }; @@ -98,6 +100,9 @@ " -f, --fullwindow Start in full window mode."}, {"-l", "--local", 0, DILLO_CLI_LOCAL, " -l, --local Don't follow links for this URL(s)."}, + {"-g", "-geometry", 1, DILLO_CLI_GEOMETRY, + " -g, -geometry GEO Set initial window position where GEO is\n" + " <width>x<height>{+-}<x>{+-}<y>"}, {NULL, NULL, 0, 0, NULL} }; @@ -194,6 +199,8 @@ guint opt_flg; gint i; char **opt_argv = NULL; + gint xpos = D_GEOMETRY_DEFAULT_XPOS, ypos = D_GEOMETRY_DEFAULT_YPOS; + gint width = D_GEOMETRY_DEFAULT_WIDTH, height = D_GEOMETRY_DEFAULT_HEIGHT; /* set locale */ curr_locale = g_strdup(setlocale(LC_ALL, NULL)); @@ -226,6 +233,11 @@ case DILLO_CLI_FULLWINDOW: case DILLO_CLI_LOCAL: break; + case DILLO_CLI_GEOMETRY: + if ( XParseGeometry(opt_argv[0], &xpos, &ypos, &width, &height) ) { + g_print("Setting geometry from CLI to %dx%d %d %d\n", width, height, xpos, ypos); + break; + } default: g_print("Error in command line options.\n"); return -1; @@ -265,9 +277,18 @@ if (options_got & DILLO_CLI_FULLWINDOW) prefs.fullwindow_start = TRUE; + /* override dillorc geometry */ + if (options_got & DILLO_CLI_GEOMETRY) { + prefs.width = width; + prefs.height = height; + prefs.xpos = xpos; + prefs.ypos = ypos; + } /* a_Nav_init() has been moved into this call because it needs to be * initialized with the new browser_window structure */ bw = a_Interface_browser_window_new(prefs.width, prefs.height, xid); + if ( (prefs.xpos != D_GEOMETRY_DEFAULT_XPOS) && (prefs.ypos != D_GEOMETRY_DEFAULT_YPOS) ) + gtk_widget_set_uposition(bw->main_window, prefs.xpos, prefs.ypos); a_Bookmarks_init(); diff -u org/src/prefs.c jan/src/prefs.c --- org/src/prefs.c Mon Jul 7 17:40:15 2003 +++ jan/src/prefs.c Sun Nov 30 16:00:14 2003 @@ -19,6 +19,8 @@ */ #include <glib.h> +#include <gtk/gtk.h> +#include <X11/Xlib.h> #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> @@ -104,14 +106,9 @@ /* assign value and exit successfully */ switch (symbol) { case DRC_TOKEN_GEOMETRY: { - gchar *ptr, *str = scanner->value.v_string; - gint width, height; - - if ( (ptr = strchr(str, 'x')) && (width = strtol(str,NULL,10)) && - (height = strtol(++ptr,NULL,10)) ){ - prefs.width = width; - prefs.height = height; - } + gchar *str = scanner->value.v_string; + XParseGeometry(str, &prefs.xpos, &prefs.ypos, &prefs.width, &prefs.height); + g_print("Setting geometry from rc to %dx%d %d %d\n", prefs.width, prefs.height, prefs.xpos, prefs.ypos); } break; case DRC_TOKEN_PROXY: @@ -261,7 +258,7 @@ /* Specifies the chars which can be used in identifiers */ scanner->config->cset_identifier_nth = ( G_CSET_a_2_z - "~-_:&%#/.0123456789" + "~-_:&%#/.0123456789+" G_CSET_A_2_Z G_CSET_LATINS /*??? I don't know if we need these two */ G_CSET_LATINC /*??? */ @@ -329,6 +326,8 @@ prefs.width = D_GEOMETRY_DEFAULT_WIDTH; prefs.height = D_GEOMETRY_DEFAULT_HEIGHT; + prefs.xpos = D_GEOMETRY_DEFAULT_XPOS; + prefs.ypos = D_GEOMETRY_DEFAULT_YPOS; prefs.http_proxy = NULL; prefs.no_proxy = NULL; prefs.no_proxy_vec = NULL; diff -u org/src/prefs.h jan/src/prefs.h --- org/src/prefs.h Thu Jul 10 00:00:34 2003 +++ jan/src/prefs.h Sun Nov 30 15:29:57 2003 @@ -10,6 +10,8 @@ #define DILLO_HOME "http://www.dillo.org/" #define D_GEOMETRY_DEFAULT_WIDTH 640 #define D_GEOMETRY_DEFAULT_HEIGHT 550 +#define D_GEOMETRY_DEFAULT_XPOS -9999 +#define D_GEOMETRY_DEFAULT_YPOS -9999 #define DW_COLOR_DEFAULT_GREY 0xd6d6d6 #define DW_COLOR_DEFAULT_BLACK 0x000000 @@ -70,6 +72,8 @@ struct _DilloPrefs { gint width; gint height; + gint xpos; + gint ypos; DilloUrl *http_proxy; gchar *no_proxy; gchar **no_proxy_vec;

Nov. 30, 2003

Re: [Dillo-dev] Re: about feedback

by Maurice McCarthy

Indan I actually thought you were a developer! Just to add to what others have said, your efforts are certainly appreciated in this quarter. As a complete numpty in programming little things like your install script are a joy to me. Look, copy and learn. Still have not managed to install Frank's tabs patch yet but I've by no means exhausted all I can do yet, so I'm not prepared to ask for help but want to plug away at it. I'll try to get your https patch in too. I suppose email suffers from what it fails to communicate, the nod of appreciation, the look of admiration, saying please and thank you etc. Well, thank you. Maurice

Nov. 29, 2003

Re: [Dillo-dev] Patch to allow setting of initial position

by Jorge Arellano Cid

On Fri, 28 Nov 2003, Jan Dittmer wrote: > Hi, > > for a TV Terminal I needed dillo to come up at a different position than > 0,0. As there is no window manager running I wrote a small patch which > allows to set the initial position of the upper left corner. Essentially > it just clones the geometry code and adds a config option > position=<xpos>x<ypos>. If it is not set or 0x0 specified it just takes > it's default position. > Perhaps this is of some use to anyone else. (Patch is against 0.7.3) I understand. Maybe the "canonical" solution to this problem is to add support for the geometry CLI option. That is: -geometry <width>x<height>{+-}<x>{+-}<y> Can you make the patch this way? Cheers Jorge.-

Nov. 29, 2003