January 2011 - netsurf-commits - listmaster.pepperfish.net

r11544 chris_y - /trunk/netsurf/amiga/gui.c

by netsurf＠semichrome.net

Author: chris_y Date: Sun Jan 30 16:15:16 2011 New Revision: 11544 URL: http://source.netsurf-browser.org?rev=11544&view=rev Log: Kiosk mode now fills screen every time Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=11544&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sun Jan 30 16:15:16 2011 @@ -2739,8 +2739,8 @@ WA_RMBTrap,TRUE, WA_Top,0, WA_Left,0, - WA_Width,option_window_width, - WA_Height,option_window_height, + WA_Width, scrn->Width, + WA_Height, scrn->Height, WA_SizeGadget, FALSE, WA_CustomScreen,scrn, WA_ReportMouse,TRUE,

12 years, 4 months

1
0
0 / 0

r11543 mono - in /trunk/netsurf/atari: browser_win.c browser_win.h

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 16:15:15 2011 New Revision: 11543 URL: http://source.netsurf-browser.org?rev=11543&view=rev Log: Set default window title when opening window. Modified: trunk/netsurf/atari/browser_win.c trunk/netsurf/atari/browser_win.h Modified: trunk/netsurf/atari/browser_win.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser_win.c?rev=1... ============================================================================== --- trunk/netsurf/atari/browser_win.c (original) +++ trunk/netsurf/atari/browser_win.c Sun Jan 30 16:15:15 2011 @@ -209,6 +209,7 @@ { LGRECT br; WindOpen(gw->root->handle, 20, 20, app.w/2, app.h/2 ); + WindSetStr( gw->root->handle, WF_NAME, (char *)"" ); /* apply focus to the root frame: */ long lfbuff[8] = { CM_GETFOCUS }; mt_CompEvntExec( gl_appvar, gw->browser->comp, lfbuff ); @@ -281,6 +282,19 @@ mt_CompGetLGrect(&app, gw->root->statusbar->comp, WF_WORKXYWH, &rect); ApplWrite( _AESapid, WM_REDRAW, gw->root->handle->handle, rect.g_x, rect.g_y, rect.g_w, rect.g_h ); +} + +void window_set_stauts( struct gui_window * gw , char * text ) +{ + if( gw->root == NULL ) + return; + + CMP_STATUSBAR sb = gw->root->statusbar; + + if( sb == NULL || gw->browser->attached == false ) + return; + + sb_set_text( sb, text ); } /* set focus to an arbitary element */ Modified: trunk/netsurf/atari/browser_win.h URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser_win.h?rev=1... ============================================================================== --- trunk/netsurf/atari/browser_win.h (original) +++ trunk/netsurf/atari/browser_win.h Sun Jan 30 16:15:15 2011 @@ -53,6 +53,7 @@ bool window_widget_has_focus( struct gui_window * gw, enum focus_element_type t, void * element); bool window_url_widget_has_focus( struct gui_window * gw ); void window_set_url( struct gui_window * gw, const char * text); +void window_set_stauts( struct gui_window * gw , char * text ); void window_center(struct gui_window * gw); //void window_set_icon(struct gui_window * gw, void * data, bool is_rsc );

12 years, 4 months

1
0
0 / 0

r11542 mono - /trunk/netsurf/atari/Makefile.target

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 16:09:54 2011 New Revision: 11542 URL: http://source.netsurf-browser.org?rev=11542&view=rev Log: Added -DNO_IPV6, added search.c to the sources. Modified: trunk/netsurf/atari/Makefile.target Modified: trunk/netsurf/atari/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/atari/Makefile.target?rev... ============================================================================== --- trunk/netsurf/atari/Makefile.target (original) +++ trunk/netsurf/atari/Makefile.target Sun Jan 30 16:09:54 2011 @@ -5,7 +5,7 @@ $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG/MNG/JNG (libmng))) $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) -CFLAGS += -I/usr/GEM/include +CFLAGS += -I/usr/GEM/include -DNO_IPV6 LDFLAGS += -L/usr/GEM/lib -lcflib CFLAGS += -DATARI_USE_FREETYPE $(shell freetype-config --cflags) @@ -36,11 +36,11 @@ # S_ATARI are sources purely for the Atari FreeMiNT build S_ATARI := gui.c findfile.c filetype.c misc.c bitmap.c schedule.c \ download.c thumbnail.c login.c verify_ssl.c treeview.c hotlist.c history.c\ - font.c \ + search.c font.c \ plot.c plot/plotter.c plot/plotter_vdi.c plot/eddi.s \ plot/font_vdi.c plot/font_freetype.c \ browser_win.c toolbar.c statusbar.c browser.c \ - global_evnt.c system_colour.c + global_evnt.c osspec.c S_ATARI := $(addprefix atari/,$(S_ATARI))

12 years, 4 months

1
0
0 / 0

r11541 mono - /trunk/netsurf/atari/browser.c

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 16:08:49 2011 New Revision: 11541 URL: http://source.netsurf-browser.org?rev=11541&view=rev Log: fixed browser_redraw_required(), now only returning true when content is available. Modified: trunk/netsurf/atari/browser.c Modified: trunk/netsurf/atari/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser.c?rev=11541... ============================================================================== --- trunk/netsurf/atari/browser.c (original) +++ trunk/netsurf/atari/browser.c Sun Jan 30 16:08:49 2011 @@ -684,37 +684,7 @@ r = browser_window_key_press(gw->browser->bw, ucs4 ); } } - return( r ); - - -/* - switch ( nkc ) { - case NKF_LSH|NK_UP: - case NKF_RSH|NK_UP: - case NK_M_PGUP: - if ( browser_window_key_press(gw->browser->bw, KEY_PAGE_UP) ==false ) - browser_scroll( gw, WA_UPPAGE, work.g_h, false ); - break; - - case NKF_RSH|NK_DOWN: - case NKF_LSH|NK_DOWN: - case NK_M_PGDOWN: - if (browser_window_key_press(gw->browser->bw, KEY_PAGE_DOWN) == false) - browser_scroll( gw, WA_DNPAGE, work.g_h, false ); - break; - - - - default: - if (ascii != 0) { - int ucs4 = atari_to_ucs4(ascii); - r = browser_window_key_press(gw->browser->bw, ucs4 ); - } - break; - } - - return( r ); -*/ + return( r ); } static void __CDECL browser_evnt_redraw_x( WINDOW * c, short buf[8], void * data) @@ -730,6 +700,9 @@ bool ret = true; int frames = 0; CMP_BROWSER b = gw->browser; + + if( b->bw->current_content == NULL ) + return ( false ); { /* don't do redraws if we have subframes */ @@ -743,7 +716,9 @@ } } } - ret = ( (b->redraw.required && frames == 0) || b->scroll.required || b->caret.redraw ); + ret = ( (b->redraw.required && frames == 0) || + b->scroll.required || + b->caret.redraw ); return( ret ); }

12 years, 4 months

1
0
0 / 0

