commit 057fcccd9c2e6f4a99622bfdbfa784bcc900b3be
parent 36ea427b2e7a6a5602ddebe9d67e14731abd78d5
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Fri, 21 Sep 2012 20:37:45 -0600
buffers: Tab_Data -> Buffer_Data
each "tab" isn't really a tab anymore because there is no tab bar.
instead use the notion of buffers, similar to how a vim buffer is
editing a single file, an elm_web buffer is a single web page.
Diffstat:
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/commands.c b/commands.c
@@ -547,7 +547,7 @@ open_arg(const Arg *arg, void *data)
elm_web_uri_set(ad->current_web, new);
free(new);
} else {
- Tab_Data *td = tab_add(ad);
+ Buffer_Data *td = buffer_add(ad);
buffer_current_set(td);
a.i = TargetCurrent;
a.s = strdup(arg->s); // not sure if strdup necessary
@@ -1381,7 +1381,7 @@ list(const Arg *arg, void *data)
App_Data *ad = data;
Eina_List *l;
- Tab_Data *td;
+ Buffer_Data *td;
Evas_Object *icon, *row, *label;
Evas *e = evas_object_evas_get(ad->win);
@@ -1449,7 +1449,7 @@ switch_buffer(const Arg *arg, void *data)
{
App_Data *ad = data;
Eina_List *l;
- Tab_Data *td;
+ Buffer_Data *td;
// int arg_count = atoi(arg->s);
diff --git a/main.c b/main.c
@@ -277,7 +277,7 @@ webview_title_changed_cb(void *data, Evas_Object *obj, void *event_info)
void
webview_progress_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
/* *event_info is a double between 0.0 and 1.0 */
update_state(td->app);
}
@@ -285,7 +285,7 @@ webview_progress_changed_cb(void *data, Evas_Object *obj, void *event_info)
static void
webview_inspector_cb(void *data, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
Evas_Object *view = elm_web_webkit_view_get(td->web);
@@ -309,7 +309,7 @@ webview_inspector_cb(void *data, Evas_Object *obj, void *event_info)
static void
webview_inspector_close_cb(void *data, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
Evas_Object *view = elm_web_webkit_view_get(td->web);
@@ -326,7 +326,7 @@ void
webview_uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
Arg a = { .i = Silent, .s = strdup(JS_SETUP_HINTS) };
- Tab_Data *td = data;
+ Buffer_Data *td = data;
const char *uri = event_info;
if (td->web != td->app->current_web)
@@ -451,7 +451,7 @@ void
webview_load_finished_cb(void *data, Evas_Object *obj, void *event_info)
{
/* WebKitWebSettings *settings = webkit_web_view_get_settings(webview); */
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
Eina_Bool scripts = 1;
Elm_Web_Frame_Load_Error *frame_error = event_info;
@@ -608,7 +608,7 @@ static void
webview_download_cb(void *data, Evas_Object *obj, void *event_info)
{
Eina_Bool ret;
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
Ewk_Download *dl = event_info;
@@ -641,7 +641,7 @@ webview_download_cb(void *data, Evas_Object *obj, void *event_info)
static void
webview_mousewheel_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
update_state(td->app);
}
@@ -687,7 +687,7 @@ webview_keypress_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
Arg a = { .i = ModeNormal, .s = NULL };
// int keyval;
Evas_Event_Key_Down *ev = event_info;
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
// GdkModifierType irrelevant;
@@ -783,7 +783,7 @@ icon_received_cb(void *data, Evas_Object *obj, void *event_info)
void
webview_hoverlink_cb(void *data, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
const char *uri = elm_web_uri_get(td->web);
/* event_info is a char *link[2] where the first string contains the URL
* and the second the title of the link */
@@ -806,7 +806,7 @@ webview_hoverlink_cb(void *data, Evas_Object *obj, void *event_info)
static void
webview_hoverlink_out_cb(void *data, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
update_url(elm_web_uri_get(td->web), td->app);
}
@@ -814,7 +814,7 @@ static void
webview_console_cb(void *data, Evas_Object *obj, const char *message, unsigned int line, const char *source)
{
Arg a;
- Tab_Data *td = data;
+ Buffer_Data *td = data;
/* Don't change internal mode if the browser doesn't have focus to prevent inconsistent states */
// if (gtk_window_has_toplevel_focus(window)) {
@@ -1035,7 +1035,7 @@ inputmethod_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
const char *value;
Eina_Bool *enabled = event_info;
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
Evas_Object *view = elm_web_webkit_view_get(td->web);
Evas_Object *frame = ewk_view_frame_main_get(view);
@@ -1074,7 +1074,7 @@ notify_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
Ewk_Hit_Test_Result_Context context;
Evas_Event_Mouse_Up *ev = event_info;
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
Evas_Object *view = elm_web_webkit_view_get(td->web);
@@ -1254,7 +1254,7 @@ Evas_Object *
webview_create_window_cb(void *data, Evas_Object *obj, Eina_Bool js, const Elm_Web_Window_Features *wf)
{
App_Data *ad = data;
- Tab_Data *td = tab_add(ad);
+ Buffer_Data *td = buffer_add(ad);
return td->web;
}
@@ -1267,7 +1267,7 @@ _win_del_request_cb(void *data, Evas_Object *obj, void *event_info)
}
void
-buffer_current_set(Tab_Data *td)
+buffer_current_set(Buffer_Data *td)
{
App_Data *ad = td->app;
// const char *uri;
@@ -1299,7 +1299,7 @@ buffer_current_set(Tab_Data *td)
static void
_web_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
- Tab_Data *td = data;
+ Buffer_Data *td = data;
App_Data *ad = td->app;
elm_naviframe_item_pop(ad->naviframe);
@@ -1315,12 +1315,12 @@ _web_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
free(td);
}
-Tab_Data*
-tab_add(App_Data *ad)
+Buffer_Data*
+buffer_add(App_Data *ad)
{
- Tab_Data *td;
+ Buffer_Data *td;
- td = calloc(1, sizeof(Tab_Data));
+ td = calloc(1, sizeof(Buffer_Data));
if (!td) return NULL;
ad->buf_total++;
@@ -1495,7 +1495,7 @@ elm_main(int argc, char *argv[])
ad->buf_total = 0;
- Tab_Data *td = tab_add(ad);
+ Buffer_Data *td = buffer_add(ad);
buffer_current_set(td);
elm_web_uri_set(td->web, startpage);
diff --git a/main.h b/main.h
@@ -10,7 +10,7 @@
#ifndef MAIN_H
#define MAIN_H
-typedef struct _Tab_Data Tab_Data;
+typedef struct _Buffer_Data Buffer_Data;
typedef struct
{
@@ -56,7 +56,7 @@ typedef struct
Eina_Bool exiting : 1;
} App_Data;
-struct _Tab_Data
+struct _Buffer_Data
{
Evas_Object *web;
App_Data *app;
@@ -73,8 +73,8 @@ struct dl {
void update_state(void *);
Eina_Bool echo(const Arg *arg, void *);
-void buffer_current_set(Tab_Data *td);
-Tab_Data *tab_add(App_Data *ad);
+void buffer_current_set(Buffer_Data *td);
+Buffer_Data *buffer_add(App_Data *ad);
#endif