r13192 mono - /trunk/netsurf/atari/plot/plotter_vdi.c
by netsurf＠semichrome.net
Author: mono
Date: Mon Nov 28 17:29:35 2011
New Revision: 13192
URL: http://source.netsurf-browser.org?rev=13192&view=rev
Log:
Draw rectangle outline manually.
Modified:
trunk/netsurf/atari/plot/plotter_vdi.c
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 Mon Nov 28 17:29:35 2011
@@ -425,7 +425,9 @@
LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__));
return( 1 );
}
-
+
+/* copy an rectangle from the plot buffer to screen */
+/* because this is an on-screen plotter, this is an screen to screen copy. */
static int copy_rect( GEM_PLOTTER self, GRECT src, GRECT dst )
{
MFDB devmf;
@@ -546,44 +548,98 @@
static int rectangle(GEM_PLOTTER self,int x0, int y0, int x1, int y1, const plot_style_t * pstyle)
{
- short pxy[10];
-
- GRECT r, rclip, sclip;
-
+ short pxy[4];
+ GRECT r, rclip, sclip;
+ int sw = pstyle->stroke_width;
+ uint32_t lt;
+
+ /* current canvas clip: */
rclip.g_x = self->clipping.x0;
rclip.g_y = self->clipping.y0;
rclip.g_w = self->clipping.x1 - self->clipping.x0;
rclip.g_h = self->clipping.y1 - self->clipping.y0;
-
+
+ /* physical clipping: */
sclip.g_x = rclip.g_x;
sclip.g_y = rclip.g_y;
sclip.g_w = CURFB(self).vis_w;
sclip.g_h = CURFB(self).vis_h;
+
rc_intersect(&sclip, &rclip);
r.g_x = x0;
r.g_y = y0;
r.g_w = x1 - x0;
- r.g_h = y1 - y0;
- if( !rc_intersect( &rclip, &r ) ) {
+ r.g_h = y1 - y0;
+
+ if( !rc_intersect( &rclip, &r ) ) {
return( 1 );
- }
- vsf_rgbcolor( self->vdi_handle, pstyle->fill_colour );
- vsf_perimeter( self->vdi_handle, 0);
- vsf_interior( self->vdi_handle, FIS_SOLID );
-
- pxy[0] = CURFB(self).x + r.g_x;
- pxy[1] = CURFB(self).y + r.g_y;
- pxy[2] = CURFB(self).x + r.g_x + r.g_w -1;
- pxy[3] = CURFB(self).y + r.g_y + r.g_h -1;
-
- vsf_style( self->vdi_handle, 1);
+ }
if( pstyle->stroke_type != PLOT_OP_TYPE_NONE ){
- self->line(self, x0, y0, x1, y0 , pstyle);
- self->line(self, x1, y0, x1, y1 , pstyle);
- self->line(self, x0, y1, x1, y1 , pstyle);
- self->line(self, x0, y0, x0, y1 , pstyle);
+ /*
+ manually draw the line, because we do not need vdi clipping
+ for vertical / horizontal line draws.
+ */
+ if( sw == 0)
+ sw = 1;
+
+ NSLT2VDI(lt, pstyle);
+ vsl_type( self->vdi_handle, (lt&0x0F) );
+ /*
+ if the line style is not available within VDI system,
+ define own style:
+ */
+ if( (lt&0x0F) == 7 ){
+ vsl_udsty(self->vdi_handle, ((lt&0xFFFF00) >> 8) );
+ }
+ vsl_width( self->vdi_handle, (short)sw );
+ vsl_rgbcolor( self->vdi_handle, pstyle->stroke_colour );
+ /* top border: */
+ if( r.g_y == y0){
+ pxy[0] = CURFB(self).x + r.g_x;
+ pxy[1] = CURFB(self).y + r.g_y ;
+ pxy[2] = CURFB(self).x + r.g_x + r.g_w;
+ pxy[3] = CURFB(self).y + r.g_y;
+ v_pline(self->vdi_handle, 2, (short *)&pxy );
+ }
+
+ /* right border: */
+ if( r.g_x + r.g_w == x1 ){
+ pxy[0] = CURFB(self).x + r.g_x + r.g_w;
+ pxy[1] = CURFB(self).y + r.g_y;
+ pxy[2] = CURFB(self).x + r.g_x + r.g_w;
+ pxy[3] = CURFB(self).y + r.g_y + r.g_h;
+ v_pline(self->vdi_handle, 2, (short *)&pxy );
+ }
+
+ /* bottom border: */
+ if( r.g_y+r.g_h == y1 ){
+ pxy[0] = CURFB(self).x + r.g_x;
+ pxy[1] = CURFB(self).y + r.g_y+r.g_h;
+ pxy[2] = CURFB(self).x + r.g_x+r.g_w;
+ pxy[3] = CURFB(self).y + r.g_y+r.g_h;
+ v_pline(self->vdi_handle, 2, (short *)&pxy );
+ }
+
+ /* left border: */
+ if( r.g_x == x0 ){
+ pxy[0] = CURFB(self).x + r.g_x;
+ pxy[1] = CURFB(self).y + r.g_y;
+ pxy[2] = CURFB(self).x + r.g_x;
+ pxy[3] = CURFB(self).y + r.g_y + r.g_h;
+ v_pline(self->vdi_handle, 2, (short *)&pxy );
+ }
}
if( pstyle->fill_type != PLOT_OP_TYPE_NONE ){
+ vsf_rgbcolor( self->vdi_handle, pstyle->fill_colour );
+ vsf_perimeter( self->vdi_handle, 0);
+ vsf_interior( self->vdi_handle, FIS_SOLID );
+
+ pxy[0] = CURFB(self).x + r.g_x+pstyle->stroke_width;
+ pxy[1] = CURFB(self).y + r.g_y+pstyle->stroke_width;
+ pxy[2] = CURFB(self).x + r.g_x + r.g_w -1 - pstyle->stroke_width ;
+ pxy[3] = CURFB(self).y + r.g_y + r.g_h -1 - pstyle->stroke_width;
+
+ vsf_style( self->vdi_handle, 1);
v_bar( self->vdi_handle, (short*)&pxy );
}
@@ -983,7 +1039,9 @@
pxy[4] = CURFB(self).x + loc.g_x;
pxy[5] = CURFB(self).y + loc.g_y;
pxy[6] = CURFB(self).x + loc.g_x + off.g_w-1;
- pxy[7] = CURFB(self).y + loc.g_y + off.g_h-1;
+ pxy[7] = CURFB(self).y + loc.g_y + off.g_h-1;
+ /* Convert the Bitmap to native screen format - ready for output*/
+ /* This includes blending transparent pixels */
if( convert_bitmap( self, bmp, pxy[4], pxy[5], &off, bg, flags, &src_mf) != 0 ) {
return( true );
}
@@ -1047,15 +1105,6 @@
} else {
/* this method only plots transparent bitmaps, right now... */
}
-
- /* TODO: shrink conversion buffer?
- no, it requires time.
- if( insrc->fd_stand ){
-
- }
-
- */
-
return( 1 );
}
11 years, 6 months
- 1
- 0
r13191 mono - in /trunk/netsurf/atari: Makefile.target browser.c browser.h browser_win.c browser_win.h ctxmenu.c encoding.c encoding.h font.c font.h gui.c history.c plot.h redrawslots.c redrawslots.h toolbar.c toolbar.h treeview.c
by netsurf＠semichrome.net
Author: mono
Date: Mon Nov 28 17:23:28 2011
New Revision: 13191
URL: http://source.netsurf-browser.org?rev=13191&view=rev
Log:
I'm actually trying to simplify the frontend code, changes:
- Optimized browser window caret, uses back-buffer now. ( So no content redraw is scheduled by the frontend just for a caret move )
- Fixed a double redraw issue when the browser reformat is pending and the AES also sends an redraw request because of the resize.
- Started to use netsurfs textarea instead of a custom implementation ( to reduce code size ).
Added:
trunk/netsurf/atari/encoding.c
trunk/netsurf/atari/encoding.h
trunk/netsurf/atari/redrawslots.c
trunk/netsurf/atari/redrawslots.h
Modified:
trunk/netsurf/atari/Makefile.target
trunk/netsurf/atari/browser.c
trunk/netsurf/atari/browser.h
trunk/netsurf/atari/browser_win.c
trunk/netsurf/atari/browser_win.h
trunk/netsurf/atari/ctxmenu.c
trunk/netsurf/atari/font.c
trunk/netsurf/atari/font.h
trunk/netsurf/atari/gui.c
trunk/netsurf/atari/history.c
trunk/netsurf/atari/plot.h
trunk/netsurf/atari/toolbar.c
trunk/netsurf/atari/toolbar.h
trunk/netsurf/atari/treeview.c
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 Mon Nov 28 17:23:28 2011
@@ -38,6 +38,7 @@
search.c font.c \
plot.c plot/plotter.c plot/plotter_vdi.c plot/eddi.s \
plot/font_vdi.c plot/font_freetype.c plot/font_internal.c \
+ redrawslots.c encoding.c \
browser_win.c toolbar.c statusbar.c browser.c \
global_evnt.c osspec.c dragdrop.c system_colour.c \
ctxmenu.c
Modified: trunk/netsurf/atari/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser.c?rev=13191...
==============================================================================
--- trunk/netsurf/atari/browser.c (original)
+++ trunk/netsurf/atari/browser.c Mon Nov 28 17:23:28 2011
@@ -49,12 +49,13 @@
#include "atari/browser_win.h"
#include "atari/misc.h"
#include "atari/global_evnt.h"
-#include "atari/res/netsurf.rsh"
+#include "atari/res/netsurf.rsh"
+#include "atari/redrawslots.h"
#include "atari/browser.h"
#include "atari/plot/plotter.h"
#include "atari/plot.h"
-#include "atari/font.h"
-#include "atari/ctxmenu.h"
+#include "atari/encoding.h"
+#include "atari/ctxmenu.h"
#include "cflib.h"
extern browser_mouse_state bmstate;
@@ -63,13 +64,20 @@
extern GEM_PLOTTER plotter;
extern struct gui_window *input_window;
extern short last_drag_x;
-extern short last_drag_y;
-
-
-
-static void __CDECL browser_evnt_wdestroy( WINDOW * c, short buff[8], void * data);
-COMPONENT *comp_widget_create( APPvar *app, WINDOW *win, int size, int flex );
-
+extern short last_drag_y;
+
+static void browser_process_scroll( struct gui_window * gw, LGRECT bwrect );
+static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff,
+ struct rect * area );
+static void __CDECL browser_evnt_resize( COMPONENT * c, long buff[8],
+ void * data);
+static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8],
+ void * data);
+static void __CDECL browser_evnt_redraw( COMPONENT * c, long buff[8],
+ void * data);
+static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8],
+ void * data);
+
/*
Create an browser component.
@@ -97,8 +105,8 @@
if(clone)
bw->scale = clone->scale;
else
- bw->scale = 1;
- bnew->redraw.areas_used = 0;
+ bw->scale = 1;
+ redraw_slots_init( &bnew->redraw, MAX_REDRW_SLOTS );
bnew->comp = (COMPONENT*)mt_CompCreate(&app, CLT_HORIZONTAL, 100, 1);
if( bnew->comp == NULL ) {
free(bnew);
@@ -114,6 +122,9 @@
);
mt_CompEvntDataAttach( &app, bnew->comp, WM_DESTROY,
browser_evnt_destroy, (void*)bnew
+ );
+ mt_CompEvntDataAttach( &app, bnew->comp, WM_SIZED,
+ browser_evnt_resize, (void*)gw
);
/* Set the gui_window owner. */
@@ -124,6 +135,7 @@
bnew->scroll.requested.x = 0;
bnew->scroll.current.x = 0;
bnew->scroll.current.y = 0;
+ bnew->reformat_pending = false;
}
return( bnew );
@@ -170,12 +182,12 @@
void browser_update_rects(struct gui_window * gw )
{
short buff[8];
- LGRECT cmprect;
+ LGRECT cmprect;
mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH, (GRECT*)&buff[4]);
buff[0] = CM_REFLOW;
buff[1] = _AESapid;
buff[2] = 0;
- EvntExec(gw->root->handle, buff);
+ EvntExec(gw->root->handle, buff);
}
void browser_set_content_size(struct gui_window * gw, int w, int h)
@@ -194,6 +206,13 @@
/* force update of scrollbars: */
b->scroll.required = true;
}
+}
+
+static void __CDECL browser_evnt_resize( COMPONENT * c, long buff[8], void * data)
+{
+ /* Just a dummy to prevent second redraw (already handled within browser_win)*/
+ printf("browser evnt resize");
+ return;
}
static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * data)
@@ -419,7 +438,7 @@
dst.g_h = src.g_h;
plotter->copy_rect( plotter, src, dst );
b->scroll.current.y += b->scroll.requested.y;
- browser_schedule_redraw( gw, 0, 0, bwrect.g_w, h ) ;
+ browser_schedule_redraw( gw, 0, 0, bwrect.g_w, h );
}
if( b->scroll.requested.y > 0 ) {
@@ -467,7 +486,10 @@
browser_schedule_redraw( gw, bwrect.g_w - w, 0, bwrect.g_w, bwrect.g_h );
}
b->scroll.requested.y = 0;
- b->scroll.requested.x = 0;
+ b->scroll.requested.x = 0;
+ if( b->caret.requested.g_w > 0 ){
+ b->caret.redraw = true;
+ }
gw->root->handle->xpos = b->scroll.current.x;
gw->root->handle->ypos = b->scroll.current.y;
@@ -477,7 +499,7 @@
/*
Report keypress to browser component.
- The browser component doesn't list for keyinput by itself.
+ The browser component doesn't listen for keyinput by itself.
parameter:
- gui_window ( compocnent owner ).
- unsigned short nkc ( CFLIB normalised key code )
@@ -487,154 +509,58 @@
LGRECT work;
bool r = false;
unsigned char ascii = (nkc & 0xFF);
- nkc = (nkc & (NKF_CTRL|NKF_SHIFT|0xFF));
- browser_get_rect(gw, BR_CONTENT, &work);
-
- if( (nkc & NKF_CTRL) != 0 ) {
- switch ( ascii ) {
- case 'A':
- r = browser_window_key_press(gw->browser->bw, KEY_SELECT_ALL);
- break;
-
- case 'C':
- r = browser_window_key_press(gw->browser->bw, KEY_COPY_SELECTION);
- break;
-
- case 'X':
- r = browser_window_key_press(gw->browser->bw, KEY_CUT_SELECTION);
- break;
-
- case 'V':
- r = browser_window_key_press(gw->browser->bw, KEY_PASTE);
- break;
-
- default:
- break;
- }
- }
- if( (nkc & NKF_SHIFT) != 0 ) {
- switch( ascii ) {
-
- case NK_TAB:
- r = browser_window_key_press(gw->browser->bw, KEY_SHIFT_TAB);
- break;
-
- case NK_LEFT:
- if( browser_window_key_press(gw->browser->bw, KEY_LINE_START) == false) {
- browser_scroll( gw, WA_LFPAGE, work.g_w, false );
- r = true;
- }
- break;
-
- case NK_RIGHT:
- if( browser_window_key_press(gw->browser->bw, KEY_LINE_END) == false) {
- browser_scroll( gw, WA_RTPAGE, work.g_w, false );
- r = true;
- }
- break;
-
- case NK_UP:
- if ( browser_window_key_press(gw->browser->bw, KEY_PAGE_UP) ==false ){
- browser_scroll( gw, WA_UPPAGE, work.g_h, false );
- r = true;
- }
- break;
-
- case NK_DOWN:
- if (browser_window_key_press(gw->browser->bw, KEY_PAGE_DOWN) == false) {
- browser_scroll( gw, WA_DNPAGE, work.g_h, false );
- r = true;
- }
- break;
-
- default:
- break;
- }
- }
- if( (nkc & (NKF_SHIFT|NKF_CTRL) ) == 0 ) {
- switch( ascii ) {
- case NK_BS:
- r = browser_window_key_press(gw->browser->bw, KEY_DELETE_LEFT);
- break;
-
- case NK_DEL:
- r = browser_window_key_press(gw->browser->bw, KEY_DELETE_RIGHT);
- break;
-
- case NK_TAB:
- r = browser_window_key_press(gw->browser->bw, KEY_TAB);
- break;
-
-
- case NK_ENTER:
- r = browser_window_key_press(gw->browser->bw, KEY_NL);
- break;
-
- case NK_RET:
- r = browser_window_key_press(gw->browser->bw, KEY_CR);
- break;
-
- case NK_ESC:
- r = browser_window_key_press(gw->browser->bw, KEY_ESCAPE);
- break;
-
- case NK_CLRHOME:
- r = browser_window_key_press(gw->browser->bw, KEY_TEXT_START);
- break;
-
- case NK_RIGHT:
- if (browser_window_key_press(gw->browser->bw, KEY_RIGHT) == false){
- browser_scroll( gw, WA_RTLINE, 16, false );
- r = true;
- }
- break;
-
- case NK_LEFT:
- if (browser_window_key_press(gw->browser->bw, KEY_LEFT) == false) {
- browser_scroll( gw, WA_LFLINE, 16, false );
- r = true;
- }
- break;
-
- case NK_UP:
- if (browser_window_key_press(gw->browser->bw, KEY_UP) == false) {
- browser_scroll( gw, WA_UPLINE, 16, false);
- r = true;
- }
- break;
-
- case NK_DOWN:
- if (browser_window_key_press(gw->browser->bw, KEY_DOWN) == false) {
- browser_scroll( gw, WA_DNLINE, 16, false);
- r = true;
- }
- break;
-
- 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 );
- r = true;
- }
- break;
-
- 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 );
- r = true;
- }
- break;
-
- default:
- break;
- }
- }
-
- if( r == false && ( (nkc & NKF_CTRL)==0) ) {
+ long ucs4;
+ long ik = nkc_to_input_key( nkc, &ucs4 );
+
+ // pass event to specific control?
+
+ if( ik == 0 ){
if (ascii >= 9 ) {
- int ucs4 = atari_to_ucs4(ascii);
r = browser_window_key_press(gw->browser->bw, ucs4 );
- }
- }
+ }
+ } else {
+ r = browser_window_key_press(gw->browser->bw, ik );
+ if( r == false ){
+ browser_get_rect(gw, BR_CONTENT, &work);
+ switch( ik ){
+ case KEY_LINE_START:
+ browser_scroll( gw, WA_LFPAGE, work.g_w, false );
+ break;
+
+ case KEY_LINE_END:
+ browser_scroll( gw, WA_RTPAGE, work.g_w, false );
+ break;
+
+ case KEY_PAGE_UP:
+ browser_scroll( gw, WA_UPPAGE, work.g_h, false );
+ break;
+
+ case KEY_PAGE_DOWN:
+ browser_scroll( gw, WA_DNPAGE, work.g_h, false );
+ break;
+
+ case KEY_RIGHT:
+ browser_scroll( gw, WA_RTLINE, 16, false );
+ break;
+
+ case KEY_LEFT:
+ browser_scroll( gw, WA_LFLINE, 16, false );
+ break;
+
+ case KEY_UP:
+ browser_scroll( gw, WA_UPLINE, 16, false);
+ break;
+
+ case KEY_DOWN:
+ browser_scroll( gw, WA_DNLINE, 16, false);
+ break;
+
+ default:
+ break;
+ }
+ }
+ }
+
return( r );
}
@@ -645,11 +571,15 @@
CMP_BROWSER b = gw->browser;
if( b->bw->current_content == NULL )
- return ( false );
+ return ( false );
+
+ /* disable redraws when the browser awaits WM_REDRAW caused by resize */
+ if( b->reformat_pending )
+ return( false );
ret = ( ((b->redraw.areas_used > 0) )
|| b->scroll.required
- || b->caret.redraw );
+ || b->caret.redraw);
return( ret );
}
@@ -670,22 +600,6 @@
browser_schedule_redraw( gw, x, y, x+w, y+h );
}
-static inline bool rect_intersect( struct rect * box1, struct rect * box2 )
-{
- if (box2->x1 < box1->x0)
- return false;
-
- if (box2->y1 < box1->y0)
- return false;
-
- if (box2->x0 > box1->x1)
- return false;
-
- if (box2->y0 > box1->y1)
- return false;
-
- return true;
-}
/*
schedule a redraw of content, coords are relative to the framebuffer
@@ -707,50 +621,13 @@
if( y0 > work.g_h )
return;
- area.x0 = x0;
- area.y0 = y0;
- area.x1 = x1;
- area.y1 = y1;
-
- for( i=0; i<b->redraw.areas_used; i++) {
- if( b->redraw.areas[i].x0 <= x0
- && b->redraw.areas[i].x1 >= x1
- && b->redraw.areas[i].y0 <= y0
- && b->redraw.areas[i].y1 >= y1 ){
- /* the area is already queued for redraw */
- return;
- } else {
- if( rect_intersect(&b->redraw.areas[i], &area ) ){
- b->redraw.areas[i].x0 = MIN(b->redraw.areas[i].x0, x0);
- b->redraw.areas[i].y0 = MIN(b->redraw.areas[i].y0, y0);
- b->redraw.areas[i].x1 = MAX(b->redraw.areas[i].x1, x1);
- b->redraw.areas[i].y1 = MAX(b->redraw.areas[i].y1, y1);
- return;
- }
- }
- }
-
- if( b->redraw.areas_used < MAX_REDRW_SLOTS ) {
- b->redraw.areas[b->redraw.areas_used].x0 = x0;
- b->redraw.areas[b->redraw.areas_used].x1 = x1;
- b->redraw.areas[b->redraw.areas_used].y0 = y0;
- b->redraw.areas[b->redraw.areas_used].y1 = y1;
- b->redraw.areas_used++;
- } else {
- /*
- we are out of available slots, merge box with last slot
- this is dumb... but also a very rare case.
- */
- b->redraw.areas[MAX_REDRW_SLOTS-1].x0 = MIN(b->redraw.areas[i].x0, x0);
- b->redraw.areas[MAX_REDRW_SLOTS-1].y0 = MIN(b->redraw.areas[i].y0, y0);
- b->redraw.areas[MAX_REDRW_SLOTS-1].x1 = MAX(b->redraw.areas[i].x1, x1);
- b->redraw.areas[MAX_REDRW_SLOTS-1].y1 = MAX(b->redraw.areas[i].y1, y1);
- }
-done:
+ redraw_slot_schedule( &b->redraw, x0, y0, x1, y1 );
+
return;
}
-static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff )
+static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff,
+ struct rect * area )
{
LGRECT work;
CMP_BROWSER b = gw->browser;
@@ -760,44 +637,104 @@
.plot = &atari_plotters
};
- LOG(("%s : %d,%d - %d,%d\n", b->bw->name, b->redraw.area.x0,
- b->redraw.area.y0, b->redraw.area.x1, b->redraw.area.y1
+ LOG(("%s : %d,%d - %d,%d\n", b->bw->name, area->x0,
+ area->y0, area->x1, area->y1
));
browser_window_redraw( b->bw, -b->scroll.current.x,
- -b->scroll.current.y, &b->redraw.area, &ctx );
-
-}
-
-
-void browser_redraw_caret( struct gui_window * gw, GRECT * area )
-{
- GRECT caret;
- struct s_browser * b = gw->browser;
- if( b->caret.redraw == true ){
+ -b->scroll.current.y, area, &ctx );
+
+}
+
+/*
+ area: the browser canvas
+*/
+void browser_restore_caret_background( struct gui_window * gw, LGRECT * area)
+{
+ CMP_BROWSER b = gw->browser;
+ LGRECT rect;
+ if( area == NULL ){
+ browser_get_rect( gw, BR_CONTENT, &rect );
+ area = ▭
+ }
+ /* This call restores the background and releases the memory: */
+ // TODO: only release memory/clear flag when the caret is not clipped.
+ // TODO: apply clipping.
+ w_put_bkgr( &app,
+ area->g_x-b->scroll.current.x+b->caret.current.g_x,
+ area->g_y-b->scroll.current.y+b->caret.current.g_y,
+ gw->browser->caret.current.g_w,
+ gw->browser->caret.current.g_h,
+ &gw->browser->caret.background
+ );
+ gw->browser->caret.background.fd_addr = NULL;
+}
+
+/*
+ area: the browser canvas
+*/
+void browser_redraw_caret( struct gui_window * gw, LGRECT * area )
+{
+ // TODO: only redraw caret when window is topped.
+ if( gw->browser->caret.redraw && gw->browser->caret.requested.g_w > 0 ){
+ LGRECT caret;
+ struct s_browser * b = gw->browser;
struct rect old_clip;
- struct rect clip;
+ struct rect clip;
+
+ if( b->caret.current.g_w > 0 && b->caret.background.fd_addr != NULL ){
+ browser_restore_caret_background( gw, area );
+ }
caret = b->caret.requested;
- caret.g_x -= gw->browser->scroll.current.x;
- caret.g_y -= gw->browser->scroll.current.y;
- clip.x0 = caret.g_x - 1;
- clip.y0 = caret.g_y - 1;
- clip.x1 = caret.g_x + caret.g_w + 1;
- clip.y1 = caret.g_y + caret.g_h + 1;
+ caret.g_x -= b->scroll.current.x - area->g_x;
+ caret.g_y -= b->scroll.current.y - area->g_y;
+
+ if( !rc_lintersect( area, &caret ) ) {
+ return;
+ }
+
+ MFDB screen;
+ short pxy[8];
+
+ /* save background: */
+ //assert( b->caret.background.fd_addr == NULL );
+ init_mfdb( app.nplanes, caret.g_w, caret.g_h, 0,
+ &b->caret.background );
+ init_mfdb( 0, caret.g_w, caret.g_h, 0, &screen );
+ pxy[0] = caret.g_x;
+ pxy[1] = caret.g_y;
+ pxy[2] = caret.g_x + caret.g_w - 1;
+ pxy[3] = caret.g_y + caret.g_h - 1;
+ pxy[4] = 0;
+ pxy[5] = 0;
+ pxy[6] = caret.g_w - 1;
+ pxy[7] = caret.g_h - 1;
+ /* hide the mouse */
+ v_hide_c ( app.graf.handle);
+ /* copy screen image */
+ vro_cpyfm ( app.graf.handle, S_ONLY, pxy, &screen, &b->caret.background);
+ /* restore the mouse */
+ v_show_c ( app.graf.handle, 1);
+ /* draw caret: */
+ caret.g_x -= area->g_x;
+ caret.g_y -= area->g_y;
+ clip.x0 = caret.g_x;
+ clip.y0 = caret.g_y;
+ clip.x1 = caret.g_x + caret.g_w-1;
+ clip.y1 = caret.g_y + caret.g_h-1;
/* store old clip before adjusting it: */
plot_get_clip( &old_clip );
/* clip to cursor: */
- plot_clip( &clip );
- plot_rectangle( caret.g_x, caret.g_y,
- caret.g_x+caret.g_w, caret.g_y+caret.g_h,
- plot_style_caret );
+ plot_clip( &clip );
+ plot_line( caret.g_x, caret.g_y, caret.g_x, caret.g_y + caret.g_h,
+ plot_style_caret );
/* restore old clip area: */
plot_clip( &old_clip );
b->caret.current.g_x = caret.g_x + gw->browser->scroll.current.x;
b->caret.current.g_y = caret.g_y + gw->browser->scroll.current.y;
- b->caret.current.g_w = caret.g_w;
+ b->caret.current.g_w = caret.g_w;
b->caret.current.g_h = caret.g_h;
}
}
@@ -807,13 +744,15 @@
LGRECT bwrect;
struct s_browser * b = gw->browser;
short todo[4];
- struct rect clip;
+ struct rect clip;
+ /* used for clipping of content redraw: */
+ struct rect redraw_area;
if( b->attached == false || b->bw->current_content == NULL ) {
return;
}
- browser_get_rect(gw, BR_CONTENT, &bwrect);
+ browser_get_rect(gw, BR_CONTENT, &bwrect);
plotter->resize(plotter, bwrect.g_w, bwrect.g_h);
plotter->move(plotter, bwrect.g_x, bwrect.g_y );
@@ -864,11 +803,11 @@
area.g_w = b->redraw.areas[i].x1 - b->redraw.areas[i].x0;
area.g_h = b->redraw.areas[i].y1 - b->redraw.areas[i].y0;
if (rc_intersect((GRECT *)&fbwork,(GRECT *)&area)) {
- b->redraw.area.x0 = area.g_x;
- b->redraw.area.y0 = area.g_y;
- b->redraw.area.x1 = area.g_x + area.g_w;
- b->redraw.area.y1 = area.g_y + area.g_h;
- browser_redraw_content( gw, 0, 0 );
+ redraw_area.x0 = area.g_x;
+ redraw_area.y0 = area.g_y;
+ redraw_area.x1 = area.g_x + area.g_w;
+ redraw_area.y1 = area.g_y + area.g_h;
+ browser_redraw_content( gw, 0, 0, &redraw_area );
} else {
/*
the area should be kept scheduled for later redraw, but because this
@@ -889,8 +828,8 @@
}
b->redraw.areas_used = 0;
}
- if( b->caret.redraw == true && b->bw->current_content != NULL ) {
- GRECT area;
+ if( b->caret.redraw == true && b->bw->current_content != NULL ) {
+ LGRECT area;
todo[0] = bwrect.g_x;
todo[1] = bwrect.g_y;
todo[2] = todo[0] + bwrect.g_w;
@@ -913,15 +852,8 @@
short pxy[8];
struct gui_window * gw = (struct gui_window *) data;
CMP_BROWSER b = gw->browser;
- LGRECT work, lclip, rwork;
-
- // TODO: maybe implement something like validate_gw()
- // to fetch spurious redraw events? the function should
- // traverse all gui_windows and see if gw exists in the list
-
- int xoff,yoff,width,heigth;
- short cw, ch, cellw, cellh;
- /* use that instead of browser_find_root() ? */
+ LGRECT work, lclip;
+
browser_get_rect( gw, BR_CONTENT, &work );
lclip = work;
if ( !rc_lintersect( (LGRECT*)&buff[4], &lclip ) ) return;
@@ -953,12 +885,23 @@
lclip.g_h = work.g_h + lclip.g_y;
lclip.g_y = 0;
}
-
if( lclip.g_h > 0 && lclip.g_w > 0 ) {
- browser_schedule_redraw( gw, lclip.g_x, lclip.g_y,
- lclip.g_x + lclip.g_w, lclip.g_y + lclip.g_h
- );
+
+ if( gw->browser->reformat_pending == true ){
+ LGRECT newsize;
+ gw->browser->reformat_pending = false;
+ browser_get_rect(gw, BR_CONTENT, &newsize);
+ /* this call will also schedule an redraw for the complete */
+ /* area. */
+ /* Resize must be handled here, because otherwise */
+ /* a redraw is scheduled twice (1. by the frontend, 2. by AES) */
+ browser_window_reformat(b->bw, false, newsize.g_w, newsize.g_h );
+ } else {
+ browser_schedule_redraw( gw, lclip.g_x, lclip.g_y,
+ lclip.g_x + lclip.g_w, lclip.g_y + lclip.g_h
+ );
+ }
}
return;
Modified: trunk/netsurf/atari/browser.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser.h?rev=13191...
==============================================================================
--- trunk/netsurf/atari/browser.h (original)
+++ trunk/netsurf/atari/browser.h Mon Nov 28 17:23:28 2011
@@ -17,7 +17,9 @@
*/
#ifndef NS_ATARI_BROWSER_H
-#define NS_ATARI_BROWSER_H
+#define NS_ATARI_BROWSER_H
+
+#include "atari/redrawslots.h"
/*
Each browser_window in the Atari Port is represented by an struct s_browser,
@@ -30,13 +32,6 @@
*/
#define BROWSER_SCROLL_SVAL 64
-/*
- MAX_REDRW_SLOTS
- This is the number of redraw requests that an browser window can queue.
- If a redraw is scheduled and all slots are used, the rectangle will
- be merged to one of the existing slots.
- */
-#define MAX_REDRW_SLOTS 32
enum browser_rect
{
@@ -65,21 +60,10 @@
*/
struct s_caret
{
- GRECT requested;
- GRECT current;
- bool redraw;
-};
-
-/*
- This struct holds scheduled redraw requests.
-*/
-struct rect;
-struct s_browser_redrw_info
-{
- struct rect areas[MAX_REDRW_SLOTS];
- short areas_used;
- /* used for clipping of content redraw: */
- struct rect area;
+ LGRECT requested;
+ LGRECT current;
+ bool redraw;
+ MFDB background;
};
/*
@@ -99,9 +83,10 @@
COMPONENT * comp;
struct browser_window * bw;
struct s_scroll_info scroll;
- struct s_browser_redrw_info redraw;
+ struct s_redrw_slots redraw;
struct s_caret caret;
- bool attached;
+ bool attached;
+ bool reformat_pending;
};
struct s_browser * browser_create( struct gui_window * gw, struct browser_window * clone, struct browser_window *bw, int lt, int w, int flex );
@@ -113,8 +98,10 @@
void browser_scroll( struct gui_window * gw, short MODE, int value, bool abs );
struct gui_window * browser_find_root( struct gui_window * gw );
bool browser_redraw_required( struct gui_window * gw);
-static void browser_process_scroll( struct gui_window * gw, LGRECT bwrect );
-
+void browser_redraw_caret( struct gui_window * gw, LGRECT * area);
+void browser_restore_caret_background(struct gui_window * gw, LGRECT * area);
+/* update loc / size of the browser widgets: */
+void browser_update_rects(struct gui_window * gw );
/*
This queues an redraw to one of the slots.
The following strategy is used:
@@ -126,17 +113,7 @@
4. if no slot is available, it will simply merge the new rectangle with
the last available slot.
*/
-void browser_redraw_caret( struct gui_window * gw, GRECT * area );
-static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff );
-
-/* update loc / size of the browser widgets: */
-void browser_update_rects(struct gui_window * gw );
void browser_schedule_redraw_rect(struct gui_window * gw, short x, short y, short w, short h);
void browser_schedule_redraw(struct gui_window * gw, short x, short y, short w, short h );
-static void __CDECL browser_evnt_resize( COMPONENT * c, long buff[8], void * data);
-static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * data);
-static void __CDECL browser_evnt_redraw( COMPONENT * c, long buff[8], void * data);
-static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], void * data);
-
#endif
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 Mon Nov 28 17:23:28 2011
@@ -67,7 +67,27 @@
extern short last_drag_y;
void __CDECL std_szd( WINDOW * win, short buff[8], void * );
-void __CDECL std_mvd( WINDOW * win, short buff[8], void * );
+void __CDECL std_mvd( WINDOW * win, short buff[8], void * );
+
+
+/* -------------------------------------------------------------------------- */
+/* Static module methods follow here: */
+/* -------------------------------------------------------------------------- */
+static void evnt_toolbar_click(WINDOW * win, short buf[8], void * data);
+static void __CDECL evnt_window_redraw( WINDOW *win, short buff[8], void *data );
+static void __CDECL evnt_window_icondraw( WINDOW *win, short buff[8], void *data );
+static void __CDECL evnt_window_newtop( WINDOW *win, short buff[8], void *data );
+void __CDECL evnt_window_resize( WINDOW *win, short buff[8], void * data );
+static void __CDECL evnt_window_move( WINDOW *win, short buff[8], void * data );
+static void __CDECL evnt_window_rt_resize( WINDOW *win, short buff[8], void * date );
+static void __CDECL evnt_window_close( WINDOW *win, short buff[8], void *data );
+static void __CDECL evnt_window_dd( WINDOW *win, short wbuff[8], void * data ) ;
+static void __CDECL evnt_window_destroy( WINDOW *win, short buff[8], void *data );
+static void __CDECL evnt_window_keybd(WINDOW *win, short buff[8], void *data );
+static void __CDECL evnt_window_mbutton(WINDOW *win, short buff[8], void *data );
+static void __CDECL evnt_window_m1( WINDOW * win, short buff[8], void * data);
+static void __CDECL evnt_window_slider( WINDOW * win, short buff[8], void * data);
+static void __CDECL evnt_window_arrowed( WINDOW *win, short buff[8], void *data );
/* -------------------------------------------------------------------------- */
/* Module public functions: */
@@ -259,7 +279,8 @@
/* needed? */ /*listRemove( (LINKABLE*)gw->root->cmproot ); */
if( gw->root ) {
- /* TODO: check if no other browser is bound to this root window! */
+ /* TODO: check if no other browser is bound to this root window! */
+ /* only needed for tabs */
if( gw->root->title )
free( gw->root->title );
if( gw->root->cmproot )
@@ -289,7 +310,7 @@
mt_CompEvntExec( gl_appvar, gw->browser->comp, lfbuff );
/* recompute the nested component sizes and positions: */
- browser_update_rects( gw );
+ browser_update_rects( gw );
mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH, (GRECT*)&gw->root->loc);
browser_get_rect( gw, BR_CONTENT, &br );
plotter->move( plotter, br.g_x, br.g_y );
@@ -298,6 +319,7 @@
if( gw->root->statusbar != NULL ){
gw->root->statusbar->attached = true;
}
+ tb_adjust_size( gw );
/*TBD: get already present content and set size? */
}
@@ -358,6 +380,7 @@
return( ( element == gw->root->focus.element && t == gw->root->focus.type) );
}
+
/* -------------------------------------------------------------------------- */
/* Event Handlers: */
/* -------------------------------------------------------------------------- */
@@ -390,7 +413,8 @@
break;
}
browser_scroll( input_window, buff[4], value, abs );
-}
+}
+
static void __CDECL evnt_window_dd( WINDOW *win, short wbuff[8], void * data )
{
@@ -516,7 +540,6 @@
{
struct gui_window * gw = input_window;
static bool prev_url = false;
- static bool prev_sb = false;
short mx, my, mbut, mkstate;
bool a = false; //flags if mouse is within controls or browser
bool within = false;
@@ -555,21 +578,10 @@
prev_url = a = true;
}
}
- if( gw->root->statusbar && within == false /* && a == false */ ) {
- if( mx >= sbbox.g_x + (sbbox.g_w-MOVER_WH) && mx <= sbbox.g_x + sbbox.g_w &&
- my >= sbbox.g_y + (sbbox.g_h-MOVER_WH) && my <= sbbox.g_y + sbbox.g_h ) {
- /* mouse within sizer box ( bottom right ) */
- prev_sb = a = true;
- gem_set_cursor( &gem_cursors.sizenwse );
- }
- }
if( !a ) {
- if( prev_sb )
- gw->root->statusbar->resize_init = true;
- if( prev_url || prev_sb ) {
+ if( prev_url ) {
gem_set_cursor( &gem_cursors.arrow );
prev_url = false;
- prev_sb = false;
}
/* report mouse move in the browser window */
if( within ){
@@ -632,14 +644,15 @@
int dy = buff[5];
GRECT work, screen;
struct gui_window * gw = data;
-
+
if (!dx && !dy) return;
if( input_window == NULL || input_window != gw ) {
return;
}
- /* update the sliders _before_ we call redraw (which might depend on the slider possitions) */
+ /* update the sliders _before_ we call redraw
+ (which might depend on the slider possitions) */
WindSlider( win, (dx?HSLIDER:0) | (dy?VSLIDER:0) );
if( dy > 0 )
@@ -650,6 +663,8 @@
browser_scroll( gw, WA_RTPAGE, abs(dx), false );
else if( dx < 0 )
browser_scroll( gw, WA_LFPAGE, abs(dx), false );
+
+
}
@@ -707,7 +722,7 @@
void __CDECL evnt_window_resize( WINDOW *win, short buff[8], void * data )
{
short wx, wy, wh, ww, nw, nh;
- short r;
+ short r;
wind_get( win->handle, WF_CURRXYWH, &wx, &wy, &ww, &wh );
r = graf_rubberbox(wx, wy, 20, 20, &nw, &nh);
@@ -726,8 +741,8 @@
{
short x,y,w,h;
struct gui_window * gw;
- LGRECT rect;
-
+ LGRECT rect;
+
if(buff[0] == WM_FORCE_MOVE ) {
std_mvd(win, buff, &app);
std_szd(win, buff, &app);
@@ -736,30 +751,28 @@
wind_get( win->handle, WF_CURRXYWH, &x, &y, &w, &h );
gw = (struct gui_window *)data;
- assert( gw != NULL );
+ assert( gw != NULL );
if(gw->root->loc.g_w != w || gw->root->loc.g_h != h ){
/* report resize to component interface: */
- browser_update_rects( gw );
- mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH, (GRECT*)&gw->root->loc);
- browser_get_rect( gw, BR_CONTENT, &rect );
- if( gw->browser->bw->current_content != NULL )
- browser_window_reformat(gw->browser->bw, false, rect.g_w, rect.g_h );
- else
- WindClear( gw->root->handle );
- gw->root->toolbar->url.scrollx = 0;
-
- /* send complete redraw to toolbar & statusbar: */
- mt_CompGetLGrect(&app, gw->root->toolbar->comp, WF_WORKXYWH, &rect);
- ApplWrite( _AESapid, WM_REDRAW, gw->root->handle->handle,
- rect.g_x, rect.g_y, rect.g_w, rect.g_h
- );
- 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
- );
-
- /* TODO: recalculate scroll position, instead of zeroing? */
+ browser_update_rects( gw );
+ tb_adjust_size( gw );
+ if( gw->browser->bw->current_content != NULL ){
+ /* Reformat will happen when next redraw message arrives: */
+ gw->browser->reformat_pending = true;
+ if( sys_XAAES() ){
+ if( gw->root->loc.g_w > w || gw->root->loc.g_h > h ){
+ ApplWrite( _AESapid, WM_REDRAW, gw->root->handle->handle,
+ gw->root->loc.g_x, gw->root->loc.g_y,
+ gw->root->loc.g_w, gw->root->loc.g_h );
+ }
+ }
+ mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH,
+ (GRECT*)&gw->root->loc);
+ }
+ else {
+ WindClear( gw->root->handle );
+ }
} else {
if(gw->root->loc.g_x != x || gw->root->loc.g_y != y ){
mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH, (GRECT*)&gw->root->loc);
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 Mon Nov 28 17:23:28 2011
@@ -64,23 +64,4 @@
/* Public event handlers: */
/* -------------------------------------------------------------------------- */
-
-/* -------------------------------------------------------------------------- */
-/* Static module methods follow here: */
-/* -------------------------------------------------------------------------- */
-static void evnt_toolbar_click(WINDOW * win, short buf[8], void * data);
-static void __CDECL evnt_window_redraw( WINDOW *win, short buff[8], void *data );
-static void __CDECL evnt_window_icondraw( WINDOW *win, short buff[8], void *data );
-static void __CDECL evnt_window_newtop( WINDOW *win, short buff[8], void *data );
-void __CDECL evnt_window_resize( WINDOW *win, short buff[8], void * data );
-static void __CDECL evnt_window_move( WINDOW *win, short buff[8], void * data );
-static void __CDECL evnt_window_rt_resize( WINDOW *win, short buff[8], void * date );
-static void __CDECL evnt_window_close( WINDOW *win, short buff[8], void *data );
-static void __CDECL evnt_window_dd( WINDOW *win, short wbuff[8], void * data ) ;
-static void __CDECL evnt_window_destroy( WINDOW *win, short buff[8], void *data );
-static void __CDECL evnt_window_keybd(WINDOW *win, short buff[8], void *data );
-static void __CDECL evnt_window_mbutton(WINDOW *win, short buff[8], void *data );
-static void __CDECL evnt_window_m1( WINDOW * win, short buff[8], void * data);
-static void __CDECL evnt_window_slider( WINDOW * win, short buff[8], void * data);
-static void __CDECL evnt_window_arrowed( WINDOW *win, short buff[8], void *data );
#endif
Modified: trunk/netsurf/atari/ctxmenu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/ctxmenu.c?rev=13191...
==============================================================================
--- trunk/netsurf/atari/ctxmenu.c (original)
+++ trunk/netsurf/atari/ctxmenu.c Mon Nov 28 17:23:28 2011
@@ -96,7 +96,7 @@
memset( &ctxinfo.ccdata, sizeof(struct contextual_content), 0 );
browser_window_get_contextual_content(
gw->browser->bw,
- mx+gw->browser->scroll.current.x,
+ mx+gw->browser->scroll.current.x,
my+gw->browser->scroll.current.y,
(struct contextual_content*)&ctxinfo.ccdata
);
@@ -149,7 +149,8 @@
char * data;
FILE * fp_tmpfile;
char * tempfile;
- int err = 0;
+ int err = 0;
+ char cmdline[128];
pop = get_tree( POP_CTX );
if( pop == NULL )
@@ -251,11 +252,18 @@
fp_tmpfile = fopen( tempfile, "w" );
if( fp_tmpfile ){
fwrite( data, size, 1, fp_tmpfile );
- fclose( fp_tmpfile );
- err = ShelWrite( option_atari_editor, tempfile , NULL, 1, 0);
+ fclose( fp_tmpfile );
+ // TODO: check if app is runnin, if not, use pexec or such.
+ /*sprintf((char*)&cmdline, "%s \"%s\"", option_atari_editor, tempfile );
+ system( (char*)&cmdline );
+ */
+ //err = ShelWrite( option_atari_editor, tempfile , option_atari_editor, 1, 0);
LOG(("launched: %s %s (%d)\n", option_atari_editor, tempfile, err ));
- }
+ }
+
}
+ } else {
+ LOG(("Please set option_atari_editor!"));
}
break;
Added: trunk/netsurf/atari/encoding.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/encoding.c?rev=1319...
==============================================================================
--- trunk/netsurf/atari/encoding.c (added)
+++ trunk/netsurf/atari/encoding.c Mon Nov 28 17:23:28 2011
@@ -1,0 +1,50 @@
+#include "atari/encoding.h"
+
+
+/* TODO: this need a rework..., encoding to atari st doesn|t always work.
+( gui_add_to_clipboard...) */
+utf8_convert_ret utf8_to_local_encoding(const char *string,
+ size_t len,
+ char **result)
+{
+ utf8_convert_ret r;
+ r = utf8_to_enc(string, "ATARIST", len, result);
+ if(r != UTF8_CONVERT_OK) {
+ r = utf8_to_enc(string, "UTF-8", len, result);
+ assert( r == UTF8_CONVERT_OK );
+ }
+ return r;
+}
+
+utf8_convert_ret local_encoding_to_utf8(const char *string,
+ size_t len,
+ char **result)
+{
+ return utf8_from_enc(string, "ATARIST", len, result);
+}
+
+
+/* borrowed from highwire project: */
+static const uint16_t Atari_to_Unicode[] = {
+ /* .0 .1 .2 .3 .4 .5 .6 .7 .8 .9 .A .B .C .D .E .F */
+ /* 7F */ 0x0394,
+ /* 8. */ 0x00C7,0x00FC,0x00E9,0x00E2,0x00E4,0x00E0,0x00E5,0x00E7,0x00EA,0x00EB,0x00E8,0x00EF,0x00EE,0x00EC,0x00C4,0x00C5,
+ /* 9. */ 0x00C9,0x00E6,0x00C6,0x00F4,0x00F6,0x00F2,0x00FB,0x00F9,0x00FF,0x00D6,0x00DC,0x00A2,0x00A3,0x00A5,0x00DF,0x0192,
+ /* A. */ 0x00E1,0x00ED,0x00F3,0x00FA,0x00F1,0x00D1,0x00AA,0x00BA,0x00BF,0x2310,0x00AC,0x00BD,0x00BC,0x00A1,0x00AB,0x00BB,
+ /* B. */ 0x00C3,0x00F5,0x00D8,0x00F8,0x0153,0x0152,0x00C0,0x00C3,0x00D5,0x00A8,0x00B4,0x2020,0x00B6,0x00A9,0x00AE,0x2122,
+ /* C. */ 0x0133,0x0132,0x05D0,0x05D1,0x05D2,0x05D3,0x05D4,0x05D5,0x05D6,0x05D7,0x05D8,0x05D9,0x05DB,0x05DC,0x05DE,0x05E0,
+ /* D. */ 0x05E1,0x05E2,0x05E4,0x05E6,0x05E7,0x05E8,0x05E9,0x05EA,0x05DF,0x05DA,0x05DD,0x05E3,0x05E5,0x00A7,0x2038,0x221E,
+ /* E. */ 0x03B1,0x03B2,0x0393,0x03C0,0x03A3,0x03C3,0x00B5,0x03C4,0x03A6,0x0398,0x03A9,0x03B4,0x222E,0x03C6,0x2208,0x2229,
+ /* F. */ 0x2261,0x00B1,0x2265,0x2264,0x2320,0x2321,0x00F7,0x2248,0x00B0,0x2022,0x00B7,0x221A,0x207F,0x00B2,0x00B3,0x00AF
+};
+#define BEG_Atari_to_Unicode 0x7F
+
+int atari_to_ucs4(unsigned char atari)
+{
+ uint32_t ucs4 = 0xfffd;
+ if ( atari >= BEG_Atari_to_Unicode && atari <= 0xFE )
+ ucs4 = (int)Atari_to_Unicode[(short)atari - BEG_Atari_to_Unicode];
+ else
+ ucs4 = (int)atari;
+ return( ucs4 );
+}
Added: trunk/netsurf/atari/encoding.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/encoding.h?rev=1319...
==============================================================================
--- trunk/netsurf/atari/encoding.h (added)
+++ trunk/netsurf/atari/encoding.h Mon Nov 28 17:23:28 2011
@@ -1,0 +1,19 @@
+#ifndef NS_ATARI_ENCODING_H
+#define NS_ATARI_ENCODING_H
+
+#include <inttypes.h>
+#include <assert.h>
+#include <stdbool.h>
+#include <windom.h>
+
+#include "css/css.h"
+#include "render/font.h"
+#include "utils/utf8.h"
+
+utf8_convert_ret local_encoding_to_utf8(const char *string,
+ size_t len,
+ char **result);
+
+int atari_to_ucs4( unsigned char atarichar);
+
+#endif
Modified: trunk/netsurf/atari/font.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/font.c?rev=13191&r1...
==============================================================================
--- trunk/netsurf/atari/font.c (original)
+++ trunk/netsurf/atari/font.c Mon Nov 28 17:23:28 2011
@@ -21,11 +21,6 @@
#include <stdbool.h>
#include <windom.h>
-/*
-#include <ft2build.h>
-#include FT_CACHE_H
-*/
-
#include "css/css.h"
#include "render/font.h"
#include "utils/utf8.h"
@@ -45,68 +40,21 @@
extern GEM_FONT_PLOTTER fplotter;
-/* TODO: this need a rework..., encoding to atari st doesn|t always work. ( gui_add_to_clipboard...) */
-utf8_convert_ret utf8_to_local_encoding(const char *string,
- size_t len,
- char **result)
-{
- utf8_convert_ret r;
- r = utf8_to_enc(string, "ATARIST", len, result);
- if(r != UTF8_CONVERT_OK) {
- r = utf8_to_enc(string, "UTF-8", len, result);
- assert( r == UTF8_CONVERT_OK );
- }
- return r;
-}
-
-utf8_convert_ret local_encoding_to_utf8(const char *string,
- size_t len,
- char **result)
-{
- return utf8_from_enc(string, "ATARIST", len, result);
-}
-
-
-/* borrowed from highwire project: */
-static const uint16_t Atari_to_Unicode[] = {
- /* .0 .1 .2 .3 .4 .5 .6 .7 .8 .9 .A .B .C .D .E .F */
- /* 7F */ 0x0394,
- /* 8. */ 0x00C7,0x00FC,0x00E9,0x00E2,0x00E4,0x00E0,0x00E5,0x00E7,0x00EA,0x00EB,0x00E8,0x00EF,0x00EE,0x00EC,0x00C4,0x00C5,
- /* 9. */ 0x00C9,0x00E6,0x00C6,0x00F4,0x00F6,0x00F2,0x00FB,0x00F9,0x00FF,0x00D6,0x00DC,0x00A2,0x00A3,0x00A5,0x00DF,0x0192,
- /* A. */ 0x00E1,0x00ED,0x00F3,0x00FA,0x00F1,0x00D1,0x00AA,0x00BA,0x00BF,0x2310,0x00AC,0x00BD,0x00BC,0x00A1,0x00AB,0x00BB,
- /* B. */ 0x00C3,0x00F5,0x00D8,0x00F8,0x0153,0x0152,0x00C0,0x00C3,0x00D5,0x00A8,0x00B4,0x2020,0x00B6,0x00A9,0x00AE,0x2122,
- /* C. */ 0x0133,0x0132,0x05D0,0x05D1,0x05D2,0x05D3,0x05D4,0x05D5,0x05D6,0x05D7,0x05D8,0x05D9,0x05DB,0x05DC,0x05DE,0x05E0,
- /* D. */ 0x05E1,0x05E2,0x05E4,0x05E6,0x05E7,0x05E8,0x05E9,0x05EA,0x05DF,0x05DA,0x05DD,0x05E3,0x05E5,0x00A7,0x2038,0x221E,
- /* E. */ 0x03B1,0x03B2,0x0393,0x03C0,0x03A3,0x03C3,0x00B5,0x03C4,0x03A6,0x0398,0x03A9,0x03B4,0x222E,0x03C6,0x2208,0x2229,
- /* F. */ 0x2261,0x00B1,0x2265,0x2264,0x2320,0x2321,0x00F7,0x2248,0x00B0,0x2022,0x00B7,0x221A,0x207F,0x00B2,0x00B3,0x00AF
-};
-#define BEG_Atari_to_Unicode 0x7F
-
-int atari_to_ucs4(unsigned char atari)
-{
- uint32_t ucs4 = 0xfffd;
- if ( atari >= BEG_Atari_to_Unicode && atari <= 0xFE )
- ucs4 = (int)Atari_to_Unicode[(short)atari - BEG_Atari_to_Unicode];
- else
- ucs4 = (int)atari;
- return( ucs4 );
-}
-
-static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const char *string,
+static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const char *string,
size_t length,int x, size_t *char_offset, int *actual_x )
{
fplotter->pixel_pos(fplotter, fstyle, string, length, x, char_offset, actual_x );
return( true );
}
-static bool atari_font_split( const plot_font_style_t * fstyle, const char *string,
+static bool atari_font_split( const plot_font_style_t * fstyle, const char *string,
size_t length,int x, size_t *char_offset, int *actual_x )
{
fplotter->str_split( fplotter, fstyle, string, length, x, char_offset, actual_x );
- return( true );
+ return( true );
}
-static bool atari_font_width( const plot_font_style_t *fstyle, const char * str,
+static bool atari_font_width( const plot_font_style_t *fstyle, const char * str,
size_t length, int * width )
{
fplotter->str_width( fplotter, fstyle, str, length, width );
Modified: trunk/netsurf/atari/font.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/font.h?rev=13191&r1...
==============================================================================
--- trunk/netsurf/atari/font.h (original)
+++ trunk/netsurf/atari/font.h Mon Nov 28 17:23:28 2011
@@ -16,16 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NS_ATARI_FT_FONT_H
-#define NS_ATARI_FT_FONT_H
+#ifndef NS_ATARI_FONT_H
+#define NS_ATARI_FONT_H
+
-#include "utils/utf8.h"
-
-utf8_convert_ret local_encoding_to_utf8(const char *string,
- size_t len,
- char **result);
-
-int atari_to_ucs4( unsigned char atarichar);
#endif /* NETSURF_FB_FONT_H */
Modified: trunk/netsurf/atari/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/gui.c?rev=13191&r1=...
==============================================================================
--- trunk/netsurf/atari/gui.c (original)
+++ trunk/netsurf/atari/gui.c Mon Nov 28 17:23:28 2011
@@ -68,7 +68,7 @@
#include "atari/hotlist.h"
#include "atari/login.h"
#include "atari/global_evnt.h"
-#include "atari/font.h"
+#include "atari/encoding.h"
#include "atari/res/netsurf.rsh"
#include "atari/plot.h"
#include "atari/clipboard.h"
@@ -171,11 +171,16 @@
for( g = window_list; g != NULL; g=g->next ) {
if( browser_redraw_required( g ) ){
browser_redraw( g );
+ }
+ if( g->root->toolbar ){
+ if(g->root->toolbar->url.redraw ){
+ tb_url_redraw( g );
+ }
}
}
if( evnt.timer != 0 && !active ){
- /* this suits for stuff with lower priority */
- //hotlist_redraw();
+ /* this suits for stuff with lower priority */
+ /* TBD: really be spare on redraws??? */
atari_treeview_redraw( hl.tv );
}
}
@@ -310,7 +315,7 @@
if (gw == NULL)
return;
b = gw->browser;
- browser_get_rect( gw, BR_CONTENT, &rect );
+ browser_get_rect( gw, BR_CONTENT, &rect );
browser_schedule_redraw( gw, 0, 0, rect.g_w, rect.g_h );
}
@@ -326,7 +331,7 @@
int y0 = rect->y0 - b->scroll.current.y;
int w,h;
w = rect->x1 - rect->x0;
- h = rect->y1 - rect->y0;
+ h = rect->y1 - rect->y0;
browser_schedule_redraw_rect( gw, x0, y0, w,h);
}
@@ -367,7 +372,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);
+ gui_window_set_scroll(w,x0,y0);
browser_schedule_redraw_rect( w, 0, 0, x1-x0,y1-y0);
}
@@ -530,7 +535,7 @@
work.g_x, work.g_y, work.g_w, work.g_h );
}
-/* Place caret in window */
+/* Place caret in window */
void gui_window_place_caret(struct gui_window *w, int x, int y, int height)
{
LGRECT work;
@@ -540,46 +545,37 @@
if( w->browser->caret.current.g_w > 0 )
gui_window_remove_caret( w );
w->browser->caret.requested.g_x = x;
- w->browser->caret.requested.g_y = y;
- w->browser->caret.requested.g_w = 2;
+ w->browser->caret.requested.g_y = y;
+ w->browser->caret.requested.g_w = 1;
w->browser->caret.requested.g_h = height;
w->browser->caret.redraw = true;
- browser_schedule_redraw_rect(
- w,
- x - b->scroll.current.x,
- y - b->scroll.current.y,
- w->browser->caret.requested.g_w,
- w->browser->caret.requested.g_h
- );
return;
}
/**
* clear window caret
- */
+ */
void
gui_window_remove_caret(struct gui_window *w)
-{
+{
+ LGRECT rect;
if (w == NULL)
return;
- CMP_BROWSER b = w->browser;
- w->browser->caret.requested.g_w = 0;
- w->browser->caret.redraw = true;
- browser_schedule_redraw_rect( w,
- w->browser->caret.current.g_x - b->scroll.current.x,
- w->browser->caret.current.g_y - b->scroll.current.y,
- w->browser->caret.current.g_w,
- w->browser->caret.current.g_h
- );
+ CMP_BROWSER b = w->browser;
+
+ if( w->browser->caret.background.fd_addr != NULL ){
+ browser_restore_caret_background( w, NULL );
+ w->browser->caret.requested.g_w = 0;
+ w->browser->caret.current.g_w = 0;
+ }
+ return;
}
void
gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
{
- /* Untestet, favicon support has been dropped, so this is dead code. */
g->icon = (icon != NULL) ? content_get_bitmap(icon) : NULL;
-
}
void
@@ -870,8 +866,6 @@
}
hotlist_destroy();
-
- /* send WM_DESTROY to windows purely managed by windom: */
urldb_save_cookies(option_cookie_file);
urldb_save(option_url_file);
@@ -1025,10 +1019,6 @@
atari_plotter_init( option_atari_screen_driver, option_atari_font_driver );
LOG(("Knockout rendering: %s\n", option_atari_knockout ? "yes" : "no"));
plot_set_knockout( option_atari_knockout );
- /* Interface colours */
- option_gui_colour_bg_1 = 0xFFFFFF; /** Background (bbggrr) */
- option_gui_colour_fg_1 = 0xFF0000; /** Foreground (bbggrr) */
- option_gui_colour_fg_2 = 0x000000; /** Foreground selected (bbggrr) */
}
static char *theapp = (char*)"NetSurf";
Modified: trunk/netsurf/atari/history.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/history.c?rev=13191...
==============================================================================
--- trunk/netsurf/atari/history.c (original)
+++ trunk/netsurf/atari/history.c Mon Nov 28 17:23:28 2011
@@ -21,6 +21,7 @@
void global_history_add_recent(const char *url)
{
+
}
char **global_history_get_recent(int *count)
Modified: trunk/netsurf/atari/plot.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot.h?rev=13191&r1...
==============================================================================
--- trunk/netsurf/atari/plot.h (original)
+++ trunk/netsurf/atari/plot.h Mon Nov 28 17:23:28 2011
@@ -31,6 +31,7 @@
void plot_set_knockout( int set );
bool plot_get_clip(struct rect * out);
bool plot_clip(const struct rect *clip);
-bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style );
+bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style );
+bool plot_line( int x0, int y0, int x1, int y1, const plot_style_t *style );
#endif
Added: trunk/netsurf/atari/redrawslots.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/redrawslots.c?rev=1...
==============================================================================
--- trunk/netsurf/atari/redrawslots.c (added)
+++ trunk/netsurf/atari/redrawslots.c Mon Nov 28 17:23:28 2011
@@ -1,0 +1,79 @@
+
+#include <stdbool.h>
+#include "windom.h"
+#include "utils/types.h"
+#include "atari/redrawslots.h"
+
+void redraw_slots_init(struct s_redrw_slots * slots, short size)
+{
+ slots->size = MIN( MAX_REDRW_SLOTS , size);
+ slots->areas_used = 0;
+}
+
+
+static inline bool rect_intersect( struct rect * box1, struct rect * box2 )
+{
+ if (box2->x1 < box1->x0)
+ return false;
+
+ if (box2->y1 < box1->y0)
+ return false;
+
+ if (box2->x0 > box1->x1)
+ return false;
+
+ if (box2->y0 > box1->y1)
+ return false;
+
+ return true;
+}
+/*
+ schedule a slots, coords are relative.
+*/
+void redraw_slot_schedule(struct s_redrw_slots * slots, short x0, short y0, short x1, short y1)
+{
+ int i;
+ struct rect area;
+
+ area.x0 = x0;
+ area.y0 = y0;
+ area.x1 = x1;
+ area.y1 = y1;
+
+ for( i=0; i<slots->areas_used; i++) {
+ if( slots->areas[i].x0 <= x0
+ && slots->areas[i].x1 >= x1
+ && slots->areas[i].y0 <= y0
+ && slots->areas[i].y1 >= y1 ){
+ /* the area is already queued for redraw */
+ return;
+ } else {
+ if( rect_intersect(&slots->areas[i], &area ) ){
+ slots->areas[i].x0 = MIN(slots->areas[i].x0, x0);
+ slots->areas[i].y0 = MIN(slots->areas[i].y0, y0);
+ slots->areas[i].x1 = MAX(slots->areas[i].x1, x1);
+ slots->areas[i].y1 = MAX(slots->areas[i].y1, y1);
+ return;
+ }
+ }
+ }
+
+ if( slots->areas_used < slots->size ) {
+ slots->areas[slots->areas_used].x0 = x0;
+ slots->areas[slots->areas_used].x1 = x1;
+ slots->areas[slots->areas_used].y0 = y0;
+ slots->areas[slots->areas_used].y1 = y1;
+ slots->areas_used++;
+ } else {
+ /*
+ we are out of available slots, merge box with last slot
+ this is dumb... but also a very rare case.
+ */
+ slots->areas[slots->size-1].x0 = MIN(slots->areas[i].x0, x0);
+ slots->areas[slots->size-1].y0 = MIN(slots->areas[i].y0, y0);
+ slots->areas[slots->size-1].x1 = MAX(slots->areas[i].x1, x1);
+ slots->areas[slots->size-1].y1 = MAX(slots->areas[i].y1, y1);
+ }
+done:
+ return;
+}
Added: trunk/netsurf/atari/redrawslots.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/redrawslots.h?rev=1...
==============================================================================
--- trunk/netsurf/atari/redrawslots.h (added)
+++ trunk/netsurf/atari/redrawslots.h Mon Nov 28 17:23:28 2011
@@ -1,0 +1,27 @@
+#ifndef ATARI_REDRAW_SLOTS_H
+#define ATARI_REDRAW_SLOTS_H
+
+/*
+ MAX_REDRW_SLOTS
+ This is the number of redraw requests that the slotlist can store.
+ If a redraw is scheduled and all slots are used, the rectangle will
+ be merged to one of the existing slots.
+ */
+#define MAX_REDRW_SLOTS 32
+
+/*
+ This struct holds scheduled redraw requests.
+*/
+struct rect;
+struct s_redrw_slots
+{
+ struct rect areas[MAX_REDRW_SLOTS];
+ short size;
+ short areas_used;
+};
+
+void redraw_slots_init(struct s_redrw_slots * slots, short size);
+void redraw_slot_schedule(struct s_redrw_slots * slots, short x0, short y0, short x1, short y1);
+
+
+#endif
Modified: trunk/netsurf/atari/toolbar.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/toolbar.c?rev=13191...
==============================================================================
--- trunk/netsurf/atari/toolbar.c (original)
+++ trunk/netsurf/atari/toolbar.c Mon Nov 28 17:23:28 2011
@@ -33,7 +33,8 @@
#include "desktop/history_core.h"
#include "desktop/netsurf.h"
#include "desktop/browser.h"
-#include "desktop/mouse.h"
+#include "desktop/mouse.h"
+#include "desktop/plot_style.h"
#include "desktop/plotters.h"
#include "atari/clipboard.h"
#include "atari/gui.h"
@@ -43,13 +44,26 @@
#include "atari/clipboard.h"
#include "atari/misc.h"
#include "atari/global_evnt.h"
+#include "atari/plot.h"
#include "cflib.h"
#include "atari/res/netsurf.rsh"
-#include "atari/plot/plotter.h"
-
+#include "atari/plot/plotter.h"
+
+
extern char * cfg_homepage_url;
extern short vdih;
-extern void * h_gem_rsrc;
+extern void * h_gem_rsrc;
+extern GEM_PLOTTER plotter;
+static OBJECT * throbber_form = NULL;
+
+static const plot_font_style_t font_style_url = {
+ .family = PLOT_FONT_FAMILY_SANS_SERIF,
+ .size = TOOLBAR_URL_TEXT_SIZE_PT*FONT_SIZE_SCALE,
+ .weight = 400,
+ .flags = FONTF_NONE,
+ .background = 0xffffff,
+ .foreground = 0x0
+ };
/* prototypes & order for button widgets: */
static struct s_tb_button tb_buttons[] =
@@ -60,10 +74,9 @@
{ TOOLBAR_BT_RELOAD, tb_reload_click, NULL },
{ TOOLBAR_BT_STOP, tb_stop_click, NULL },
{ 0, NULL, NULL }
-};
-
-static OBJECT * throbber_form = NULL;
-
+};
+
+static void tb_txt_request_redraw(void *data, int x, int y, int w, int h);
static void __CDECL button_redraw( COMPONENT *c, long buff[8])
{
@@ -218,116 +231,67 @@
static
void __CDECL evnt_url_redraw( COMPONENT *c, long buff[8] )
-{
+{
LGRECT work, clip;
+ struct gui_window * gw;
short pxy[10];
- short i;
- short d;
- short mchars;
- struct gui_window * gw = (struct gui_window *)mt_CompDataSearch(&app, c, CDT_OWNER);
- assert( gw != NULL );
- assert( gw->browser != NULL );
- assert( gw->root != NULL );
- assert( gw->browser->bw != NULL );
- CMP_TOOLBAR tb = gw->root->toolbar;
-
- mt_CompGetLGrect(&app, c, WF_WORKXYWH, &work);
+ gw = (struct gui_window *)mt_CompDataSearch(&app, c, CDT_OWNER);
+ if( gw == NULL )
+ return;
+
+ CMP_TOOLBAR tb = gw->root->toolbar;
+ mt_CompGetLGrect(&app, tb->url.comp, WF_WORKXYWH, &work);
+
+ // this last pixel is drawn by the root component of the toolbar:
+ // it's the black border, so we leave it out:
+ work.g_h--;
clip = work;
- if ( !rc_lintersect( (LGRECT*)&buff[4], &clip ) ) return;
-
+ if ( !rc_lintersect( (LGRECT*)&buff[4], &clip ) ) return;
+
pxy[0] = clip.g_x;
pxy[1] = clip.g_y;
- pxy[2] = clip.g_w + clip.g_x;
- pxy[3] = clip.g_h + clip.g_y;
- vs_clip( vdih, 1, (short*)&pxy );
-
- mchars = (work.g_w-6 / tb->url.char_size); /* subtract 6px -> 3px padding around text on each side */
-
- vswr_mode( vdih, MD_REPLACE);
+ pxy[2] = clip.g_w + clip.g_x-1;
+ pxy[3] = clip.g_h + clip.g_y-1;
+ vs_clip( vdih, 1, (short*)&pxy );
+
vsf_perimeter( vdih, 0 );
vsf_interior( vdih , 1 );
- vsf_color( vdih, LWHITE );
- 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: */
-
+ vsf_color( vdih, LWHITE );
+
+ //left margin:
pxy[0] = work.g_x;
pxy[1] = work.g_y;
- pxy[2] = work.g_x + work.g_w;
- pxy[3] = work.g_y + work.g_h-2;
- v_bar( vdih, (short*)&pxy );
-
- /* draw outer line, left top: */
- pxy[0] = work.g_x + 2;
- pxy[1] = work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2);
- /* right, top: */
- pxy[2] = work.g_x + work.g_w - 4;
- pxy[3] = work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2);
- /* right, bottom: */
- pxy[4] = work.g_x + work.g_w - 4;
- pxy[5] = work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) + URLBOX_HEIGHT;
- /* left, bottom: */
- pxy[6] = work.g_x + 2;
- pxy[7] = work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) + URLBOX_HEIGHT;
- /* left, top again: */
- pxy[8] = work.g_x + 2;
- pxy[9] = work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2);
- vsf_interior( vdih, FIS_SOLID );
- vsf_style( vdih, 1);
- vsl_color( vdih, BLACK);
- v_pline( vdih, 5, pxy );
-
- /* draw white txt box: */
- pxy[0] = pxy[0] + 1;
- pxy[1] = pxy[1] + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) - 1;
- pxy[2] = pxy[2] - 1;
- pxy[3] = work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) + URLBOX_HEIGHT ;
- vsf_color( vdih, WHITE);
- v_bar( vdih, pxy );
- if( gw->root->toolbar->url.used > 1 ) {
- short curx;
- short vqw[4];
- char t[2];
- short cw = 0;
- t[0]=tb->url.text[0];
- t[1]=0;
- if( atari_sysinfo.sfont_monospaced ) {
- vqt_width( vdih, t[0], &vqw[0], &vqw[1], &vqw[2] );
- cw = vqw[0];
- }
- int maxx = (clip.g_x + clip.g_w) - cw;
- for( curx = work.g_x + 3, i=tb->url.scrollx ; curx < maxx && i < tb->url.used-1; i++ ){
- t[0] = tb->url.text[i];
- v_gtext( vdih, curx, work.g_y + ((TOOLBAR_HEIGHT - URLBOX_HEIGHT)/2) + 2, (char*)&t );
- if( !atari_sysinfo.sfont_monospaced ) {
- vqt_width( vdih, t[0], &vqw[0], &vqw[1], &vqw[2] );
- curx += vqw[0];
- } else {
- curx += cw;
- }
- }
- }
-
- if( window_url_widget_has_focus( gw ) ) {
- /* draw caret: */
- pxy[0] = 3 + work.g_x + ((tb->url.caret_pos - tb->url.scrollx) * tb->url.char_size);
- pxy[1] = pxy[1] + 1;
- pxy[2] = 3 + work.g_x + ((tb->url.caret_pos - tb->url.scrollx) * tb->url.char_size);
- pxy[3] = pxy[3] - 1 ;
- v_pline( vdih, 2, pxy );
- /* draw selection: */
- if( tb->url.selection_len != 0 ) {
- vswr_mode( vdih, MD_XOR);
- vsl_color( vdih, BLACK);
- pxy[0] = 3 + work.g_x + ((tb->url.caret_pos - tb->url.scrollx) * tb->url.char_size);
- pxy[2] = pxy[0] + ( gw->root->toolbar->url.selection_len * tb->url.char_size);
- v_bar( vdih, pxy );
- vswr_mode( vdih, MD_REPLACE );
- }
- }
- vs_clip( vdih, 0, (short*)&pxy );
+ pxy[2] = work.g_x + TOOLBAR_URL_MARGIN_LEFT-1;
+ pxy[3] = work.g_y + work.g_h-1;
+ v_bar( vdih, pxy );
+
+ // right margin:
+ pxy[0] = work.g_x+work.g_w-TOOLBAR_URL_MARGIN_RIGHT;
+ pxy[1] = work.g_y;
+ pxy[2] = work.g_x+work.g_w-1;
+ pxy[3] = work.g_y+work.g_h-1;
+ v_bar( vdih, pxy );
+
+ // top margin:
+ pxy[0] = work.g_x;
+ pxy[1] = work.g_y;
+ pxy[2] = work.g_x+work.g_w-1;
+ pxy[3] = work.g_y+TOOLBAR_URL_MARGIN_TOP-1;
+ v_bar( vdih, pxy );
+
+ // bottom margin:
+ pxy[0] = work.g_x;
+ pxy[1] = work.g_y+work.g_h-TOOLBAR_URL_MARGIN_BOTTOM;
+ pxy[2] = work.g_x+work.g_w-1;
+ pxy[3] = work.g_y+work.g_h-1;
+ v_bar( vdih, pxy );
+
+ vs_clip( vdih, 0, (short*)&pxy );
+
+ // TBD: request redraw of textarea for specific region.
+ clip.g_x -= work.g_x+TOOLBAR_URL_MARGIN_LEFT;
+ clip.g_y -= work.g_y+TOOLBAR_URL_MARGIN_TOP;
+ tb_txt_request_redraw( tb, clip.g_x, clip.g_y, clip.g_w, clip.g_h );
}
static
@@ -342,37 +306,45 @@
assert( gw != NULL );
CMP_TOOLBAR tb = gw->root->toolbar;
mt_CompGetLGrect(&app, c, WF_WORKXYWH, &work);
- mx = evnt.mx - work.g_x;
- my = evnt.my - work.g_y;
+ mx = evnt.mx - (work.g_x + TOOLBAR_URL_MARGIN_LEFT);
+ my = evnt.my - (work.g_y + TOOLBAR_URL_MARGIN_TOP);
/* TODO: reset mouse state of browser window? */
/* select whole text when newly focused, otherwise set caret to end of text */
if( !window_url_widget_has_focus(gw) ) {
- tb_url_place_caret( gw, strlen(tb->url.text), true);
- tb->url.selection_len = -tb->url.caret_pos;
- window_set_focus( gw, URL_WIDGET, (void*)&tb->url );
+ // TODO select all ( needs textarea change )
+ window_set_focus( gw, URL_WIDGET, (void*)&tb->url );
+ textarea_mouse_action( tb->url.textarea, BROWSER_MOUSE_PRESS_1, mx, my );
} else {
if( mb & 1 ) {
- /* if the button is dragging, place selection: */
- old = tb->url.selection_len;
- tb->url.selection_len = (tb->url.scrollx + (mx / tb->url.char_size)) - tb->url.caret_pos;
- if(tb->url.caret_pos + tb->url.selection_len > (int)strlen(tb->url.text) )
- tb->url.selection_len = strlen(tb->url.text) - tb->url.caret_pos;
- if( old == tb->url.selection_len )
- /* avoid redraw when nothing changed */
- return;
+ /* TODO: if the button is dragging, report draw event */
} else {
- /* TODO: recognize click + shift key */
- tb->url.selection_len = 0;
- tb_url_place_caret( gw, tb->url.scrollx + (mx / tb->url.char_size), true);
+ /* TODO: recognize click + shift key */
+ int mstate = BROWSER_MOUSE_PRESS_1;
+ if( (kstat & (K_LSHIFT|K_RSHIFT)) != 0 )
+ mstate = BROWSER_MOUSE_MOD_1;
+ textarea_mouse_action( tb->url.textarea, BROWSER_MOUSE_PRESS_1, mx, my );
}
}
-
+ // TODO: do not send an complete redraw!
ApplWrite( _AESapid, WM_REDRAW, gw->root->handle->handle,
work.g_x, work.g_y, work.g_w, work.g_h );
-}
-
+}
+
+void tb_adjust_size( struct gui_window * gw )
+{
+ LGRECT work;
+ CMP_TOOLBAR t = gw->root->toolbar;
+
+ mt_CompGetLGrect( &app, t->url.comp, WF_WORKXYWH, &work);
+ work.g_w -= (TOOLBAR_URL_MARGIN_LEFT + TOOLBAR_URL_MARGIN_RIGHT);
+ /* do not overwrite the black border, because of that, add 1 */
+ work.g_h -= (TOOLBAR_URL_MARGIN_TOP + TOOLBAR_URL_MARGIN_BOTTOM+1);
+ textarea_set_dimensions( t->url.textarea, work.g_w, work.g_h );
+ tb_txt_request_redraw( t, 0,0, work.g_w-1, work.g_h-1);
+}
+
static void __CDECL evnt_toolbar_redraw( COMPONENT *c, long buff[8], void *data )
{
LGRECT work, clip;
@@ -392,9 +364,112 @@
pxy[1] = pxy[3] = work.g_y + work.g_h-1 ;
pxy[2] = clip.g_x + clip.g_w;
v_pline( vdih, 2, (short*)&pxy );
-}
-
-
+}
+
+
+static void tb_txt_request_redraw(void *data, int x, int y, int w, int h)
+{
+ LGRECT work;
+ if( data == NULL )
+ return;
+ CMP_TOOLBAR t = data;
+ if( t->url.redraw == false ){
+ t->url.redraw = true;
+ t->url.rdw_area.g_x = x;
+ t->url.rdw_area.g_y = y;
+ t->url.rdw_area.g_w = w;
+ t->url.rdw_area.g_h = h;
+ } else {
+ /* merge the redraw area to the new area.: */
+ int newx1 = x+w;
+ int newy1 = y+h;
+ int oldx1 = t->url.rdw_area.g_x + t->url.rdw_area.g_w;
+ int oldy1 = t->url.rdw_area.g_y + t->url.rdw_area.g_h;
+ t->url.rdw_area.g_x = MIN(t->url.rdw_area.g_x, x);
+ t->url.rdw_area.g_y = MIN(t->url.rdw_area.g_y, y);
+ t->url.rdw_area.g_w = ( oldx1 > newx1 ) ?
+ oldx1 - t->url.rdw_area.g_x : newx1 - t->url.rdw_area.g_x;
+ t->url.rdw_area.g_h = ( oldy1 > newy1 ) ?
+ oldy1 - t->url.rdw_area.g_y : newy1 - t->url.rdw_area.g_y;
+ }
+}
+
+void tb_url_redraw( struct gui_window * gw )
+{
+ CMP_TOOLBAR t = gw->root->toolbar;
+ if (t != NULL) {
+ if( t->url.redraw && ((plotter->flags & PLOT_FLAG_OFFSCREEN) == 0) ) {
+
+ const struct redraw_context ctx = {
+ .interactive = true,
+ .plot = &atari_plotters
+ };
+ short todo[4];
+ LGRECT work;
+
+ mt_CompGetLGrect(&app, gw->root->toolbar->url.comp, WF_WORKXYWH, &work);
+ work.g_x += TOOLBAR_URL_MARGIN_RIGHT;
+ work.g_y += TOOLBAR_URL_MARGIN_LEFT;
+ work.g_w -= TOOLBAR_URL_MARGIN_RIGHT;
+ work.g_h -= TOOLBAR_URL_MARGIN_BOTTOM;
+
+ plotter->resize(plotter, work.g_w, work.g_h );
+ plotter->move(plotter, work.g_x, work.g_y );
+ plotter->lock( plotter );
+
+ todo[0] = work.g_x;
+ todo[1] = work.g_y;
+ todo[2] = todo[0] + work.g_w-1;
+ todo[3] = todo[1] + work.g_h-1;
+ vs_clip(plotter->vdi_handle, 1, (short*)&todo );
+
+ if( wind_get(gw->root->handle->handle, WF_FIRSTXYWH,
+ &todo[0], &todo[1], &todo[2], &todo[3] )!=0 ) {
+ while (todo[2] && todo[3]) {
+
+ /* convert screen to relative coords: */
+ todo[0] = todo[0] - work.g_x;
+ todo[1] = todo[1] - work.g_y;
+ if( todo[0] < 0 ){
+ todo[2] = todo[2] + todo[0];
+ todo[0] = 0;
+ }
+ if( todo[1] < 0 ){
+ todo[3] = todo[3] + todo[1];
+ todo[1] = 0;
+ }
+
+ if (rc_intersect(&t->url.rdw_area,(GRECT *)&todo)) {
+ struct rect clip = {
+ .x0 = todo[0],
+ .y0 = todo[1],
+ .x1 = todo[0]+todo[2],
+ .y1 = todo[1]+todo[3]
+ };
+ textarea_redraw( t->url.textarea, 0, 0, &clip, &ctx );
+ }
+ if (wind_get(gw->root->handle->handle, WF_NEXTXYWH,
+ &todo[0], &todo[1], &todo[2], &todo[3])==0) {
+ break;
+ }
+ }
+ } else {
+ plotter->unlock( plotter );
+ return;
+ }
+ plotter->unlock( plotter );
+ vs_clip(plotter->vdi_handle, 0, (short*)&todo);
+ t->url.redraw = false;
+ t->url.rdw_area.g_x = 65000;
+ t->url.rdw_area.g_y = 65000;
+ t->url.rdw_area.g_w = -1;
+ t->url.rdw_area.g_h = -1;
+ } else {
+ /* just copy stuff from the offscreen buffer */
+ }
+ }
+}
+
CMP_TOOLBAR tb_create( struct gui_window * gw )
{
int i;
@@ -404,7 +479,7 @@
if( t == NULL )
return( NULL );
- t->owner = gw;
+ t->owner = gw;
/* create the root component: */
t->comp = (COMPONENT*)mt_CompCreate(&app, CLT_HORIZONTAL, TOOLBAR_HEIGHT, 0);
@@ -435,11 +510,13 @@
}
/* create the url widget: */
- t->url.char_size = 8;
- t->url.text = malloc( 2*URL_WIDGET_BSIZE );
- strcpy( t->url.text, "http://" );
- t->url.allocated = 2*URL_WIDGET_BSIZE;
- t->url.scrollx = 0;
+ t->url.textarea = textarea_create( 300, TOOLBAR_TEXTAREA_HEIGHT, 0,
+ &font_style_url, tb_txt_request_redraw,
+ t );
+ if( t->url.textarea != NULL ){
+ textarea_set_text(t->url.textarea, "http://");
+ }
+
t->url.comp = (COMPONENT*)mt_CompCreate(&app, CLT_HORIZONTAL, TOOLBAR_HEIGHT, 1);
mt_CompEvntAttach( &app, t->url.comp, WM_REDRAW, evnt_url_redraw );
mt_CompEvntAttach( &app, t->url.comp, WM_XBUTTON, evnt_url_click );
@@ -475,9 +552,8 @@
mt_ObjcFree( &app, (OBJECT*)mt_CompDataSearch(&app, tb->buttons[i].comp, CDT_OBJECT) );
i++;
}
- free( tb->buttons );
- if( tb->url.text != NULL )
- free( tb->url.text );
+ free( tb->buttons );
+ textarea_destroy( tb->url.textarea );
mt_CompDelete( &app, tb->comp);
free( tb );
}
@@ -535,7 +611,6 @@
((OBJECT*)mt_CompDataSearch(&app, bt->comp, CDT_OBJECT))->ob_state &= ~OS_DISABLED;
}
mt_CompEvntRedraw( &app, bt->comp );
-
}
@@ -553,69 +628,21 @@
if( gw->browser->attached == false )
return;
- struct s_url_widget * url = &gw->root->toolbar->url;
-
- if( len+1 > url->allocated ) {
- newsize = (len / (URL_WIDGET_BSIZE-1))+1;
- newtext = realloc( url->text, newsize*URL_WIDGET_BSIZE );
- if(newtext != NULL) {
- url->text = newtext;
- url->allocated = newsize * URL_WIDGET_BSIZE;
- }
- }
- if( len+1 < url->allocated - URL_WIDGET_BSIZE
- && url->allocated - URL_WIDGET_BSIZE > URL_WIDGET_BSIZE*2 ) {
- newsize = (len / (URL_WIDGET_BSIZE-1) )+1;
- newtext = realloc( url->text, newsize*URL_WIDGET_BSIZE );
- if(newtext != NULL) {
- url->text = newtext;
- url->allocated = newsize * URL_WIDGET_BSIZE;
- }
- }
-
- strncpy((char*)url->text, text, url->allocated-1 );
- url->used = MIN(len+1,url->allocated );
- tb_url_place_caret( gw, 0, true);
- url->scrollx = 0;
- mt_CompGetLGrect(&app, url->comp, WF_WORKXYWH, &work);
- ApplWrite( _AESapid, WM_REDRAW, gw->root->handle->handle,
- (short)work.g_x, (short)work.g_y, (short)work.g_w, (short)work.g_h );
-}
-
-
-/* place the caret and adjust scrolling position */
-void tb_url_place_caret( struct gui_window * gw, int steps, bool abs)
-{
- LGRECT work;
- CMP_TOOLBAR tb = gw->root->toolbar;
- assert(tb!=NULL);
- mt_CompGetLGrect(&app, tb->url.comp, WF_WORKXYWH, &work);
- int ws = (work.g_w / tb->url.char_size)-1; /* widget size in chars */
- if(abs) {
- tb->url.caret_pos = steps;
- } else {
- tb->url.caret_pos = tb->url.caret_pos + steps;
- }
- if( (int)tb->url.caret_pos > (int)strlen(tb->url.text) )
- tb->url.caret_pos = strlen(tb->url.text);
- if( tb->url.caret_pos > tb->url.allocated-2 )
- tb->url.caret_pos = tb->url.allocated-2;
- if( tb->url.caret_pos < 0)
- tb->url.caret_pos = 0;
-
- if( tb->url.caret_pos < tb->url.scrollx ) {
- /* the caret has moved out of the widget to the left */
- tb->url.scrollx -= ws;
- }
- if( tb->url.caret_pos > tb->url.scrollx + ws ) {
- /* the caret has moved out of the widget to the right */
- if(!abs)
- tb->url.scrollx += steps;
- else
- tb->url.scrollx = tb->url.caret_pos - ws;
- }
- if(tb->url.scrollx < 0)
- tb->url.scrollx = 0;
+ struct s_url_widget * url = &gw->root->toolbar->url;
+
+ assert( gw != NULL );
+ assert( gw->browser != NULL );
+ assert( gw->root != NULL );
+ assert( gw->browser->bw != NULL );
+
+ textarea_set_text(url->textarea, text);
+
+ mt_CompGetLGrect( &app, gw->root->toolbar->url.comp, WF_WORKXYWH, &work);
+ work.g_w -= (TOOLBAR_URL_MARGIN_LEFT + TOOLBAR_URL_MARGIN_RIGHT);
+ /* do not overwrite the black border, because of that, add 1 */
+ work.g_h -= (TOOLBAR_URL_MARGIN_TOP + TOOLBAR_URL_MARGIN_BOTTOM+1);
+ tb_txt_request_redraw( gw->root->toolbar, 0,0,work.g_w,work.g_h );
+ return;
}
@@ -628,153 +655,30 @@
CMP_TOOLBAR tb = gw->root->toolbar;
assert(tb!=NULL);
LGRECT work;
- int start = 0;
- int i;
- char * newtext;
- short newsize;
- char backup;
- bool ctrl = (nkc & NKF_CTRL);
- bool shift = (nkc & NKF_SHIFT);
- bool alt = (nkc & NKF_ALT);
- bool ret = (ctrl) ? false : true;
- char code = (nkc & 0xFF);
-
- assert( gw != NULL );
-
- if( (code == NK_LEFT) && !shift ){
- /* TODO: recognize shift + click */
- tb->url.selection_len = 0;
- tb_url_place_caret( gw, -1, false );
- }
- else if( (code == NK_RIGHT) && !shift ) {
- /* TODO: recognize shift + click */
- tb->url.selection_len = 0;
- tb_url_place_caret( gw, +1, false );
- }
- else if( (ctrl && code == 'C') ) {
- if( tb->url.selection_len != 0 ) {
- char * from;
- char tmp[abs(tb->url.selection_len)+1];
- int len;
- if( tb->url.selection_len < 0 ) {
- from = &tb->url.text[tb->url.caret_pos+tb->url.selection_len];
- } else {
- from = &tb->url.text[tb->url.caret_pos];
- }
- len = MIN( abs(tb->url.selection_len), (int)strlen(from) ) ;
- memcpy(&tmp, from, len);
- tmp[len] = 0;
- int r = scrap_txt_write(&app, (char*)&tmp);
- ret = true;
- }
- }
- else if( (ctrl && code == 'V') || code == NK_INS ) {
- char * clip = scrap_txt_read( &app );
- if( clip != NULL ) {
- size_t l = strlen( clip );
- unsigned int i = 0;
- for( i = 0; i<l; i++) {
- tb_url_input( gw, clip[i] );
- }
- free( clip );
- ret = true;
- }
- }
- else if( (code == NK_DEL) ) {
- if( tb->url.selection_len != 0 ) {
- if( tb->url.selection_len < 0 ) {
- strcpy(
- &tb->url.text[tb->url.caret_pos+tb->url.selection_len],
- &tb->url.text[tb->url.caret_pos]
- );
- tb_url_place_caret( gw, tb->url.selection_len, false );
- } else {
- strcpy(
- &tb->url.text[tb->url.caret_pos],
- &tb->url.text[tb->url.caret_pos+tb->url.selection_len]
- );
- }
- tb->url.used = strlen( tb->url.text ) + 1;
- } else {
- if( tb->url.caret_pos < tb->url.used -1) {
- strcpy(
- &tb->url.text[tb->url.caret_pos+tb->url.selection_len],
- &tb->url.text[tb->url.caret_pos+1]
- );
- tb->url.used--;
- }
- }
- tb->url.selection_len = 0;
- }
- else if( code == NK_BS ) {
- if( tb->url.caret_pos > 0 &&
- tb->url.selection_len != 0 ) {
- if( tb->url.selection_len < 0 ) {
- strcpy(&tb->url.text[tb->url.caret_pos+tb->url.selection_len], &tb->url.text[tb->url.caret_pos]);
- tb_url_place_caret( gw, tb->url.selection_len, false );
- } else {
- strcpy(&tb->url.text[tb->url.caret_pos], &tb->url.text[tb->url.caret_pos+tb->url.selection_len]);
- }
- tb->url.used = strlen( tb->url.text ) + 1;
- } else {
- tb->url.text[tb->url.caret_pos-1] = 0;
- tb->url.used--;
- strcat(tb->url.text, &tb->url.text[tb->url.caret_pos]);
- tb_url_place_caret( gw , -1, false );
- }
- tb->url.selection_len = 0;
- }
- else if( code == NK_ESC ) {
- tb->url.text[0] = 0;
- tb->url.scrollx = 0;
- tb->url.used = 1;
- tb_url_place_caret( gw, 0, true );
- }
- else if( code == NK_CLRHOME ) {
- tb_url_place_caret( gw, 0, true );
- }
- else if( code == NK_M_END ) {
- tb_url_place_caret( gw,
- strlen((char*)&tb->url.text)-1,
- true
- );
- }
- else if( code == NK_ENTER || code == NK_RET ) {
- tb_url_place_caret( gw, 0, true );
- window_set_focus( gw, BROWSER, gw->browser->bw);
- browser_window_go(gw->browser->bw, (const char*)tb->url.text, 0, true);
- }
- else if( code > 30 ) {
- if( tb->url.used+1 > tb->url.allocated ){
- newsize = ( (tb->url.used+1) / (URL_WIDGET_BSIZE-1))+1;
- newtext = realloc(tb->url.text, newsize*URL_WIDGET_BSIZE );
- if(newtext) {
- tb->url.text = newtext;
- tb->url.allocated = newsize * URL_WIDGET_BSIZE;
- }
- }
- i = tb->url.caret_pos;
- backup = tb->url.text[tb->url.caret_pos];
- while( i < tb->url.allocated - 1) {
- tb->url.text[i] = code;
- if( tb->url.text[i] == (char)0 )
- break;
- code = backup;
- i++;
- backup = tb->url.text[i];
- }
- tb->url.used++;
- tb->url.text[tb->url.allocated-1] = 0;
- tb_url_place_caret( gw, +1, false );
- tb->url.selection_len = 0;
- } else {
- ret = false;
- }
- if(tb->url.used < 1)
- tb->url.used = 1; /* at least one byte (0) is used */
- mt_CompGetLGrect(&app, tb->url.comp, WF_WORKXYWH, &work);
- ApplWrite( _AESapid, WM_REDRAW, gw->root->handle->handle,
- work.g_x, work.g_y, work.g_w, work.g_h );
+ bool ret = false;
+
+ assert( gw != NULL );
+
+ long ucs4;
+ long ik = nkc_to_input_key( nkc, &ucs4 );
+
+ if( ik == 0 ){
+ if ( (nkc&0xFF) >= 9 ) {
+ ret = textarea_keypress( tb->url.textarea, ucs4 );
+ }
+ }
+ else if( ik == KEY_CR || ik == KEY_NL ){
+ char tmp_url[PATH_MAX];
+ if( textarea_get_text( tb->url.textarea, tmp_url, PATH_MAX) > 0 ) {
+ window_set_focus( gw, BROWSER, gw->browser->bw);
+ browser_window_go(gw->browser->bw, (const char*)&tmp_url, 0, true);
+ ret = true;
+ }
+ }
+ else {
+ ret = textarea_keypress( tb->url.textarea, ik );
+ }
+
return( ret );
}
Modified: trunk/netsurf/atari/toolbar.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/toolbar.h?rev=13191...
==============================================================================
--- trunk/netsurf/atari/toolbar.h (original)
+++ trunk/netsurf/atari/toolbar.h Mon Nov 28 17:23:28 2011
@@ -17,7 +17,11 @@
*/
#ifndef NS_ATARI_TOOLBAR_H
-#define NS_ATARI_TOOLBAR_H
+#define NS_ATARI_TOOLBAR_H
+
+#include "desktop/textarea.h"
+#include "desktop/textinput.h"
+#include "atari/browser.h"
#define TB_BUTTON_WIDTH 32
#define TB_BUTTON_HEIGHT 21 /* includes 1px 3d effect */
@@ -27,13 +31,13 @@
#define THROBBER_MAX_INDEX 12
#define THROBBER_INACTIVE_INDEX 13
#define URLBOX_HEIGHT 21
-/*
- URL Widget Block size: size of memory block to allocated
- when input takes more memory than currently allocated:
-*/
-#define URL_WIDGET_BSIZE 64
-#define URL_WIDGET_MAX_MEM 60000
-
+
+#define TOOLBAR_URL_TEXT_SIZE_PT 14
+#define TOOLBAR_TEXTAREA_HEIGHT 19
+#define TOOLBAR_URL_MARGIN_LEFT 2
+#define TOOLBAR_URL_MARGIN_RIGHT 2
+#define TOOLBAR_URL_MARGIN_TOP 2
+#define TOOLBAR_URL_MARGIN_BOTTOM 2
struct s_tb_button
{
short rsc_id;
@@ -44,15 +48,10 @@
struct s_url_widget
{
- short selection_len; /* len & direction of selection */
- short caret_pos; /* cursor pos */
- short char_size; /* size of one character (width & hight) */
- short scrollx; /* current scroll position */
bool redraw; /* widget is only redrawn when this flag is set */
- char * text; /* dynamicall allocated URL string */
- unsigned short allocated;
- unsigned short used; /* memory used by URL (strlen + 1) */
- COMPONENT * comp;
+ struct text_area *textarea;
+ COMPONENT * comp;
+ GRECT rdw_area;
};
struct s_throbber_widget
@@ -62,14 +61,15 @@
short max_index;
bool running;
};
-
+
struct s_toolbar
{
COMPONENT * comp;
- struct gui_window * owner;
+ struct gui_window * owner;
struct s_url_widget url;
- struct s_throbber_widget throbber;
- GRECT btdim; /* size & location of buttons */
+ struct s_throbber_widget throbber;
+ GRECT btdim;
+ /* size & location of buttons: */
struct s_tb_button * buttons;
int btcnt;
};
@@ -81,7 +81,9 @@
static void __CDECL evnt_toolbar_redraw( COMPONENT *c, long buff[8], void *data );
//static void __CDECL evnt_toolbar_mbutton( COMPONENT *c, long buff[8], void *data );
static void __CDECL evnt_toolbar_resize( COMPONENT *c, long buff[8], void *data );
-
+
+/* recalculate size/position of nested controls within the toolbar: */
+void tb_adjust_size( struct gui_window * gw );
/* report click to toolbar, relative coords : */
void tb_click( struct gui_window * gw, short mx, short my, short mb, short kstat );
void tb_back_click( struct gui_window * gw );
@@ -96,10 +98,10 @@
void tb_url_click( struct gui_window * gw, short mx, short my, short mb, short kstat );
/* handle keybd event while url widget has focus:*/
bool tb_url_input( struct gui_window * gw, short keycode );
-/* place the caret and adjust scrolling position: */
-void tb_url_place_caret( struct gui_window * gw, int steps, bool abs);
/* set the url: */
-void tb_url_set( struct gui_window * gw, char * text );
+void tb_url_set( struct gui_window * gw, char * text );
+/* perform redraw of invalidated url textinput areas: */
+void tb_url_redraw( struct gui_window * gw );
struct gui_window * tb_gui_window( CMP_TOOLBAR tb );
Modified: trunk/netsurf/atari/treeview.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/treeview.c?rev=1319...
==============================================================================
--- trunk/netsurf/atari/treeview.c (original)
+++ trunk/netsurf/atari/treeview.c Mon Nov 28 17:23:28 2011
@@ -104,8 +104,10 @@
clip.g_y = 0;
}
if( clip.g_h > 0 && clip.g_w > 0 ) {
- atari_treeview_request_redraw( win->xpos*win->w_u + clip.g_x, win->ypos*win->h_u + clip.g_y,
- clip.g_w, clip.g_h, tv
+ atari_treeview_request_redraw(
+ win->xpos*win->w_u + clip.g_x,
+ win->ypos*win->h_u + clip.g_y,
+ clip.g_w, clip.g_h, tv
);
}
}
@@ -355,7 +357,7 @@
*/
void atari_treeview_request_redraw(int x, int y, int w, int h, void *pw)
{
- if (pw != NULL) {
+ if ( pw != NULL ) {
NSTREEVIEW tv = (NSTREEVIEW) pw;
if( tv->redraw == false ){
tv->redraw = true;
11 years, 6 months
- 1
- 0
r13190 chris_y - /trunk/netsurf/desktop/hotlist.c
by netsurf＠semichrome.net
Author: chris_y
Date: Mon Nov 28 15:10:58 2011
New Revision: 13190
URL: http://source.netsurf-browser.org?rev=13190&view=rev
Log:
Fix function usage
Modified:
trunk/netsurf/desktop/hotlist.c
Modified: trunk/netsurf/desktop/hotlist.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/hotlist.c?rev=131...
==============================================================================
--- trunk/netsurf/desktop/hotlist.c (original)
+++ trunk/netsurf/desktop/hotlist.c Mon Nov 28 15:10:58 2011
@@ -385,7 +385,7 @@
if (selected == true) {
parent = tree_get_selected_node(tree_get_root(hotlist_tree));
- if (parent && (tree_node_is_folder == false)) {
+ if (parent && (tree_node_is_folder(parent) == false)) {
parent = tree_node_get_parent(parent);
}
}
@@ -418,7 +418,7 @@
if (selected == true) {
parent = tree_get_selected_node(tree_get_root(hotlist_tree));
- if (parent && (tree_node_is_folder == false)) {
+ if (parent && (tree_node_is_folder(parent) == false)) {
parent = tree_node_get_parent(parent);
}
}
11 years, 6 months
- 1
- 0
r13189 tlsa - /branches/vince/netsurf-cairo/gtk/plotters.c
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Nov 28 07:27:27 2011
New Revision: 13189
URL: http://source.netsurf-browser.org?rev=13189&view=rev
Log:
Simplify and fix bitmap clipping. Fix scaled bitmap plot call.
Modified:
branches/vince/netsurf-cairo/gtk/plotters.c
Modified: branches/vince/netsurf-cairo/gtk/plotters.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/plotte...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/plotters.c (original)
+++ branches/vince/netsurf-cairo/gtk/plotters.c Mon Nov 28 07:27:27 2011
@@ -309,21 +309,20 @@
y1 = (y + height) - (cliprect.y + cliprect.height);
/* Set initial draw geometry */
- dsrcx = dsrcy = 0;
+ dsrcx = x;
+ dsrcy = y;
dwidth = width;
dheight = height;
/* Manually clip draw coordinates to area of image to be rendered */
if (x0 > 0) {
/* Clip left */
- dsrcx = x0;
- x += x0;
+ dsrcx += x0;
dwidth -= x0;
}
if (y0 > 0) {
/* Clip top */
- dsrcy = y0;
- y += y0;
+ dsrcy += y0;
dheight -= y0;
}
if (x1 > 0) {
@@ -338,6 +337,7 @@
if (dwidth == 0 || dheight == 0)
/* Nothing to plot */
return true;
+
bmwidth = cairo_image_surface_get_width(bmsurface);
bmheight = cairo_image_surface_get_height(bmsurface);
@@ -345,8 +345,8 @@
if ((bmwidth == width) && (bmheight == height)) {
/* Bitmap is not scaled */
/* Plot the bitmap */
- cairo_set_source_surface(current_cr, bmsurface, x - dsrcx, y -dsrcy);
- cairo_rectangle(current_cr, x , y , dwidth, dheight);
+ cairo_set_source_surface(current_cr, bmsurface, x, y);
+ cairo_rectangle(current_cr, dsrcx, dsrcy, dwidth, dheight);
cairo_fill(current_cr);
} else {
@@ -373,7 +373,7 @@
/* Plot the scaled bitmap */
cairo_set_source_surface(current_cr, scsurface, x, y);
- cairo_rectangle(current_cr, x , y , dwidth, dheight);
+ cairo_rectangle(current_cr, dsrcx, dsrcy, dwidth, dheight);
cairo_fill(current_cr);
cairo_surface_destroy(scsurface);
11 years, 6 months
- 1
- 0
r13188 vince - /branches/vince/netsurf-cairo/gtk/bitmap.c
by netsurf＠semichrome.net
Author: vince
Date: Sun Nov 27 14:34:13 2011
New Revision: 13188
URL: http://source.netsurf-browser.org?rev=13188&view=rev
Log:
actually do teh pre-multiplication
Modified:
branches/vince/netsurf-cairo/gtk/bitmap.c
Modified: branches/vince/netsurf-cairo/gtk/bitmap.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/bitmap...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/bitmap.c (original)
+++ branches/vince/netsurf-cairo/gtk/bitmap.c Sun Nov 27 14:34:13 2011
@@ -244,9 +244,9 @@
b = pixel & 0xff;
pixels[pixel_loop] = (t << 24) |
- (r) |
- (g << 8) |
- (b << 16);
+ ((r * t) >> 8) |
+ ((g * t) >> 8) << 8 |
+ ((b * t) >> 8) << 16;
}
}
11 years, 6 months
- 1
- 0
r13187 vince - /branches/vince/netsurf-cairo/gtk/bitmap.c
by netsurf＠semichrome.net
Author: vince
Date: Sun Nov 27 14:29:12 2011
New Revision: 13187
URL: http://source.netsurf-browser.org?rev=13187&view=rev
Log:
fix alpha setup
Modified:
branches/vince/netsurf-cairo/gtk/bitmap.c
Modified: branches/vince/netsurf-cairo/gtk/bitmap.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/bitmap...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/bitmap.c (original)
+++ branches/vince/netsurf-cairo/gtk/bitmap.c Sun Nov 27 14:29:12 2011
@@ -214,18 +214,42 @@
int pixel_count;
uint32_t *pixels;
uint32_t pixel;
-
- assert(surface);
+ cairo_format_t fmt;
+
+ assert(surface);
+
+ fmt = cairo_image_surface_get_format(surface);
pixel_count = cairo_image_surface_get_width(surface) *
cairo_image_surface_get_height(surface);
pixels = (uint32_t *)cairo_image_surface_get_data(surface);
- for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) {
- pixel = pixels[pixel_loop];
- pixels[pixel_loop] = (pixel & 0xff00ff00) |
- ((pixel & 0xff) << 16) |
- ((pixel & 0xff0000) >> 16);
+ if (fmt == CAIRO_FORMAT_RGB24) {
+ for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) {
+ pixel = pixels[pixel_loop];
+ pixels[pixel_loop] = (pixel & 0xff00ff00) |
+ ((pixel & 0xff) << 16) |
+ ((pixel & 0xff0000) >> 16);
+ }
+ } else {
+ uint8_t t, r, g, b;
+ for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) {
+ pixel = pixels[pixel_loop];
+ t = (pixel & 0xff000000) >> 24;
+ if (t == 0) {
+ pixels[pixel_loop] = 0;
+ } else {
+ r = (pixel & 0xff0000) >> 16;
+ g = (pixel & 0xff00) >> 8;
+ b = pixel & 0xff;
+
+ pixels[pixel_loop] = (t << 24) |
+ (r) |
+ (g << 8) |
+ (b << 16);
+
+ }
+ }
}
cairo_surface_mark_dirty (surface);
11 years, 6 months
- 1
- 0
r13186 chris_y - in /trunk/netsurf: amiga/tree.c atari/hotlist.c cocoa/BookmarksController.m gtk/hotlist.c riscos/hotlist.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Nov 27 14:09:10 2011
New Revision: 13186
URL: http://source.netsurf-browser.org?rev=13186&view=rev
Log:
Update frontends for r13185. Enabled new functionality, where it is not logical it
can be switched off.
Modified:
trunk/netsurf/amiga/tree.c
trunk/netsurf/atari/hotlist.c
trunk/netsurf/cocoa/BookmarksController.m
trunk/netsurf/gtk/hotlist.c
trunk/netsurf/riscos/hotlist.c
Modified: trunk/netsurf/amiga/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=13186&r1...
==============================================================================
--- trunk/netsurf/amiga/tree.c (original)
+++ trunk/netsurf/amiga/tree.c Sun Nov 27 14:09:10 2011
@@ -807,11 +807,11 @@
break;
case GID_NEWF:
- hotlist_add_folder();
+ hotlist_add_folder(true);
break;
case GID_NEWB:
- hotlist_add_entry();
+ hotlist_add_entry(true);
break;
case GID_DEFAULT:
Modified: trunk/netsurf/atari/hotlist.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/hotlist.c?rev=13186...
==============================================================================
--- trunk/netsurf/atari/hotlist.c (original)
+++ trunk/netsurf/atari/hotlist.c Sun Nov 27 14:09:10 2011
@@ -49,7 +49,7 @@
/* handle toolbar object (index in buff[4] ) */
switch( buff[4] ) {
case TOOLBAR_HOTLIST_CREATE_FOLDER:
- hotlist_add_folder();
+ hotlist_add_folder(true);
break;
case TOOLBAR_HOTLIST_ADD:
Modified: trunk/netsurf/cocoa/BookmarksController.m
URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BookmarksController...
==============================================================================
--- trunk/netsurf/cocoa/BookmarksController.m (original)
+++ trunk/netsurf/cocoa/BookmarksController.m Sun Nov 27 14:09:10 2011
@@ -186,7 +186,7 @@
- (IBAction) addFolder: (id) sender;
{
- hotlist_add_folder();
+ hotlist_add_folder(true);
}
@end
Modified: trunk/netsurf/gtk/hotlist.c
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/hotlist.c?rev=13186&r...
==============================================================================
--- trunk/netsurf/gtk/hotlist.c (original)
+++ trunk/netsurf/gtk/hotlist.c Sun Nov 27 14:09:10 2011
@@ -200,13 +200,13 @@
MENUHANDLER(new_folder)
{
- hotlist_add_folder();
+ hotlist_add_folder(true);
return TRUE;
}
MENUHANDLER(new_entry)
{
- hotlist_add_entry();
+ hotlist_add_entry(true);
return TRUE;
}
Modified: trunk/netsurf/riscos/hotlist.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/hotlist.c?rev=1318...
==============================================================================
--- trunk/netsurf/riscos/hotlist.c (original)
+++ trunk/netsurf/riscos/hotlist.c Sun Nov 27 14:09:10 2011
@@ -259,7 +259,7 @@
break;
case TOOLBAR_BUTTON_CREATE:
- hotlist_add_folder();
+ hotlist_add_folder(true);
break;
default:
@@ -376,10 +376,10 @@
ro_gui_dialog_open_persistent(w, dialog_saveas, true);
return true;
case TREE_NEW_FOLDER:
- hotlist_add_folder();
+ hotlist_add_folder(true);
return true;
case TREE_NEW_LINK:
- hotlist_add_entry();
+ hotlist_add_entry(true);
return true;
case TREE_EXPAND_ALL:
hotlist_expand_all();
11 years, 6 months
- 1
- 0
r13185 chris_y - in /trunk/netsurf/desktop: hotlist.c hotlist.h tree.c tree.h
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Nov 27 14:07:26 2011
New Revision: 13185
URL: http://source.netsurf-browser.org?rev=13185&view=rev
Log:
Allow new (blank) hotlist entries to be created in the currently-selected folder
(if there is one) as this gives the user more control where their additions are
being created.
Functionality can be enabled/disabled by passing true/false to
hotlist_add_folder/hotlist_add_entry.
Modified:
trunk/netsurf/desktop/hotlist.c
trunk/netsurf/desktop/hotlist.h
trunk/netsurf/desktop/tree.c
trunk/netsurf/desktop/tree.h
Modified: trunk/netsurf/desktop/hotlist.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/hotlist.c?rev=131...
==============================================================================
--- trunk/netsurf/desktop/hotlist.c (original)
+++ trunk/netsurf/desktop/hotlist.c Sun Nov 27 14:07:26 2011
@@ -367,10 +367,12 @@
/**
* Add a folder node.
- */
-void hotlist_add_folder(void)
-{
- struct node *node, *parent;
+ *
+ * \param selected create the folder in the currently-selected node
+ */
+void hotlist_add_folder(bool selected)
+{
+ struct node *node, *parent = NULL;
struct node_element *element;
char *title = strdup("Untitled");
@@ -381,7 +383,17 @@
}
creating_node = true;
- parent = tree_get_default_folder_node(hotlist_tree);
+ if (selected == true) {
+ parent = tree_get_selected_node(tree_get_root(hotlist_tree));
+ if (parent && (tree_node_is_folder == false)) {
+ parent = tree_node_get_parent(parent);
+ }
+ }
+
+ if (parent == NULL) {
+ parent = tree_get_default_folder_node(hotlist_tree);
+ }
+
node = tree_create_folder_node(hotlist_tree, parent, title,
true, false, false);
if (node == NULL) {
@@ -396,13 +408,25 @@
/**
* Add an entry node.
- */
-void hotlist_add_entry(void)
+ *
+ * \param selected add the entry in the currently-selected node
+ */
+void hotlist_add_entry(bool selected)
{
struct node *node, *parent;
creating_node = true;
- parent = tree_get_default_folder_node(hotlist_tree);
+ if (selected == true) {
+ parent = tree_get_selected_node(tree_get_root(hotlist_tree));
+ if (parent && (tree_node_is_folder == false)) {
+ parent = tree_node_get_parent(parent);
+ }
+ }
+
+ if (parent == NULL) {
+ parent = tree_get_default_folder_node(hotlist_tree);
+ }
+
node = tree_create_URL_node(hotlist_tree, parent, "Address",
"Untitled", hotlist_node_callback, NULL);
@@ -433,7 +457,7 @@
}
/**
- * Adds the currently viewed page to the hotlist at the given cooridinates
+ * Adds the currently viewed page to the hotlist at the given co-ordinates
* \param url url of the page
* \param x X cooridinate with respect to tree origin
* \param y Y cooridinate with respect to tree origin
Modified: trunk/netsurf/desktop/hotlist.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/hotlist.h?rev=131...
==============================================================================
--- trunk/netsurf/desktop/hotlist.h (original)
+++ trunk/netsurf/desktop/hotlist.h Sun Nov 27 14:07:26 2011
@@ -53,8 +53,8 @@
void hotlist_collapse_all(void);
void hotlist_collapse_directories(void);
void hotlist_collapse_addresses(void);
-void hotlist_add_folder(void);
-void hotlist_add_entry(void);
+void hotlist_add_folder(bool selected);
+void hotlist_add_entry(bool selected);
void hotlist_add_page(const char *url);
void hotlist_add_page_xy(const char *url, int x, int y);
void hotlist_launch_selected(bool tabs);
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=13185&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Sun Nov 27 14:07:26 2011
@@ -132,7 +132,7 @@
bool selected; /**< Whether the node is selected */
bool expanded; /**< Whether the node is expanded */
bool folder; /**< Whether the node is a folder */
- bool def_folder; /**< Whether the node is the default folder */
+ bool def_folder; /**< Whether the node is the default folder */
bool retain_in_memory; /**< Whether the node remains
in memory after deletion */
bool deleted; /**< Whether the node is currently
@@ -1650,6 +1650,18 @@
def_node->def_folder = false;
tree_handle_node_changed(tree, def_node, true, false);
}
+}
+
+
+/**
+ * Returns the parent of a node
+ *
+ * \param node the node to get the parent of
+ * \return the node's parent
+ */
+struct node *tree_node_get_parent(struct node *node)
+{
+ return node->parent;
}
Modified: trunk/netsurf/desktop/tree.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.h?rev=13185&...
==============================================================================
--- trunk/netsurf/desktop/tree.h (original)
+++ trunk/netsurf/desktop/tree.h Sun Nov 27 14:07:26 2011
@@ -181,6 +181,7 @@
void tree_clear_default_folder_node(struct tree *tree);
/* functions for traversing the tree */
+struct node *tree_node_get_parent(struct node *node);
struct node *tree_node_get_child(struct node *node);
struct node *tree_node_get_next(struct node *node);
11 years, 6 months
- 1
- 0
r13184 vince - in /branches/vince/netsurf-cairo/gtk: bitmap.c plotters.c scaffolding.c thumbnail.c treeview.c window.c
by netsurf＠semichrome.net
Author: vince
Date: Sun Nov 27 14:03:15 2011
New Revision: 13184
URL: http://source.netsurf-browser.org?rev=13184&view=rev
Log:
remove final gdk references
make bitmaps into cairo surfaces
Modified:
branches/vince/netsurf-cairo/gtk/bitmap.c
branches/vince/netsurf-cairo/gtk/plotters.c
branches/vince/netsurf-cairo/gtk/scaffolding.c
branches/vince/netsurf-cairo/gtk/thumbnail.c
branches/vince/netsurf-cairo/gtk/treeview.c
branches/vince/netsurf-cairo/gtk/window.c
Modified: branches/vince/netsurf-cairo/gtk/bitmap.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/bitmap...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/bitmap.c (original)
+++ branches/vince/netsurf-cairo/gtk/bitmap.c Sun Nov 27 14:03:15 2011
@@ -36,10 +36,6 @@
#include "utils/log.h"
-struct bitmap {
- cairo_surface_t *surface;
- bool opaque;
-};
/**
* Create a bitmap.
@@ -52,20 +48,20 @@
void *bitmap_create(int width, int height, unsigned int state)
{
- struct bitmap *bmp;
- bmp = calloc(1, sizeof(struct bitmap));
-
- if (bmp != NULL) {
- bmp->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
- bmp->opaque = (state & BITMAP_OPAQUE) != 0;
-
- if (cairo_surface_status(bmp->surface) != CAIRO_STATUS_SUCCESS) {
- cairo_surface_destroy(bmp->surface);
- free(bmp);
- bmp = NULL;
- }
- }
- return bmp;
+ cairo_surface_t *surface;
+
+ if ((state & BITMAP_OPAQUE) != 0) {
+ surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height);
+ } else {
+ surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+ }
+
+ if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) {
+ cairo_surface_destroy(surface);
+ surface = NULL;
+ }
+
+ return surface;
}
@@ -77,9 +73,12 @@
*/
void bitmap_set_opaque(void *vbitmap, bool opaque)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- bitmap->opaque = opaque;
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
+ /* gtk image surface cannot change format. but its harmless to
+ * plot with alpha. this does not cope with opaque to
+ * transparent conversions but currently those never happen
+ */
}
@@ -91,9 +90,9 @@
*/
bool bitmap_test_opaque(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
-/* todo: test if bitmap is opaque */
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
+ /* todo: test if bitmap is opaque */
return false;
}
@@ -105,9 +104,17 @@
*/
bool bitmap_get_opaque(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return bitmap->opaque;
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ cairo_format_t fmt;
+
+ assert(surface);
+
+ fmt = cairo_image_surface_get_format(surface);
+ if (fmt == CAIRO_FORMAT_RGB24) {
+ return true;
+ }
+
+ return false;
}
@@ -123,12 +130,12 @@
unsigned char *bitmap_get_buffer(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
- cairo_surface_flush (bitmap->surface);
+ cairo_surface_flush (surface);
- return cairo_image_surface_get_data(bitmap->surface);
+ return cairo_image_surface_get_data(surface);
}
@@ -141,9 +148,9 @@
size_t bitmap_get_rowstride(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return cairo_image_surface_get_stride(bitmap->surface);
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
+ return cairo_image_surface_get_stride(surface);
}
@@ -156,8 +163,8 @@
size_t bitmap_get_bpp(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
return 4;
}
@@ -171,11 +178,10 @@
void bitmap_destroy(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
-
- cairo_surface_destroy(bitmap->surface);
- free(bitmap);
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
+
+ cairo_surface_destroy(surface);
}
@@ -190,7 +196,8 @@
bool bitmap_save(void *vbitmap, const char *path, unsigned flags)
{
-// struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ assert(surface);
return false;
}
@@ -202,21 +209,26 @@
* \param bitmap a bitmap, as returned by bitmap_create()
*/
void bitmap_modified(void *vbitmap) {
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
int pixel_loop;
- int pixel_count = cairo_image_surface_get_width(bitmap->surface) * cairo_image_surface_get_height(bitmap->surface);
- uint32_t *pixels = (uint32_t *)cairo_image_surface_get_data(bitmap->surface);
+ int pixel_count;
+ uint32_t *pixels;
uint32_t pixel;
+
+ assert(surface);
+
+ pixel_count = cairo_image_surface_get_width(surface) *
+ cairo_image_surface_get_height(surface);
+ pixels = (uint32_t *)cairo_image_surface_get_data(surface);
for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) {
pixel = pixels[pixel_loop];
pixels[pixel_loop] = (pixel & 0xff00ff00) |
((pixel & 0xff) << 16) |
- ((pixel & 0xff0000) >> 16);
-
+ ((pixel & 0xff0000) >> 16);
}
- cairo_surface_mark_dirty (bitmap->surface);
+ cairo_surface_mark_dirty (surface);
}
@@ -232,24 +244,13 @@
}
int bitmap_get_width(void *vbitmap){
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- return cairo_image_surface_get_width(bitmap->surface);
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ return cairo_image_surface_get_width(surface);
}
int bitmap_get_height(void *vbitmap){
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- return cairo_image_surface_get_height(bitmap->surface);
-}
-
-
-/**
- * The image associated with this bitmap object.
- *
- * \param bitmap a bitmap, as returned by bitmap_create()
- */
-cairo_surface_t *
-gtk_bitmap_get_surface(struct bitmap *bitmap)
-{
- return bitmap->surface;
-}
-
+ cairo_surface_t *surface = (cairo_surface_t *)vbitmap;
+ return cairo_image_surface_get_height(surface);
+}
+
+
Modified: branches/vince/netsurf-cairo/gtk/plotters.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/plotte...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/plotters.c (original)
+++ branches/vince/netsurf-cairo/gtk/plotters.c Sun Nov 27 14:03:15 2011
@@ -42,7 +42,6 @@
#include "gtk/bitmap.h"
GtkWidget *current_widget;
-GdkDrawable *current_drawable;
cairo_t *current_cr;
static GdkRectangle cliprect;
@@ -379,26 +378,6 @@
cairo_surface_destroy(scsurface);
-#if 0
- /* Get scale factors */
- double sx = (double)width / gdk_pixbuf_get_width(pixbuf);
- double sy = (double)height / gdk_pixbuf_get_height(pixbuf);
-
- /* Create bitmap for scaled image portion */
- GdkPixbuf *scaled = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8,
- dwidth, dheight);
- /* Only scale up the portion of the bitmap that we are
- * interested in rendering */
- gdk_pixbuf_scale(pixbuf, scaled,
- 0, 0, dwidth, dheight,
- -dsrcx, -dsrcy, sx, sy,
- option_render_resample ? GDK_INTERP_BILINEAR :
- GDK_INTERP_NEAREST);
- if (!scaled)
- return false;
-#endif
-
-// g_object_unref(scaled);
}
return true;
@@ -412,9 +391,7 @@
bool repeat_x = (flags & BITMAPF_REPEAT_X);
bool repeat_y = (flags & BITMAPF_REPEAT_Y);
- cairo_surface_t *bmsurface;
-
- bmsurface = gtk_bitmap_get_surface(bitmap);
+ cairo_surface_t *bmsurface = (cairo_surface_t *)bitmap;
if (!(repeat_x || repeat_y)) {
/* Not repeating at all, so just pass it on */
Modified: branches/vince/netsurf-cairo/gtk/scaffolding.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/scaffo...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/scaffolding.c (original)
+++ branches/vince/netsurf-cairo/gtk/scaffolding.c Sun Nov 27 14:03:15 2011
@@ -1516,9 +1516,8 @@
};
current_widget = widget;
- current_drawable = widget->window;
-
- current_cr = gdk_cairo_create(current_drawable);
+
+ current_cr = gdk_cairo_create(widget->window);
clip.x0 = event->area.x;
clip.y0 = event->area.y;
Modified: branches/vince/netsurf-cairo/gtk/thumbnail.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/thumbn...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/thumbnail.c (original)
+++ branches/vince/netsurf-cairo/gtk/thumbnail.c Sun Nov 27 14:03:15 2011
@@ -52,15 +52,11 @@
bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
const char *url)
{
- GdkPixbuf *pixbuf;
+ cairo_surface_t *dsurface = (cairo_surface_t *)bitmap;
+ cairo_surface_t *surface;
+ cairo_t *old_cr;
+ gint dwidth, dheight;
int cwidth, cheight;
- gint width;
- gint height;
- gint depth;
- GdkPixmap *pixmap;
- GdkPixbuf *big;
- double scale;
-
struct redraw_context ctx = {
.interactive = false,
.plot = &nsgtk_plotters
@@ -69,11 +65,8 @@
assert(content);
assert(bitmap);
- /* Get details of required final thumbnail image */
- pixbuf = NULL;//gtk_bitmap_get_primary(bitmap);
- width = gdk_pixbuf_get_width(pixbuf);
- height = gdk_pixbuf_get_height(pixbuf);
- depth = (gdk_screen_get_system_visual(gdk_screen_get_default()))->depth;
+ dwidth = cairo_image_surface_get_width(dsurface);
+ dheight = cairo_image_surface_get_height(dsurface);
/* Calculate size of buffer to render the content into */
/* We get the width from the content width, unless it exceeds 1024,
@@ -81,56 +74,54 @@
* large render buffers for huge contents, which would eat memory and
* cripple performance. */
cwidth = min(content_get_width(content), 1024);
+
/* The height is set in proportion with the width, according to the
* aspect ratio of the required thumbnail. */
- cheight = ((cwidth * height) + (width / 2)) / width;
+ cheight = ((cwidth * dheight) + (dwidth / 2)) / dwidth;
- /* Create buffer to render into */
- pixmap = gdk_pixmap_new(NULL, cwidth, cheight, depth);
-
- if (pixmap == NULL) {
- /* the creation failed for some reason: most likely because
- * we've been asked to create with with at least one dimention
- * as zero. The RISC OS thumbnail generator returns false
- * from here when it can't create a bitmap, so we assume it's
- * safe to do so here too.
- */
+ /* Create surface to render into */
+ surface = cairo_surface_create_similar(dsurface, CAIRO_CONTENT_COLOR_ALPHA, cwidth, cheight);
+
+ if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) {
+ cairo_surface_destroy(surface);
return false;
}
- gdk_drawable_set_colormap(pixmap, gdk_colormap_get_system());
-
- /* set to plot to pixmap */
- current_drawable = pixmap;
- current_cr = gdk_cairo_create(current_drawable);
+ old_cr = current_cr;
+ current_cr = cairo_create(surface);
/* render the content */
thumbnail_redraw(content, cwidth, cheight, &ctx);
- /* get the pixbuf we rendered the content into */
- big = gdk_pixbuf_get_from_drawable(NULL, pixmap, NULL, 0, 0, 0, 0,
- cwidth, cheight);
+ cairo_destroy(current_cr);
+ current_cr = old_cr;
- /* resample the large plot down to the size of our thumbnail */
- scale = (double)width / (double)cwidth;
- gdk_pixbuf_scale(big, pixbuf, 0, 0, width, height, 0, 0,
- scale, scale, GDK_INTERP_TILES);
+ cairo_t *cr = cairo_create(dsurface);
- /* As a debugging aid, try this to dump out a copy of the thumbnail as
- * a PNG: gdk_pixbuf_save(pixbuf, "thumbnail.png", "png", NULL, NULL);
+ /* Scale *before* setting the source surface (1) */
+ cairo_scale (cr, (double)dwidth / cwidth, (double)dheight / cheight);
+ cairo_set_source_surface (cr, surface, 0, 0);
+
+ /* To avoid getting the edge pixels blended with 0 alpha,
+ * which would occur with the default EXTEND_NONE. Use
+ * EXTEND_PAD for 1.2 or newer (2)
*/
+ cairo_pattern_set_extend (cairo_get_source(cr), CAIRO_EXTEND_REFLECT);
+
+ /* Replace the destination with the source instead of overlaying */
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+
+ /* Do the actual drawing */
+ cairo_paint(cr);
+
+ cairo_destroy(cr);
+
+ cairo_surface_destroy(surface);
/* register the thumbnail with the URL */
if (url)
urldb_set_thumbnail(url, bitmap);
- bitmap_modified(bitmap);
-
- cairo_destroy(current_cr);
-
- g_object_unref(pixmap);
- g_object_unref(big);
-
return true;
}
Modified: branches/vince/netsurf-cairo/gtk/treeview.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/treevi...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/treeview.c (original)
+++ branches/vince/netsurf-cairo/gtk/treeview.c Sun Nov 27 14:03:15 2011
@@ -181,12 +181,7 @@
height = event->area.height;
current_widget = widget;
- current_drawable = widget->window;
- current_cr = gdk_cairo_create(current_drawable);
-
- current_widget = widget;
- current_drawable = widget->window;
- current_cr = gdk_cairo_create(current_drawable);
+ current_cr = gdk_cairo_create(widget->window);
tree_set_redraw(tree, true);
tree_draw(tree, 0, 0, x, y, width, height, &ctx);
Modified: branches/vince/netsurf-cairo/gtk/window.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/window...
==============================================================================
--- branches/vince/netsurf-cairo/gtk/window.c (original)
+++ branches/vince/netsurf-cairo/gtk/window.c Sun Nov 27 14:03:15 2011
@@ -156,10 +156,8 @@
assert(z);
assert(GTK_WIDGET(g->layout) == widget);
-
current_widget = (GtkWidget *)g->layout;
- current_drawable = g->layout->bin_window;
- current_cr = gdk_cairo_create(current_drawable);
+ current_cr = gdk_cairo_create(g->layout->bin_window);
clip.x0 = event->area.x;
clip.y0 = event->area.y;
@@ -168,8 +166,9 @@
browser_window_redraw(g->bw, 0, 0, &clip, &ctx);
- if (g->careth != 0)
+ if (g->careth != 0) {
nsgtk_plot_caret(g->caretx, g->carety, g->careth);
+ }
current_widget = NULL;
cairo_destroy(current_cr);
11 years, 6 months
- 1
- 0
r13183 tlsa - in /trunk/netsurf: content/fetchers/curl.c content/llcache.c desktop/browser.c utils/nsurl.c utils/nsurl.h
by netsurf＠semichrome.net
Author: tlsa
Date: Sun Nov 27 12:32:06 2011
New Revision: 13183
URL: http://source.netsurf-browser.org?rev=13183&view=rev
Log:
Rename nsurl_enquire to nsurl_has_component.
Modified:
trunk/netsurf/content/fetchers/curl.c
trunk/netsurf/content/llcache.c
trunk/netsurf/desktop/browser.c
trunk/netsurf/utils/nsurl.c
trunk/netsurf/utils/nsurl.h
Modified: trunk/netsurf/content/fetchers/curl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/curl.c?r...
==============================================================================
--- trunk/netsurf/content/fetchers/curl.c (original)
+++ trunk/netsurf/content/fetchers/curl.c Sun Nov 27 12:32:06 2011
@@ -322,7 +322,7 @@
bool fetch_curl_can_fetch(const nsurl *url)
{
- return nsurl_enquire(url, NSURL_HOST);
+ return nsurl_has_component(url, NSURL_HOST);
}
/**
Modified: trunk/netsurf/content/llcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/llcache.c?rev=131...
==============================================================================
--- trunk/netsurf/content/llcache.c (original)
+++ trunk/netsurf/content/llcache.c Sun Nov 27 12:32:06 2011
@@ -724,10 +724,10 @@
*/
/* Look for a query segment */
- has_query = nsurl_enquire(url, NSURL_QUERY);
+ has_query = nsurl_has_component(url, NSURL_QUERY);
/* Get rid of any url fragment */
- if (nsurl_enquire(url, NSURL_FRAGMENT)) {
+ if (nsurl_has_component(url, NSURL_FRAGMENT)) {
error = nsurl_defragment(url, &defragmented_url);
if (error != NSERROR_OK)
return error;
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=131...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Sun Nov 27 12:32:06 2011
@@ -794,7 +794,7 @@
lwc_string_unref(bw->frag_id);
bw->frag_id = NULL;
- if (nsurl_enquire(nsurl, NSURL_FRAGMENT)) {
+ if (nsurl_has_component(nsurl, NSURL_FRAGMENT)) {
bool same_url = false;
bw->frag_id = nsurl_get_component(nsurl, NSURL_FRAGMENT);
@@ -811,7 +811,8 @@
* don't bother to fetch, just update the window.
*/
if (same_url && fetch_is_post == false &&
- nsurl_enquire(nsurl, NSURL_QUERY) == false) {
+ nsurl_has_component(nsurl, NSURL_QUERY) ==
+ false) {
nsurl_unref(nsurl);
if (nsref != NULL)
nsurl_unref(nsref);
Modified: trunk/netsurf/utils/nsurl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/nsurl.c?rev=13183&r...
==============================================================================
--- trunk/netsurf/utils/nsurl.c (original)
+++ trunk/netsurf/utils/nsurl.c Sun Nov 27 12:32:06 2011
@@ -1482,7 +1482,7 @@
/* exported interface, documented in nsurl.h */
-bool nsurl_enquire(const nsurl *url, nsurl_component part)
+bool nsurl_has_component(const nsurl *url, nsurl_component part)
{
assert(url != NULL);
Modified: trunk/netsurf/utils/nsurl.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/nsurl.h?rev=13183&r...
==============================================================================
--- trunk/netsurf/utils/nsurl.h (original)
+++ trunk/netsurf/utils/nsurl.h Sun Nov 27 12:32:06 2011
@@ -165,7 +165,7 @@
* NSURL_QUERY
* NSURL_FRAGMENT
*/
-bool nsurl_enquire(const nsurl *url, nsurl_component part);
+bool nsurl_has_component(const nsurl *url, nsurl_component part);
/**
11 years, 6 months
- 1
- 0