r11540 mono - in /trunk/netsurf/atari: gui.c gui.h

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 16:03:19 2011 New Revision: 11540 URL: http://source.netsurf-browser.org?rev=11540&view=rev Log: Implemented gui_scroll_visible. Modified: trunk/netsurf/atari/gui.c trunk/netsurf/atari/gui.h Modified: trunk/netsurf/atari/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/gui.c?rev=11540&r1=... ============================================================================== --- trunk/netsurf/atari/gui.c (original) +++ trunk/netsurf/atari/gui.c Sun Jan 30 16:03:19 2011 @@ -71,6 +71,7 @@ #include "atari/res/netsurf.rsh" #include "atari/plot.h" #include "atari/clipboard.h" +#include "atari/osspec.h" #define TODO() (0)/*printf("%s Unimplemented!\n", __FUNCTION__)*/ @@ -356,7 +357,7 @@ { if (w == NULL || text == NULL ) return; - sb_set_text( w , (char*)text ); + window_set_stauts( w , (char*)text ); } void gui_window_redraw(struct gui_window *gw, int x0, int y0, int x1, int y1) @@ -436,6 +437,7 @@ void gui_window_scroll_visible(struct gui_window *w, int x0, int y0, int x1, int y1) { LOG(("%s:(%p, %d, %d, %d, %d)", __func__, w, x0, y0, x1, y1)); + gui_window_set_scroll(w,x0,y0); } void gui_window_position_frame(struct gui_window *gw, int x0, int y0, int x1, int y1) @@ -1100,7 +1102,7 @@ const char *addr = NETSURF_HOMEPAGE; MenuBar( h_gem_menu , 1 ); bind_global_events(); - if( gdosversion > TOS4VER ) { + if( atari_sysinfo.gdosversion > TOS4VER ) { menu_register( _AESapid, (char*)" NetSurf "); } } Modified: trunk/netsurf/atari/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/atari/gui.h?rev=11540&r1=... ============================================================================== --- trunk/netsurf/atari/gui.h (original) +++ trunk/netsurf/atari/gui.h Sun Jan 30 16:03:19 2011 @@ -178,7 +178,9 @@ struct s_statusbar { COMPONENT * comp; - char text[255]; + char text[STATUSBAR_MAX_SLEN+1]; + size_t textlen; + bool attached; }; struct s_caret

12 years, 4 months

1
0
0 / 0

r11539 mono - /trunk/netsurf/atari/scripts/mkpkg.sh

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 15:52:50 2011 New Revision: 11539 URL: http://source.netsurf-browser.org?rev=11539&view=rev Log: Increased stack size for release executable. Modified: trunk/netsurf/atari/scripts/mkpkg.sh Modified: trunk/netsurf/atari/scripts/mkpkg.sh URL: http://source.netsurf-browser.org/trunk/netsurf/atari/scripts/mkpkg.sh?re... ============================================================================== --- trunk/netsurf/atari/scripts/mkpkg.sh (original) +++ trunk/netsurf/atari/scripts/mkpkg.sh Sun Jan 30 15:52:50 2011 @@ -99,6 +99,7 @@ cp $src"ns.prg" $dst chmod +x $dst"ns.prg" strip $dst"ns.prg" +stack -S 1000k $dst"ns.prg" cp $src"atari/res/" $dst -rL cp $src"\!NetSurf/Resources/AdBlock,f79" $dst"res/adblock.css" -rL @@ -172,7 +173,7 @@ cookie_jar:./res/Cookies search_url_bar:0 search_provider:0 -url_suggestion:1 +url_suggestion:0 window_x:0 window_y:0 window_width:0 @@ -181,7 +182,7 @@ window_screen_height:0 scale:100 incremental_reflow:1 -min_reflow_period:25 +min_reflow_period:200 tree_icons_dir:./res/icons core_select_menu:1 max_fetchers:16

12 years, 4 months

1
0
0 / 0

r11538 mono - in /trunk/netsurf/atari/res: netsurf.rsh netsurf.rsm

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 15:51:14 2011 New Revision: 11538 URL: http://source.netsurf-browser.org?rev=11538&view=rev Log: Implemented Search Dialog Modified: trunk/netsurf/atari/res/netsurf.rsh trunk/netsurf/atari/res/netsurf.rsm Modified: trunk/netsurf/atari/res/netsurf.rsh URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsh?rev... ============================================================================== --- trunk/netsurf/atari/res/netsurf.rsh (original) +++ trunk/netsurf/atari/res/netsurf.rsh Sun Jan 30 15:51:14 2011 @@ -100,9 +100,9 @@ #define SEARCH 10 /* form/dial */ #define SEARCH_TB_SRCH 1 /* FTEXT in tree SEARCH */ #define SEARCH_CB_CASESENSE 2 /* BOX in tree SEARCH */ -#define SEARCH_CB_CASESENSE_00 3 /* BOX in tree SEARCH */ +#define SEARCH_CB_SHOWALL 3 /* BOX in tree SEARCH */ #define SEARCH_LBL_SHOWALL 4 /* STRING in tree SEARCH */ -#define SEARCH_BT_SRCHBACK 5 /* BUTTON in tree SEARCH */ -#define SEARCH_BT_SRCHNEXT 6 /* BUTTON in tree SEARCH */ -#define SEARCH_LBL_CASESENSE 7 /* STRING in tree SEARCH */ -#define SEARCH_BT_SEARCH 8 /* BUTTON in tree SEARCH */ +#define SEARCH_LBL_CASESENSE 5 /* STRING in tree SEARCH */ +#define SEARCH_BT_SEARCH 6 /* BUTTON in tree SEARCH */ +#define SEARCH_CB_FWD 7 /* BOX in tree SEARCH */ +#define SEARCH_LBL_FWD 8 /* STRING in tree SEARCH */ Modified: trunk/netsurf/atari/res/netsurf.rsm URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsm?rev... ============================================================================== --- trunk/netsurf/atari/res/netsurf.rsm (original) +++ trunk/netsurf/atari/res/netsurf.rsm Sun Jan 30 15:51:14 2011 @@ -3,7 +3,7 @@ #N 99@32@AZAaza___ _@AZAaza090___ _@@_@ #FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@ #R 0@0@1@1@1@1@ -#M 20010100@17741@7728@536@ +#M 20010100@17741@7728@547@ #T 0@1@MAINMENU@@60@@ #O 4@32@T_FILE@@ #O 5@32@T_EDIT@@ @@ -95,10 +95,10 @@ #T 10@2@SEARCH@@9@@ #O 1@29@TB_SRCH@@ #O 2@20@CB_CASESENSE@@ -#O 3@20@CB_CASESENSE_00@@ +#O 3@20@CB_SHOWALL@@ #O 4@28@LBL_SHOWALL@@ -#O 5@26@BT_SRCHBACK@@ -#O 6@26@BT_SRCHNEXT@@ -#O 7@28@LBL_CASESENSE@@ -#O 8@26@BT_SEARCH@@ -#c 13032@ +#O 5@28@LBL_CASESENSE@@ +#O 6@26@BT_SEARCH@@ +#O 7@20@CB_FWD@@ +#O 8@28@LBL_FWD@@ +#c 12914@

12 years, 4 months

1
0
0 / 0

r11537 mono - in /trunk/netsurf/atari/plot: font_freetype.c font_vdi.c plotter.c plotter.h plotter_vdi.c

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 15:48:22 2011 New Revision: 11537 URL: http://source.netsurf-browser.org?rev=11537&view=rev Log: Rearanged includes, fixed VDI style for dashed plots. Modified: trunk/netsurf/atari/plot/font_freetype.c trunk/netsurf/atari/plot/font_vdi.c trunk/netsurf/atari/plot/plotter.c trunk/netsurf/atari/plot/plotter.h trunk/netsurf/atari/plot/plotter_vdi.c Modified: trunk/netsurf/atari/plot/font_freetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/font_freetype.... ============================================================================== --- trunk/netsurf/atari/plot/font_freetype.c (original) +++ trunk/netsurf/atari/plot/font_freetype.c Sun Jan 30 15:48:22 2011 @@ -17,27 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdbool.h> -#include <stdio.h> -#include <math.h> -#include <assert.h> -#include <string.h> -#include <windom.h> + #include <ft2build.h> #include FT_CACHE_H -#include "desktop/plot_style.h" -#include "image/bitmap.h" -#include "atari/bitmap.h" #include "atari/plot/plotter.h" #include "atari/plot/font_freetype.h" -#include "atari/gui.h" -#include "atari/font.h" -#include "atari/options.h" -#include "atari/findfile.h" -#include "utils/utf8.h" -#include "utils/log.h" + #define DEJAVU_PATH "/usr/share/fonts/truetype/ttf-dejavu/" @@ -65,7 +51,7 @@ static int str_split( FONT_PLOTTER self, const plot_font_style_t *fstyle, const char *string, size_t length,int x, size_t *char_offset, int *actual_x ); -static int pixel_position( FONT_PLOTTER self, const plot_font_style_t *fstyle, +static int pixel_pos( FONT_PLOTTER self, const plot_font_style_t *fstyle, const char *string, size_t length,int x, size_t *char_offset, int *actual_x ); static int text( FONT_PLOTTER self, int x, int y, const char *text, @@ -361,7 +347,7 @@ } -static int pixel_position( FONT_PLOTTER self, const plot_font_style_t *fstyle, +static int pixel_pos( FONT_PLOTTER self, const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -490,7 +476,7 @@ self->dtor = dtor; self->str_width = str_width; self->str_split = str_split; - self->pixel_position = pixel_position; + self->pixel_pos = pixel_pos; self->text = text; LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__)); if( !init ) { Modified: trunk/netsurf/atari/plot/font_vdi.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/font_vdi.c?rev... ============================================================================== --- trunk/netsurf/atari/plot/font_vdi.c (original) +++ trunk/netsurf/atari/plot/font_vdi.c Sun Jan 30 15:48:22 2011 @@ -15,20 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdbool.h> -#include <stdio.h> -#include <math.h> -#include <assert.h> -#include <string.h> -#include <windom.h> - -#include "desktop/plot_style.h" -#include "atari/bitmap.h" + + #include "atari/plot/plotter.h" #include "atari/plot/font_vdi.h" + #include "utils/utf8.h" #include "utils/log.h" + static char * lstr = NULL; @@ -37,7 +31,7 @@ static int str_width( FONT_PLOTTER self,const plot_font_style_t *fstyle, const char * str, size_t length, int * width ); static int str_split( FONT_PLOTTER self, const plot_font_style_t *fstyle,const char *string, size_t length,int x, size_t *char_offset, int *actual_x ); -static int pixel_position( FONT_PLOTTER self, const plot_font_style_t *fstyle,const char *string, +static int pixel_pos( FONT_PLOTTER self, const plot_font_style_t *fstyle,const char *string, size_t length,int x, size_t *char_offset, int *actual_x ); static int text( FONT_PLOTTER self, int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle ); @@ -45,14 +39,13 @@ static int vdih; extern struct s_vdi_sysinfo vdi_sysinfo; -extern unsigned short gdosversion; int ctor_font_plotter_vdi( FONT_PLOTTER self ) { self->dtor = dtor; self->str_width = str_width; self->str_split = str_split; - self->pixel_position = pixel_position; + self->pixel_pos = pixel_pos; self->text = text; LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__)); if( !init ) { @@ -141,7 +134,7 @@ return( 0 ); } -static int pixel_position( FONT_PLOTTER self, const plot_font_style_t * fstyle,const char *string, +static int pixel_pos( FONT_PLOTTER self, const plot_font_style_t * fstyle,const char *string, size_t length,int x, size_t *char_offset, int *actual_x ) { short cw, ch, cellw, cellh; @@ -211,13 +204,13 @@ vst_effects( self->vdi_handle, fx ); vst_alignment(vdih, 0, 4, &cw, &ch ); vst_height( self->vdi_handle, pxsize, &cw, &ch, &cellw, &cellh); - vswr_mode( self->vdi_handle, MD_TRANS ); + vswr_mode( self->vdi_handle, MD_TRANS ); if( vdi_sysinfo.scr_bpp >= 4 ){ vst_color( self->vdi_handle, RGB_TO_VDI(fstyle->foreground) ); } else { vst_color( self->vdi_handle, BLACK ); } - if( gdosversion > 0x03000 ){ + if( atari_sysinfo.gdosversion > 0x03000 ){ v_ftext( self->vdi_handle, x, y, (char*)&textcpy ); } else { v_gtext( self->vdi_handle, x, y, (char*)&textcpy ); Modified: trunk/netsurf/atari/plot/plotter.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/plotter.c?rev=... ============================================================================== --- trunk/netsurf/atari/plot/plotter.c (original) +++ trunk/netsurf/atari/plot/plotter.c Sun Jan 30 15:48:22 2011 @@ -37,8 +37,7 @@ #include "atari/gui.h" #include "utils/log.h" #include "atari/misc.h" - -extern unsigned short gdosversion; +#include "atari/osspec.h" unsigned char rgb_web_pal[216][3] = { Modified: trunk/netsurf/atari/plot/plotter.h URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/plotter.h?rev=... ============================================================================== --- trunk/netsurf/atari/plot/plotter.h (original) +++ trunk/netsurf/atari/plot/plotter.h Sun Jan 30 15:48:22 2011 @@ -17,9 +17,24 @@ */ #ifndef _GEM_PLOTTER_API_H_ #define _GEM_PLOTTER_API_H_ +#include <stdlib.h> +#include <stdbool.h> +#include <stdio.h> +#include <math.h> +#include <assert.h> +#include <string.h> #include <windom.h> - +#include "desktop/plot_style.h" +#include "image/bitmap.h" +#include "atari/bitmap.h" +#include "atari/osspec.h" +#include "atari/gui.h" +#include "atari/font.h" +#include "atari/options.h" +#include "atari/findfile.h" +#include "utils/utf8.h" +#include "utils/log.h" #ifndef ceilf #define ceilf(x) (float)ceil((double)x) @@ -56,6 +71,22 @@ typedef struct s_font_plotter * FONT_PLOTTER; typedef struct s_gem_plotter * GEM_PLOTTER; typedef struct s_font_plotter * GEM_FONT_PLOTTER; /* for public use ... */ + + +/* declaration of font plotter member functions: (_fpmf_ prefix) */ + +typedef int (*_fpmf_str_width)( FONT_PLOTTER self, const plot_font_style_t *fstyle, + const char * str, size_t length, int * width); +typedef int (*_fpmf_str_split)( FONT_PLOTTER self, const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x); +typedef int (*_fpmf_pixel_pos)( FONT_PLOTTER self, const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x); +typedef int (*_fpmf_text)( FONT_PLOTTER self, int x, int y, const char *text, + size_t length, const plot_font_style_t *fstyle); +typedef int (*_fpmf_dtor)( FONT_PLOTTER self ); + struct s_font_plotter { char * name; @@ -63,17 +94,12 @@ int vdi_handle; void * priv_data; GEM_PLOTTER plotter; - - bool (*str_width)(FONT_PLOTTER self, const plot_font_style_t *fstyle, - const char * str, size_t length, int * width); - bool (*str_split)(FONT_PLOTTER self, const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x); - bool (*pixel_position)(FONT_PLOTTER self, const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x); - void (*text)(FONT_PLOTTER self, int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle); - void (*dtor)(FONT_PLOTTER self ); + + _fpmf_str_width str_width; + _fpmf_str_split str_split; + _fpmf_pixel_pos pixel_pos; + _fpmf_text text; + _fpmf_dtor dtor; }; @@ -124,6 +150,32 @@ void * mem; }; +/* declaration of plotter member functions ( _pmf_ prefix )*/ +typedef int (*_pmf_resize)(GEM_PLOTTER self, int w, int h); +typedef int (*_pmf_move)(GEM_PLOTTER self, short x, short y ); +typedef void * (*_pmf_lock)(GEM_PLOTTER self); +typedef void * (*_pmf_create_framebuffer)(GEM_PLOTTER self); +typedef void * (*_pmf_switch_to_framebuffer)(GEM_PLOTTER self); +typedef int (*_pmf_unlock)(GEM_PLOTTER self); +typedef int (*_pmf_update_region)(GEM_PLOTTER self, GRECT region); +typedef int (*_pmf_update_screen_region)( GEM_PLOTTER self, GRECT region ); +typedef int (*_pmf_update_screen)(GEM_PLOTTER self); +typedef int (*_pmf_put_pixel)(GEM_PLOTTER self, int x, int y, int color ); +typedef int (*_pmf_copy_rect)(GEM_PLOTTER self, GRECT src, GRECT dst ); +typedef int (*_pmf_clip)(GEM_PLOTTER self, int x0, int y0, int x1, int y1); +typedef int (*_pmf_arc)(GEM_PLOTTER self, int x, int y, int radius, int angle1, int angle2, const plot_style_t * pstyle); +typedef int (*_pmf_disc)(GEM_PLOTTER self, int x, int y, int radius, const plot_style_t * pstyle); +typedef int (*_pmf_line)(GEM_PLOTTER self, int x0, int y0, int x1, int y1, const plot_style_t * pstyle); +typedef int (*_pmf_rectangle)(GEM_PLOTTER self, int x0, int y0, int x1, int y1, const plot_style_t * pstyle); +typedef int (*_pmf_polygon)(GEM_PLOTTER self, const int *p, unsigned int n, const plot_style_t * pstyle); +typedef int (*_pmf_path)(GEM_PLOTTER self, const float *p, unsigned int n, int fill, float width, int c, const float transform[6]); +typedef int (*_pmf_bitmap_resize) ( GEM_PLOTTER self, struct bitmap * bm, int nw, int nh ); +typedef int (*_pmf_bitmap)(GEM_PLOTTER self, struct bitmap * bmp, int x, int y, + unsigned long bg, unsigned long flags ); +typedef int (*_pmf_text)(GEM_PLOTTER self, int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle); +typedef int (*_pmf_dtor)(GEM_PLOTTER self); + + struct s_gem_plotter { @@ -138,8 +190,29 @@ int cfbi; /* current framebuffer index */ FONT_PLOTTER font_plotter; - int (*dtor)(GEM_PLOTTER self); - int (*resize)(GEM_PLOTTER self, int w, int h); + _pmf_resize resize; + _pmf_move move; + _pmf_lock lock; + _pmf_unlock unlock; + _pmf_create_framebuffer create_framebuffer; + _pmf_switch_to_framebuffer switch_to_framebuffer; + _pmf_update_region update_region; + _pmf_update_screen update_screen; + _pmf_update_screen_region update_screen_region; + _pmf_put_pixel put_pixel; + _pmf_copy_rect copy_rect; + _pmf_clip clip; + _pmf_arc arc; + _pmf_disc disc; + _pmf_line line; + _pmf_rectangle rectangle; + _pmf_polygon polygon; + _pmf_path path; + _pmf_bitmap_resize bitmap_resize; + _pmf_bitmap bitmap; + _pmf_text text; + _pmf_dtor dtor; +/* int (*move)(GEM_PLOTTER self, short x, short y ); void * (*lock)(GEM_PLOTTER self); void * (*create_framebuffer)(GEM_PLOTTER self); @@ -161,6 +234,8 @@ int (*bitmap)(GEM_PLOTTER self, struct bitmap * bmp, int x, int y, unsigned long bg, unsigned long flags ); int (*text)(GEM_PLOTTER self, int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle); + int (*dtor)(GEM_PLOTTER self); +*/ }; Modified: trunk/netsurf/atari/plot/plotter_vdi.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/plotter_vdi.c?... ============================================================================== --- trunk/netsurf/atari/plot/plotter_vdi.c (original) +++ trunk/netsurf/atari/plot/plotter_vdi.c Sun Jan 30 15:48:22 2011 @@ -24,15 +24,10 @@ #include <windom.h> #include <Hermes/Hermes.h> -#include "desktop/plot_style.h" -#include "image/bitmap.h" -#include "atari/bitmap.h" #include "atari/plot/eddi.h" #include "atari/plot/plotter.h" #include "atari/plot/plotter_vdi.h" #include "atari/plot/font_vdi.h" -#include "atari/bitmap.h" -#include "utils/log.h" /* assign vdi line style to dst ( netsurf type ) */ #define NSLT2VDI(dst, src) \ @@ -41,7 +36,7 @@ dst = 3; \ break;\ case PLOT_OP_TYPE_DASH:\ - dst = 4; \ + dst = 5; \ break;\ case PLOT_OP_TYPE_SOLID:\ case PLOT_OP_TYPE_NONE:\

12 years, 4 months

1
0
0 / 0

r11536 mono - in /trunk/netsurf/atari: ./ plot/

by netsurf＠semichrome.net

Author: mono Date: Sun Jan 30 13:24:03 2011 New Revision: 11536 URL: http://source.netsurf-browser.org?rev=11536&view=rev Log: Implemented Search Dialog Added: trunk/netsurf/atari/search.c trunk/netsurf/atari/search.h Modified: trunk/netsurf/atari/bitmap.c (props changed) trunk/netsurf/atari/bitmap.h (props changed) trunk/netsurf/atari/browser.c (props changed) trunk/netsurf/atari/browser.h (props changed) trunk/netsurf/atari/browser_win.c (props changed) trunk/netsurf/atari/browser_win.h (props changed) trunk/netsurf/atari/clipboard.h (props changed) trunk/netsurf/atari/download.c (props changed) trunk/netsurf/atari/download.h (props changed) trunk/netsurf/atari/filetype.c (props changed) trunk/netsurf/atari/findfile.h (props changed) trunk/netsurf/atari/font.c (props changed) trunk/netsurf/atari/font.h (props changed) trunk/netsurf/atari/global_evnt.c (props changed) trunk/netsurf/atari/global_evnt.h (props changed) trunk/netsurf/atari/gui.c (contents, props changed) trunk/netsurf/atari/gui.h (props changed) trunk/netsurf/atari/history.c (props changed) trunk/netsurf/atari/history.h (props changed) trunk/netsurf/atari/hotlist.c (props changed) trunk/netsurf/atari/hotlist.h (props changed) trunk/netsurf/atari/login.c (props changed) trunk/netsurf/atari/login.h (props changed) trunk/netsurf/atari/misc.c (props changed) trunk/netsurf/atari/misc.h (props changed) trunk/netsurf/atari/options.h (props changed) trunk/netsurf/atari/plot.c (props changed) trunk/netsurf/atari/plot.h (props changed) trunk/netsurf/atari/plot/eddi.h (props changed) trunk/netsurf/atari/plot/eddi.s (props changed) trunk/netsurf/atari/plot/font_freetype.c (props changed) trunk/netsurf/atari/plot/font_freetype.h (props changed) trunk/netsurf/atari/plot/font_vdi.c (props changed) trunk/netsurf/atari/plot/font_vdi.h (props changed) trunk/netsurf/atari/plot/plotter.c (props changed) trunk/netsurf/atari/plot/plotter.h (props changed) trunk/netsurf/atari/plot/plotter_vdi.c (props changed) trunk/netsurf/atari/plot/plotter_vdi.h (props changed) trunk/netsurf/atari/schedule.c (props changed) trunk/netsurf/atari/schedule.h (props changed) trunk/netsurf/atari/slider.c (props changed) trunk/netsurf/atari/slider.h (props changed) trunk/netsurf/atari/statusbar.c (props changed) trunk/netsurf/atari/statusbar.h (props changed) trunk/netsurf/atari/thumbnail.c (props changed) trunk/netsurf/atari/toolbar.c (contents, props changed) trunk/netsurf/atari/toolbar.h (props changed) trunk/netsurf/atari/treeview.c (props changed) trunk/netsurf/atari/treeview.h (props changed) trunk/netsurf/atari/verify_ssl.c (props changed) trunk/netsurf/atari/verify_ssl.h (props changed) Propchange: trunk/netsurf/atari/bitmap.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/bitmap.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/browser.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/browser.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/browser_win.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/browser_win.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/clipboard.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/download.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/download.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/filetype.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/findfile.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/font.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/font.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/global_evnt.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/global_evnt.h ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/netsurf/atari/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/gui.c?rev=11536&r1=... ============================================================================== --- trunk/netsurf/atari/gui.c (original) +++ trunk/netsurf/atari/gui.c Sun Jan 30 13:24:03 2011 @@ -1130,7 +1130,7 @@ netsurf_init(&argc, &argv, options, messages); gui_init(argc, argv); gui_init2(argc, argv); - browser_window_create(cfg_homepage_url, 0, 0, true, false); + //browser_window_create(cfg_homepage_url, 0, 0, true, false); graf_mouse( ARROW , NULL); netsurf_main_loop(); netsurf_exit(); Propchange: trunk/netsurf/atari/gui.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/gui.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/history.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/history.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/hotlist.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/hotlist.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/login.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/login.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/misc.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/misc.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/options.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/eddi.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/eddi.s ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/font_freetype.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/font_freetype.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/font_vdi.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/font_vdi.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/plotter.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/plotter.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/plotter_vdi.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/plot/plotter_vdi.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/schedule.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/schedule.h ------------------------------------------------------------------------------ svn:executable = * Added: trunk/netsurf/atari/search.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/search.c?rev=11536&... ============================================================================== --- trunk/netsurf/atari/search.c (added) +++ trunk/netsurf/atari/search.c Sun Jan 30 13:24:03 2011 @@ -1,0 +1,257 @@ +#include <limits.h> +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <stdbool.h> +#include <assert.h> +#include <windom.h> + +#include "desktop/gui.h" +#include "desktop/browser.h" +#include "desktop/search.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "atari/gui.h" +#include "atari/misc.h" +#include "atari/search.h" +#include "atari/res/netsurf.rsh" + +extern void * h_gem_rsrc; + + +static SEARCH_FORM_SESSION current; + +static void nsatari_search_set_status(bool found, void *p); +static void nsatari_search_set_hourglass(bool active, void *p); +static void nsatari_search_add_recent(const char *string, void *p); +void nsatari_search_set_forward_state(bool active, void *p); +void nsatari_search_set_back_state(bool active, void *p); + +static struct search_callbacks nsatari_search_callbacks = { + nsatari_search_set_forward_state, + nsatari_search_set_back_state, + nsatari_search_set_status, + nsatari_search_set_hourglass, + nsatari_search_add_recent +}; + + +/** +* Change the displayed search status. +* \param found search pattern matched in text +* \param p the pointer sent to search_verify_new() / search_create_context() +*/ + +void nsatari_search_set_status(bool found, void *p) +{ + LOG(("%p set status: %d\n", p, found)); +} + +/** +* display hourglass while searching +* \param active start/stop indicator +* \param p the pointer sent to search_verify_new() / search_create_context() +*/ + +void nsatari_search_set_hourglass(bool active, void *p) +{ + SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p; + if( active ) + gui_window_set_pointer(s->bw->window, GUI_POINTER_PROGRESS); + else + gui_window_set_pointer(s->bw->window, GUI_POINTER_DEFAULT); +} + +/** +* add search string to recent searches list +* front is at liberty how to implement the bare notification +* should normally store a strdup() of the string; +* core gives no guarantee of the integrity of the const char * +* \param string search pattern +* \param p the pointer sent to search_verify_new() / search_create_context() +*/ + +void nsatari_search_add_recent(const char *string, void *p) +{ + LOG(("%p add recent: %s\n", p, string)); +} + +/** +* activate search forwards button in gui +* \param active activate/inactivate +* \param p the pointer sent to search_verify_new() / search_create_context() +*/ + +void nsatari_search_set_forward_state(bool active, void *p) +{ + SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p; + /* deactivate back cb */ + LOG(("%p: set forward state: %d\n", p, active)); +} + +/** +* activate search back button in gui +* \param active activate/inactivate +* \param p the pointer sent to search_verify_new() / search_create_context() +*/ + +void nsatari_search_set_back_state(bool active, void *p) +{ + SEARCH_FORM_SESSION s = (SEARCH_FORM_SESSION)p; + /* deactivate back cb */ + LOG(("%p: set back state: %d\n", p, active)); +} + + +static SEARCH_FORM_SESSION get_search_session(WINDOW * win) +{ + return (current); +} + +static void destroy_search_session( SEARCH_FORM_SESSION s ) +{ + free( s ); +} + +static int apply_form( WINDOW * win, struct s_search_form_state * s ) +{ + OBJECT * obj = ObjcTree(OC_FORM, win ); + if( obj == NULL ){ + goto error; + } + s->flags = 0; + if( (obj[SEARCH_CB_FWD].ob_state & CROSSED) != 0 ) + s->flags = SEARCH_FLAG_FORWARDS; + if( (obj[SEARCH_CB_CASESENSE].ob_state & CROSSED) != 0 ) + s->flags |= SEARCH_FLAG_CASE_SENSITIVE; + if( (obj[SEARCH_CB_SHOWALL].ob_state & CROSSED) != 0 ) + s->flags |= SEARCH_FLAG_SHOWALL; + + char * cstr = ObjcString( obj, SEARCH_TB_SRCH, NULL ); + if( cstr != NULL ) { + strncpy((char*)&s->text[0], cstr, 31 ); + } + return ( 0 ); + +error: + s->flags = SEARCH_FLAG_FORWARDS; + /* s->forward = true; */ + strncpy((char*)&s->text[0], "", 31 ); + return( 1 ); +} + +/* checks if search parameters changes */ +static bool form_changed( WINDOW * w ) +{ + bool check; + struct s_search_form_state cur; + SEARCH_FORM_SESSION s = get_search_session(w); + OBJECT * obj = ObjcTree(OC_FORM, w); + assert( s != NULL && obj != NULL ); + uint32_t flags_old = s->state.flags; + apply_form(w, &cur); + + /* adjust the forward flag, it should not init an new search */ + flags_old |= SEARCH_FLAG_FORWARDS; + cur.flags |= SEARCH_FLAG_FORWARDS; + if( cur.flags != flags_old ){ + return( true ); + } + + char * cstr = ObjcString( obj, SEARCH_TB_SRCH, NULL ); + if( cstr != NULL ){ + if( strcmp(cstr, (char*)&s->state.text) != 0 ) { + return ( true ); + } + } + + return( false ); +} + + +static void __CDECL evnt_bt_srch_click( WINDOW *win, int index, int unused, void *unused2) { + + ObjcChange( OC_FORM, win, index, ~SELECTED, TRUE); + bool fwd; + SEARCH_FORM_SESSION s = get_search_session(win); + OBJECT * obj = ObjcTree(OC_FORM, s->formwind ); + search_flags_t flags = 0; + + if( s->bw->search_context == NULL || form_changed(win) ){ + if( s->bw->search_context != NULL ) { + search_destroy_context(s->bw->search_context); + s->bw->search_context = NULL; + } + apply_form( win, &s->state ); + } else { + /* get search direction manually: */ + if( (obj[SEARCH_CB_FWD].ob_state & CROSSED) != 0 ) + s->state.flags |= SEARCH_FLAG_FORWARDS; + else + s->state.flags &= (~SEARCH_FLAG_FORWARDS); + } + if( search_verify_new(s->bw, &nsatari_search_callbacks, s) ){ + search_step(s->bw->search_context, s->state.flags, ObjcString( obj, SEARCH_TB_SRCH, NULL ) ); + } + +} + +static void __CDECL evnt_cb_click( WINDOW *win, int index, int unused, void *unused2) { + + short newstate; + OBJECT * obj = ObjcTree(OC_FORM, get_search_session(win)->formwind ); + ObjcChange( OC_FORM, win, index, ~SELECTED, TRUE); + newstate = (obj[index].ob_state & CROSSED) ? ~CROSSED : CROSSED; + ObjcChange( OC_FORM, win, index, newstate , TRUE); +} + +static void __CDECL evnt_close( WINDOW *win, short buff[8]) { + /* Free Search Contexts */ + /* todo: destroy search context, if any */ + destroy_search_session( get_search_session(win) ); + current = NULL; + ApplWrite( _AESapid, WM_DESTROY, win->handle, 0,0,0,0); +} + +SEARCH_FORM_SESSION open_browser_search( struct gui_window * gw ) +{ + char * title; + SEARCH_FORM_SESSION sfs; + OBJECT * tree = get_tree(SEARCH); + if( tree == NULL ){ + return( NULL ); + } + sfs = malloc(sizeof(struct s_search_form_session)); + if( sfs == NULL ) + return( NULL ); + memset(sfs, 0, sizeof(struct s_search_form_session)); + title = (char*)messages_get("FindTextNS"); + if( title == NULL ) + title = (char*)"Find text ..."; + + if( current != NULL ){ + ApplWrite( _AESapid, WM_CLOSED, current->formwind->handle, 0,0,0,0); + /* Handle Close event */ + EvntWindom( MU_MESAG ); + /* Handle Destroy Event */ + EvntWindom( MU_MESAG ); + } + current = sfs; + sfs->bw = gw->browser->bw; + /* todo: check if we already have an form for this gw! */ + sfs->formwind = mt_FormCreate( &app, tree, WAT_FORM, + NULL, title, + NULL, true, false); + + ObjcAttachFormFunc( sfs->formwind, SEARCH_BT_SEARCH, evnt_bt_srch_click, NULL); + ObjcAttachFormFunc( sfs->formwind, SEARCH_CB_CASESENSE, evnt_cb_click, NULL); + ObjcAttachFormFunc( sfs->formwind, SEARCH_CB_SHOWALL, evnt_cb_click, NULL); + ObjcAttachFormFunc( sfs->formwind, SEARCH_CB_FWD, evnt_cb_click, NULL); + EvntAdd( sfs->formwind, WM_CLOSED, evnt_close, EV_TOP); + apply_form(sfs->formwind, &sfs->state ); + strncpy( ObjcString( tree, SEARCH_TB_SRCH, NULL ), "", SEARCH_MAX_SLEN); + + return( current ); + +} Added: trunk/netsurf/atari/search.h URL: http://source.netsurf-browser.org/trunk/netsurf/atari/search.h?rev=11536&... ============================================================================== --- trunk/netsurf/atari/search.h (added) +++ trunk/netsurf/atari/search.h Sun Jan 30 13:24:03 2011 @@ -1,0 +1,23 @@ +#ifndef NS_ATARI_SEARCH_H +#define NS_ATARI_SEARCH_H + +#define SEARCH_MAX_SLEN 24 + +struct s_search_form_state +{ + char text[32]; + uint32_t flags; +}; + +struct s_search_form_session { + struct browser_window * bw; + WINDOW * formwind; + struct s_search_form_state state; +}; + + +typedef struct s_search_form_session * SEARCH_FORM_SESSION; + +SEARCH_FORM_SESSION open_browser_search(struct gui_window * gw); + +#endif Propchange: trunk/netsurf/atari/slider.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/slider.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/statusbar.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/statusbar.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/thumbnail.c ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/netsurf/atari/toolbar.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/toolbar.c?rev=11536... ============================================================================== --- trunk/netsurf/atari/toolbar.c (original) +++ trunk/netsurf/atari/toolbar.c Sun Jan 30 13:24:03 2011 @@ -217,10 +217,10 @@ vsf_perimeter( vdih, 0 ); vsf_interior( vdih , 1 ); vsf_color( vdih, LWHITE ); - vst_arbpt( vdih, 10, &pxy[0], &pxy[1], &pxy[2], &pxy[3] ); + vst_point( vdih, 10, &pxy[0], &pxy[1], &pxy[2], &pxy[3] ); vst_alignment(vdih, 0, 5, &d, &d ); vst_effects( vdih, 0 ); - + vst_color( vdih, BLACK ); /* gray the whole component: */ pxy[0] = work.g_x; @@ -261,7 +261,6 @@ else strcpy( (char*)&textcpy, " " ); - vst_color( vdih, BLACK ); v_gtext( vdih, work.g_x + 3, work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) + 2, (char*)&textcpy ); if( window_url_widget_has_focus( gw ) ) { Propchange: trunk/netsurf/atari/toolbar.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/toolbar.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/treeview.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/treeview.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/verify_ssl.c ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/netsurf/atari/verify_ssl.h ------------------------------------------------------------------------------ svn:executable = *

12 years, 4 months

1
0
0 / 0

r11535 mmu_man - in /trunk/netsurf/beos: beos_gui.cpp beos_gui.h beos_scaffolding.cpp beos_scaffolding.h beos_window.cpp system_colour.cpp

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Jan 30 13:23:42 2011 New Revision: 11535 URL: http://source.netsurf-browser.org?rev=11535&view=rev Log: Pick the CSS system colours from ui_color() and BScreen::DesktopColor(). Update those when they are updated in ZETA. Also update the toolbar and statusbar background. Modified: trunk/netsurf/beos/beos_gui.cpp trunk/netsurf/beos/beos_gui.h trunk/netsurf/beos/beos_scaffolding.cpp trunk/netsurf/beos/beos_scaffolding.h trunk/netsurf/beos/beos_window.cpp trunk/netsurf/beos/system_colour.cpp Modified: trunk/netsurf/beos/beos_gui.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.cpp?rev=115... ============================================================================== --- trunk/netsurf/beos/beos_gui.cpp (original) +++ trunk/netsurf/beos/beos_gui.cpp Sun Jan 30 13:23:42 2011 @@ -484,6 +484,9 @@ if (resume_thread(sBAppThreadID) < B_OK) return; } + + // ui_color() gives hardcoded values before BApplication is created. + nsbeos_update_system_ui_colors(); fetch_rsrc_register(); Modified: trunk/netsurf/beos/beos_gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.h?rev=11535... ============================================================================== --- trunk/netsurf/beos/beos_gui.h (original) +++ trunk/netsurf/beos/beos_gui.h Sun Jan 30 13:23:42 2011 @@ -21,6 +21,11 @@ #include <Application.h> #include <FilePanel.h> #include <Window.h> +#include <BeBuild.h> + +#ifndef B_BEOS_VERSION_DANO +#define B_UI_SETTINGS_CHANGED '_UIC' +#endif #define CALLED() fprintf(stderr, "%s()\n", __FUNCTION__); @@ -64,3 +69,4 @@ void nsbeos_gui_view_source(struct hlcache_handle *content, struct selection *selection); image_id nsbeos_find_app_path(char *path); +void nsbeos_update_system_ui_colors(void); Modified: trunk/netsurf/beos/beos_scaffolding.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.cpp... ============================================================================== --- trunk/netsurf/beos/beos_scaffolding.cpp (original) +++ trunk/netsurf/beos/beos_scaffolding.cpp Sun Jan 30 13:23:42 2011 @@ -87,6 +87,8 @@ BDragger *dragger; + BView *tool_bar; + BControl *back_button; BControl *forward_button; BControl *stop_button; @@ -360,6 +362,7 @@ case B_PASTE: case B_SELECT_ALL: //case B_MOUSE_WHEEL_CHANGED: + case B_UI_SETTINGS_CHANGED: // NetPositive messages case B_NETPOSITIVE_OPEN_URL: case B_NETPOSITIVE_BACK: @@ -551,6 +554,7 @@ SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + g->tool_bar->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); g->dragger->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); g->status_bar->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -577,11 +581,26 @@ void +NSBrowserWindow::DispatchMessage(BMessage *message, BHandler *handler) +{ + BMessage *msg; + switch (message->what) { + case B_UI_SETTINGS_CHANGED: + msg = new BMessage(*message); + nsbeos_pipe_message_top(msg, this, fScaffolding); + break; + } + BWindow::DispatchMessage(message, handler); +} + + +void NSBrowserWindow::MessageReceived(BMessage *message) { switch (message->what) { case B_ARGV_RECEIVED: case B_REFS_RECEIVED: + case B_UI_SETTINGS_CHANGED: DetachCurrentMessage(); nsbeos_pipe_message_top(message, this, fScaffolding); break; @@ -637,6 +656,34 @@ g->being_destroyed = 1; nsbeos_window_destroy_browser(g->top_level); } +} + + +void nsbeos_scaffolding_update_colors(nsbeos_scaffolding *g) +{ + if (!g->top_view->LockLooper()) + return; + rgb_color c = ui_color(B_PANEL_BACKGROUND_COLOR); + g->top_view->SetViewColor(c); + + g->tool_bar->SetViewColor(c); + g->back_button->SetViewColor(c); + g->forward_button->SetViewColor(c); + g->stop_button->SetViewColor(c); + g->reload_button->SetViewColor(c); + g->home_button->SetViewColor(c); + g->url_bar->SetViewColor(c); + g->throbber->SetViewColor(c); + g->scroll_view->SetViewColor(c); + + g->dragger->SetViewColor(c); + + g->status_bar->SetViewColor(c); + g->status_bar->SetLowColor(c); +#if defined(__HAIKU__) || defined(B_DANO_VERSION) + g->status_bar->SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); +#endif + g->top_view->UnlockLooper(); } @@ -715,6 +762,10 @@ } break; } + case B_UI_SETTINGS_CHANGED: + nsbeos_update_system_ui_colors(); + nsbeos_scaffolding_update_colors(scaffold); + break; case B_NETPOSITIVE_OPEN_URL: { int32 i; @@ -1976,22 +2027,22 @@ g->dragger->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); g->dragger->SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR)) ; - // toolbar + // tool_bar // the toolbar is also the dragger for now // XXX: try to stuff it in the status bar at the bottom // (BDragger *must* be a parent, sibiling or direct child of NSBaseView!) rect = g->top_view->Bounds(); rect.bottom = rect.top + TOOLBAR_HEIGHT - 1; rect.right = rect.right - DRAGGER_WIDTH; - BView *toolbar = new BView(rect, "Toolbar", + g->tool_bar = new BView(rect, "Toolbar", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP, B_WILL_DRAW); - g->top_view->AddChild(toolbar); - toolbar->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - toolbar->SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR)) ; + g->top_view->AddChild(g->tool_bar); + g->tool_bar->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + g->tool_bar->SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR)) ; // buttons #warning use BPictureButton - rect = toolbar->Bounds(); + rect = g->tool_bar->Bounds(); rect.right = TOOLBAR_HEIGHT; rect.InsetBySelf(5, 5); rect.OffsetBySelf(0, -1); @@ -2000,40 +2051,40 @@ message = new BMessage('back'); message->AddPointer("scaffolding", g); g->back_button = new BButton(rect, "back_button", "<", message); - toolbar->AddChild(g->back_button); + g->tool_bar->AddChild(g->back_button); nButtons++; rect.OffsetBySelf(TOOLBAR_HEIGHT, 0); message = new BMessage('forw'); message->AddPointer("scaffolding", g); g->forward_button = new BButton(rect, "forward_button", ">", message); - toolbar->AddChild(g->forward_button); + g->tool_bar->AddChild(g->forward_button); nButtons++; rect.OffsetBySelf(TOOLBAR_HEIGHT, 0); message = new BMessage('stop'); message->AddPointer("scaffolding", g); g->stop_button = new BButton(rect, "stop_button", "S", message); - toolbar->AddChild(g->stop_button); + g->tool_bar->AddChild(g->stop_button); nButtons++; rect.OffsetBySelf(TOOLBAR_HEIGHT, 0); message = new BMessage('relo'); message->AddPointer("scaffolding", g); g->reload_button = new BButton(rect, "reload_button", "R", message); - toolbar->AddChild(g->reload_button); + g->tool_bar->AddChild(g->reload_button); nButtons++; rect.OffsetBySelf(TOOLBAR_HEIGHT, 0); message = new BMessage('home'); message->AddPointer("scaffolding", g); g->home_button = new BButton(rect, "home_button", "H", message); - toolbar->AddChild(g->home_button); + g->tool_bar->AddChild(g->home_button); nButtons++; // url bar - rect = toolbar->Bounds(); + rect = g->tool_bar->Bounds(); rect.left += TOOLBAR_HEIGHT * nButtons; rect.right -= TOOLBAR_HEIGHT * 1; rect.InsetBySelf(5, 5); @@ -2042,17 +2093,17 @@ g->url_bar = new BTextControl(rect, "url_bar", "url", "", message, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP); g->url_bar->SetDivider(g->url_bar->StringWidth("url ")); - toolbar->AddChild(g->url_bar); + g->tool_bar->AddChild(g->url_bar); // throbber rect.Set(0, 0, 24, 24); - rect.OffsetTo(toolbar->Bounds().right - 24 - (TOOLBAR_HEIGHT - 24) / 2, + rect.OffsetTo(g->tool_bar->Bounds().right - 24 - (TOOLBAR_HEIGHT - 24) / 2, (TOOLBAR_HEIGHT - 24) / 2); g->throbber = new NSThrobber(rect); - toolbar->AddChild(g->throbber); - g->throbber->SetViewColor(toolbar->ViewColor()); - g->throbber->SetLowColor(toolbar->ViewColor()); + g->tool_bar->AddChild(g->throbber); + g->throbber->SetViewColor(g->tool_bar->ViewColor()); + g->throbber->SetLowColor(g->tool_bar->ViewColor()); g->throbber->SetDrawingMode(B_OP_ALPHA); g->throbber->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY); /* set up the throbber. */ Modified: trunk/netsurf/beos/beos_scaffolding.h URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.h?r... ============================================================================== --- trunk/netsurf/beos/beos_scaffolding.h (original) +++ trunk/netsurf/beos/beos_scaffolding.h Sun Jan 30 13:23:42 2011 @@ -58,6 +58,7 @@ NSBrowserWindow(BRect frame, struct beos_scaffolding *scaf); virtual ~NSBrowserWindow(); +virtual void DispatchMessage(BMessage *message, BHandler *handler); virtual void MessageReceived(BMessage *message); virtual bool QuitRequested(void); Modified: trunk/netsurf/beos/beos_window.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_window.cpp?rev=... ============================================================================== --- trunk/netsurf/beos/beos_window.cpp (original) +++ trunk/netsurf/beos/beos_window.cpp Sun Jan 30 13:23:42 2011 @@ -155,6 +155,7 @@ case B_PASTE: case B_SELECT_ALL: //case B_MOUSE_WHEEL_CHANGED: + case B_UI_SETTINGS_CHANGED: // NetPositive messages case B_NETPOSITIVE_OPEN_URL: case B_NETPOSITIVE_BACK: @@ -887,6 +888,9 @@ break; case B_MOUSE_WHEEL_CHANGED: break; + case B_UI_SETTINGS_CHANGED: + nsbeos_update_system_ui_colors(); + break; case 'nsLO': // login { BString url; Modified: trunk/netsurf/beos/system_colour.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/system_colour.cpp?re... ============================================================================== --- trunk/netsurf/beos/system_colour.cpp (original) +++ trunk/netsurf/beos/system_colour.cpp Sun Jan 30 13:23:42 2011 @@ -27,6 +27,7 @@ #include <stdbool.h> #include <InterfaceDefs.h> +#include <Screen.h> extern "C" { @@ -37,6 +38,38 @@ #include "desktop/plot_style.h" } + +#include "beos/beos_gui.h" + + +#if !defined(__HAIKU__) && !defined(B_BEOS_VERSION_DANO) +/* more ui_colors, R5 only had a few defined... */ +#define B_PANEL_TEXT_COLOR ((color_which)10) +#define B_DOCUMENT_BACKGROUND_COLOR ((color_which)11) +#define B_DOCUMENT_TEXT_COLOR ((color_which)12) +#define B_CONTROL_BACKGROUND_COLOR ((color_which)13) +#define B_CONTROL_TEXT_COLOR ((color_which)14) +#define B_CONTROL_BORDER_COLOR ((color_which)15) +#define B_CONTROL_HIGHLIGHT_COLOR ((color_which)16) +#define B_NAVIGATION_BASE_COLOR ((color_which)4) +#define B_NAVIGATION_PULSE_COLOR ((color_which)17) +#define B_SHINE_COLOR ((color_which)18) +#define B_SHADOW_COLOR ((color_which)19) +#define B_MENU_SELECTED_BORDER_COLOR ((color_which)9) +#define B_TOOLTIP_BACKGROUND_COLOR ((color_which)20) +#define B_TOOLTIP_TEXT_COLOR ((color_which)21) +#define B_SUCCESS_COLOR ((color_which)100) +#define B_FAILURE_COLOR ((color_which)101) +#define B_MENU_SELECTED_BACKGROUND_COLOR B_MENU_SELECTION_BACKGROUND_COLOR +#define B_RANDOM_COLOR ((color_which)0x80000000) +#define B_MICHELANGELO_FAVORITE_COLOR ((color_which)0x80000001) +#define B_DSANDLER_FAVORITE_SKY_COLOR ((color_which)0x80000002) +#define B_DSANDLER_FAVORITE_INK_COLOR ((color_which)0x80000003) +#define B_DSANDLER_FAVORITE_SHOES_COLOR ((color_which)0x80000004) +#define B_DAVE_BROWN_FAVORITE_COLOR ((color_which)0x80000005) +#endif +#define NOCOL ((color_which)0) + struct gui_system_colour_ctx { const char *name; @@ -44,6 +77,7 @@ css_color css_colour; colour *option_colour; lwc_string *lwcstr; + color_which ui; }; static struct gui_system_colour_ctx colour_list[] = { @@ -52,170 +86,198 @@ SLEN("ActiveBorder"), 0xff000000, &option_sys_colour_ActiveBorder, - NULL + NULL, + NOCOL }, { "ActiveCaption", SLEN("ActiveCaption"), 0xffdddddd, &option_sys_colour_ActiveCaption, - NULL + NULL, + B_WINDOW_TAB_COLOR }, { "AppWorkspace", SLEN("AppWorkspace"), 0xffeeeeee, &option_sys_colour_AppWorkspace, - NULL + NULL, + B_PANEL_BACKGROUND_COLOR }, { "Background", SLEN("Background"), 0xff0000aa, &option_sys_colour_Background, - NULL + NULL, + B_DESKTOP_COLOR }, { "ButtonFace", SLEN("ButtonFace"), 0xffaaaaaa, &option_sys_colour_ButtonFace, - NULL + NULL, + B_CONTROL_BACKGROUND_COLOR }, { "ButtonHighlight", SLEN("ButtonHighlight"), 0xffdddddd, &option_sys_colour_ButtonHighlight, - NULL + NULL, + B_CONTROL_HIGHLIGHT_COLOR }, { "ButtonShadow", SLEN("ButtonShadow"), 0xffbbbbbb, &option_sys_colour_ButtonShadow, - NULL + NULL, + NOCOL }, { "ButtonText", SLEN("ButtonText"), 0xff000000, &option_sys_colour_ButtonText, - NULL + NULL, + B_CONTROL_TEXT_COLOR }, { "CaptionText", SLEN("CaptionText"), 0xff000000, &option_sys_colour_CaptionText, - NULL + NULL, + NOCOL }, { "GrayText", SLEN("GrayText"), 0xffcccccc, &option_sys_colour_GrayText, - NULL + NULL, + NOCOL }, { "Highlight", SLEN("Highlight"), 0xff0000ee, &option_sys_colour_Highlight, - NULL + NULL, + NOCOL }, { "HighlightText", SLEN("HighlightText"), 0xff000000, &option_sys_colour_HighlightText, - NULL + NULL, + NOCOL }, { "InactiveBorder", SLEN("InactiveBorder"), 0xffffffff, &option_sys_colour_InactiveBorder, - NULL + NULL, + NOCOL }, { "InactiveCaption", SLEN("InactiveCaption"), 0xffffffff, &option_sys_colour_InactiveCaption, - NULL + NULL, + NOCOL }, { "InactiveCaptionText", SLEN("InactiveCaptionText"), 0xffcccccc, &option_sys_colour_InactiveCaptionText, - NULL + NULL, + NOCOL }, { "InfoBackground", SLEN("InfoBackground"), 0xffaaaaaa, &option_sys_colour_InfoBackground, - NULL + NULL, + B_TOOLTIP_BACKGROUND_COLOR }, { "InfoText", SLEN("InfoText"), 0xff000000, &option_sys_colour_InfoText, - NULL + NULL, + B_TOOLTIP_TEXT_COLOR }, { "Menu", SLEN("Menu"), 0xffaaaaaa, &option_sys_colour_Menu, - NULL + NULL, + B_MENU_BACKGROUND_COLOR }, { "MenuText", SLEN("MenuText"), 0xff000000, &option_sys_colour_MenuText, - NULL + NULL, + B_MENU_ITEM_TEXT_COLOR }, { "Scrollbar", SLEN("Scrollbar"), 0xffaaaaaa, &option_sys_colour_Scrollbar, - NULL + NULL, + NOCOL }, { "ThreeDDarkShadow", SLEN("ThreeDDarkShadow"), 0xff555555, &option_sys_colour_ThreeDDarkShadow, - NULL + NULL, + NOCOL }, { "ThreeDFace", SLEN("ThreeDFace"), 0xffdddddd, &option_sys_colour_ThreeDFace, - NULL + NULL, + NOCOL }, { "ThreeDHighlight", SLEN("ThreeDHighlight"), 0xffaaaaaa, &option_sys_colour_ThreeDHighlight, - NULL + NULL, + NOCOL }, { "ThreeDLightShadow", SLEN("ThreeDLightShadow"), 0xff999999, &option_sys_colour_ThreeDLightShadow, - NULL + NULL, + NOCOL }, { "ThreeDShadow", SLEN("ThreeDShadow"), 0xff777777, &option_sys_colour_ThreeDShadow, - NULL + NULL, + NOCOL }, { "Window", SLEN("Window"), 0xffaaaaaa, &option_sys_colour_Window, - NULL + NULL, + B_DOCUMENT_BACKGROUND_COLOR }, { "WindowFrame", SLEN("WindowFrame"), 0xff000000, &option_sys_colour_WindowFrame, - NULL + NULL, + NOCOL }, { "WindowText", SLEN("WindowText"), 0xff000000, &option_sys_colour_WindowText, - NULL + NULL, + B_DOCUMENT_TEXT_COLOR }, }; @@ -247,6 +309,8 @@ colour_list[ccount].css_colour = *(colour_list[ccount].option_colour); } } + + nsbeos_update_system_ui_colors(); gui_system_colour_pw = colour_list; @@ -294,3 +358,27 @@ return CSS_INVALID; } + +void nsbeos_update_system_ui_colors(void) +{ + unsigned int ccount; + + for (ccount = 0; ccount < colour_list_len; ccount++) { + if (colour_list[ccount].ui == NOCOL) + continue; + rgb_color c = ui_color(colour_list[ccount].ui); + if (colour_list[ccount].ui == B_DESKTOP_COLOR) { + BScreen s; + c = s.DesktopColor(); + } + + //printf("uic[%d] = ui_color(%d) %02x %02x %02x %02x\n", ccount, + // colour_list[ccount].ui, c.red, c.green, c.blue, c.alpha); + + colour_list[ccount].css_colour = 0xff000000 + | ((((uint32_t)c.red << 16) & 0xff0000) + | ((c.green << 8) & 0x00ff00) + | ((c.blue) & 0x0000ff)); + } +} +

12 years, 4 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits January 2011