Merge branch 'helmut' into helmutexp
authorHelmut Grohne <helmut@subdivi.de>
Wed, 29 Jul 2009 20:14:26 +0000 (22:14 +0200)
committerHelmut Grohne <helmut@subdivi.de>
Wed, 29 Jul 2009 20:14:26 +0000 (22:14 +0200)
Conflicts:
uzbl.c

1  2 
uzbl.c
uzbl.h

diff --cc uzbl.c
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -112,88 -109,82 +112,88 @@@ const struct var_name_to_ptr_t 
      const char *name;
      uzbl_cmdprop cp;
  } var_name_to_ptr[] = {
 -/*    variable name         pointer to variable in code                  dump callback function    */
 +/*    variable name            pointer to variable in code                     dump callback function    */
  /*  ---------------------------------------------------------------------------------------------- */
 -    { "uri",                 PTR_V_STR(uzbl.state.uri,                    1,   cmd_load_uri)},
 -    { "verbose",             PTR_V_INT(uzbl.state.verbose,                1,   NULL)},
 -    { "mode",                PTR_V_INT(uzbl.behave.mode,                  0,   NULL)},
 -    { "inject_html",         PTR_V_STR(uzbl.behave.inject_html,           0,   cmd_inject_html)},
 -    { "base_url",            PTR_V_STR(uzbl.behave.base_url,              1,   NULL)},
 -    { "html_endmarker",      PTR_V_STR(uzbl.behave.html_endmarker,        1,   NULL)},
 -    { "html_mode_timeout",   PTR_V_INT(uzbl.behave.html_timeout,          1,   NULL)},
 -    { "keycmd",              PTR_V_STR(uzbl.state.keycmd,                 1,   set_keycmd)},
 -    { "status_message",      PTR_V_STR(uzbl.gui.sbar.msg,                 1,   update_title)},
 -    { "show_status",         PTR_V_INT(uzbl.behave.show_status,           1,   cmd_set_status)},
 -    { "status_top",          PTR_V_INT(uzbl.behave.status_top,            1,   move_statusbar)},
 -    { "status_format",       PTR_V_STR(uzbl.behave.status_format,         1,   update_title)},
 -    { "status_pbar_done",    PTR_V_STR(uzbl.gui.sbar.progress_s,          1,   update_title)},
 -    { "status_pbar_pending", PTR_V_STR(uzbl.gui.sbar.progress_u,          1,   update_title)},
 -    { "status_pbar_width",   PTR_V_INT(uzbl.gui.sbar.progress_w,          1,   update_title)},
 -    { "status_background",   PTR_V_STR(uzbl.behave.status_background,     1,   update_title)},
 -    { "insert_indicator",    PTR_V_STR(uzbl.behave.insert_indicator,      1,   update_indicator)},
 -    { "command_indicator",   PTR_V_STR(uzbl.behave.cmd_indicator,         1,   update_indicator)},
 -    { "title_format_long",   PTR_V_STR(uzbl.behave.title_format_long,     1,   update_title)},
 -    { "title_format_short",  PTR_V_STR(uzbl.behave.title_format_short,    1,   update_title)},
 -    { "icon",                PTR_V_STR(uzbl.gui.icon,                     1,   set_icon)},
 -    { "insert_mode",         PTR_V_INT(uzbl.behave.insert_mode,           1,   set_mode_indicator)},
 -    { "always_insert_mode",  PTR_V_INT(uzbl.behave.always_insert_mode,    1,   cmd_always_insert_mode)},
 -    { "reset_command_mode",  PTR_V_INT(uzbl.behave.reset_command_mode,    1,   NULL)},
 -    { "modkey",              PTR_V_STR(uzbl.behave.modkey,                1,   cmd_modkey)},
 -    { "load_finish_handler", PTR_V_STR(uzbl.behave.load_finish_handler,   1,   NULL)},
 -    { "load_start_handler",  PTR_V_STR(uzbl.behave.load_start_handler,    1,   NULL)},
 -    { "load_commit_handler", PTR_V_STR(uzbl.behave.load_commit_handler,   1,   NULL)},
 -    { "history_handler",     PTR_V_STR(uzbl.behave.history_handler,       1,   NULL)},
 -    { "download_handler",    PTR_V_STR(uzbl.behave.download_handler,      1,   NULL)},
 -    { "cookie_handler",      PTR_V_STR(uzbl.behave.cookie_handler,        1,   cmd_cookie_handler)},
 -    { "new_window",          PTR_V_STR(uzbl.behave.new_window,            1,   cmd_new_window)},
 -    { "fifo_dir",            PTR_V_STR(uzbl.behave.fifo_dir,              1,   cmd_fifo_dir)},
 -    { "socket_dir",          PTR_V_STR(uzbl.behave.socket_dir,            1,   cmd_socket_dir)},
 -    { "http_debug",          PTR_V_INT(uzbl.behave.http_debug,            1,   cmd_http_debug)},
 -    { "shell_cmd",           PTR_V_STR(uzbl.behave.shell_cmd,             1,   NULL)},
 -    { "proxy_url",           PTR_V_STR(uzbl.net.proxy_url,                1,   set_proxy_url)},
 -    { "max_conns",           PTR_V_INT(uzbl.net.max_conns,                1,   cmd_max_conns)},
 -    { "max_conns_host",      PTR_V_INT(uzbl.net.max_conns_host,           1,   cmd_max_conns_host)},
 -    { "useragent",           PTR_V_STR(uzbl.net.useragent,                1,   cmd_useragent)},
 +    { "uri",                    PTR_V_STR(uzbl.state.uri,                       1,   cmd_load_uri)},
 +    { "verbose",                PTR_V_INT(uzbl.state.verbose,                   1,   NULL)},
 +    { "mode",                   PTR_V_INT(uzbl.behave.mode,                     0,   NULL)},
 +    { "inject_html",            PTR_V_STR(uzbl.behave.inject_html,              0,   cmd_inject_html)},
 +    { "base_url",               PTR_V_STR(uzbl.behave.base_url,                 1,   NULL)},
 +    { "html_endmarker",         PTR_V_STR(uzbl.behave.html_endmarker,           1,   NULL)},
 +    { "html_mode_timeout",      PTR_V_INT(uzbl.behave.html_timeout,             1,   NULL)},
 +    { "keycmd",                 PTR_V_STR(uzbl.state.keycmd,                    1,   set_keycmd)},
 +    { "status_message",         PTR_V_STR(uzbl.gui.sbar.msg,                    1,   update_title)},
 +    { "show_status",            PTR_V_INT(uzbl.behave.show_status,              1,   cmd_set_status)},
 +    { "status_top",             PTR_V_INT(uzbl.behave.status_top,               1,   move_statusbar)},
 +    { "status_format",          PTR_V_STR(uzbl.behave.status_format,            1,   update_title)},
 +    { "status_pbar_done",       PTR_V_STR(uzbl.gui.sbar.progress_s,             1,   update_title)},
 +    { "status_pbar_pending",    PTR_V_STR(uzbl.gui.sbar.progress_u,             1,   update_title)},
 +    { "status_pbar_width",      PTR_V_INT(uzbl.gui.sbar.progress_w,             1,   update_title)},
 +    { "status_background",      PTR_V_STR(uzbl.behave.status_background,        1,   update_title)},
 +    { "insert_indicator",       PTR_V_STR(uzbl.behave.insert_indicator,         1,   update_indicator)},
 +    { "command_indicator",      PTR_V_STR(uzbl.behave.cmd_indicator,            1,   update_indicator)},
 +    { "title_format_long",      PTR_V_STR(uzbl.behave.title_format_long,        1,   update_title)},
 +    { "title_format_short",     PTR_V_STR(uzbl.behave.title_format_short,       1,   update_title)},
 +    { "icon",                   PTR_V_STR(uzbl.gui.icon,                        1,   set_icon)},
 +    { "insert_mode",            PTR_V_INT(uzbl.behave.insert_mode,              1,   set_mode_indicator)},
 +    { "always_insert_mode",     PTR_V_INT(uzbl.behave.always_insert_mode,       1,   cmd_always_insert_mode)},
 +    { "reset_command_mode",     PTR_V_INT(uzbl.behave.reset_command_mode,       1,   NULL)},
 +    { "modkey",                 PTR_V_STR(uzbl.behave.modkey,                   1,   cmd_modkey)},
 +    { "load_finish_handler",    PTR_V_STR(uzbl.behave.load_finish_handler,      1,   NULL)},
 +    { "load_start_handler",     PTR_V_STR(uzbl.behave.load_start_handler,       1,   NULL)},
 +    { "load_commit_handler",    PTR_V_STR(uzbl.behave.load_commit_handler,      1,   NULL)},
 +    { "history_handler",        PTR_V_STR(uzbl.behave.history_handler,          1,   NULL)},
 +    { "download_handler",       PTR_V_STR(uzbl.behave.download_handler,         1,   NULL)},
 +    { "cookie_handler",         PTR_V_STR(uzbl.behave.cookie_handler,           1,   cmd_cookie_handler)},
 +    { "new_window",             PTR_V_STR(uzbl.behave.new_window,               1,   cmd_new_window)},
 +    { "fifo_dir",               PTR_V_STR(uzbl.behave.fifo_dir,                 1,   cmd_fifo_dir)},
 +    { "socket_dir",             PTR_V_STR(uzbl.behave.socket_dir,               1,   cmd_socket_dir)},
 +    { "http_debug",             PTR_V_INT(uzbl.behave.http_debug,               1,   cmd_http_debug)},
 +    { "shell_cmd",              PTR_V_STR(uzbl.behave.shell_cmd,                1,   NULL)},
 +    { "proxy_url",              PTR_V_STR(uzbl.net.proxy_url,                   1,   set_proxy_url)},
 +    { "max_conns",              PTR_V_INT(uzbl.net.max_conns,                   1,   cmd_max_conns)},
 +    { "max_conns_host",         PTR_V_INT(uzbl.net.max_conns_host,              1,   cmd_max_conns_host)},
 +    { "useragent",              PTR_V_STR(uzbl.net.useragent,                   1,   cmd_useragent)},
  
      /* exported WebKitWebSettings properties */
 -    { "zoom_level",          PTR_V_FLOAT(uzbl.behave.zoom_level,          1,   cmd_zoom_level)},
 -    { "font_size",           PTR_V_INT(uzbl.behave.font_size,             1,   cmd_font_size)},
 -    { "monospace_size",      PTR_V_INT(uzbl.behave.monospace_size,        1,   cmd_font_size)},
 -    { "minimum_font_size",   PTR_V_INT(uzbl.behave.minimum_font_size,     1,   cmd_minimum_font_size)},
 -    { "disable_plugins",     PTR_V_INT(uzbl.behave.disable_plugins,       1,   cmd_disable_plugins)},
 -    { "disable_scripts",     PTR_V_INT(uzbl.behave.disable_scripts,       1,   cmd_disable_scripts)},
 -    { "autoload_images",     PTR_V_INT(uzbl.behave.autoload_img,          1,   cmd_autoload_img)},
 -    { "autoshrink_images",   PTR_V_INT(uzbl.behave.autoshrink_img,        1,   cmd_autoshrink_img)},
 -    { "enable_spellcheck",   PTR_V_INT(uzbl.behave.enable_spellcheck,     1,   cmd_enable_spellcheck)},
 -    { "enable_private",      PTR_V_INT(uzbl.behave.enable_private,        1,   cmd_enable_private)},
 -    { "print_backgrounds",   PTR_V_INT(uzbl.behave.print_bg,              1,   cmd_print_bg)},
 -    { "stylesheet_uri",      PTR_V_STR(uzbl.behave.style_uri,             1,   cmd_style_uri)},
 -    { "resizable_text_areas",PTR_V_INT(uzbl.behave.resizable_txt,         1,   cmd_resizable_txt)},
 -    { "default_encoding",    PTR_V_STR(uzbl.behave.default_encoding,      1,   cmd_default_encoding)},
 -    { "enforce_96_dpi",      PTR_V_INT(uzbl.behave.enforce_96dpi,         1,   cmd_enforce_96dpi)},
 -    { "caret_browsing",      PTR_V_INT(uzbl.behave.caret_browsing,        1,   cmd_caret_browsing)},
 +    { "zoom_level",             PTR_V_FLOAT(uzbl.behave.zoom_level,             1,   cmd_zoom_level)},
 +    { "font_size",              PTR_V_INT(uzbl.behave.font_size,                1,   cmd_font_size)},
 +    { "default_font_family",    PTR_V_STR(uzbl.behave.default_font_family,      1,   cmd_default_font_family)},
 +    { "monospace_font_family",  PTR_V_STR(uzbl.behave.monospace_font_family,    1,   cmd_monospace_font_family)},
 +    { "cursive_font_family",    PTR_V_STR(uzbl.behave.cursive_font_family,      1,   cmd_cursive_font_family)},
 +    { "sans_serif_font_family", PTR_V_STR(uzbl.behave.sans_serif_font_family,   1,   cmd_sans_serif_font_family)},
 +    { "serif_font_family",      PTR_V_STR(uzbl.behave.serif_font_family,        1,   cmd_serif_font_family)},
 +    { "fantasy_font_family",    PTR_V_STR(uzbl.behave.fantasy_font_family,      1,   cmd_fantasy_font_family)},
 +    { "monospace_size",         PTR_V_INT(uzbl.behave.monospace_size,           1,   cmd_font_size)},
 +    { "minimum_font_size",      PTR_V_INT(uzbl.behave.minimum_font_size,        1,   cmd_minimum_font_size)},
 +    { "disable_plugins",        PTR_V_INT(uzbl.behave.disable_plugins,          1,   cmd_disable_plugins)},
 +    { "disable_scripts",        PTR_V_INT(uzbl.behave.disable_scripts,          1,   cmd_disable_scripts)},
 +    { "autoload_images",        PTR_V_INT(uzbl.behave.autoload_img,             1,   cmd_autoload_img)},
 +    { "autoshrink_images",      PTR_V_INT(uzbl.behave.autoshrink_img,           1,   cmd_autoshrink_img)},
 +    { "enable_spellcheck",      PTR_V_INT(uzbl.behave.enable_spellcheck,        1,   cmd_enable_spellcheck)},
 +    { "enable_private",         PTR_V_INT(uzbl.behave.enable_private,           1,   cmd_enable_private)},
 +    { "print_backgrounds",      PTR_V_INT(uzbl.behave.print_bg,                 1,   cmd_print_bg)},
 +    { "stylesheet_uri",         PTR_V_STR(uzbl.behave.style_uri,                1,   cmd_style_uri)},
 +    { "resizable_text_areas",   PTR_V_INT(uzbl.behave.resizable_txt,            1,   cmd_resizable_txt)},
 +    { "default_encoding",       PTR_V_STR(uzbl.behave.default_encoding,         1,   cmd_default_encoding)},
 +    { "enforce_96_dpi",         PTR_V_INT(uzbl.behave.enforce_96dpi,            1,   cmd_enforce_96dpi)},
 +    { "caret_browsing",         PTR_V_INT(uzbl.behave.caret_browsing,           1,   cmd_caret_browsing)},
  
    /* constants (not dumpable or writeable) */
 -    { "WEBKIT_MAJOR",        PTR_C_INT(uzbl.info.webkit_major,                 NULL)},
 -    { "WEBKIT_MINOR",        PTR_C_INT(uzbl.info.webkit_minor,                 NULL)},
 -    { "WEBKIT_MICRO",        PTR_C_INT(uzbl.info.webkit_micro,                 NULL)},
 -    { "ARCH_UZBL",           PTR_C_STR(uzbl.info.arch,                         NULL)},
 -    { "COMMIT",              PTR_C_STR(uzbl.info.commit,                       NULL)},
 -    { "LOAD_PROGRESS",       PTR_C_INT(uzbl.gui.sbar.load_progress,            NULL)},
 -    { "LOAD_PROGRESSBAR",    PTR_C_STR(uzbl.gui.sbar.progress_bar,             NULL)},
 -    { "TITLE",               PTR_C_STR(uzbl.gui.main_title,                    NULL)},
 -    { "SELECTED_URI",        PTR_C_STR(uzbl.state.selected_url,                NULL)},
 -    { "MODE",                PTR_C_STR(uzbl.gui.sbar.mode_indicator,           NULL)},
 -    { "NAME",                PTR_C_STR(uzbl.state.instance_name,               NULL)},
 -
 -    { NULL,                  {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}}
 +    { "WEBKIT_MAJOR",           PTR_C_INT(uzbl.info.webkit_major,                    NULL)},
 +    { "WEBKIT_MINOR",           PTR_C_INT(uzbl.info.webkit_minor,                    NULL)},
 +    { "WEBKIT_MICRO",           PTR_C_INT(uzbl.info.webkit_micro,                    NULL)},
 +    { "ARCH_UZBL",              PTR_C_STR(uzbl.info.arch,                            NULL)},
 +    { "COMMIT",                 PTR_C_STR(uzbl.info.commit,                          NULL)},
 +    { "LOAD_PROGRESS",          PTR_C_INT(uzbl.gui.sbar.load_progress,               NULL)},
 +    { "LOAD_PROGRESSBAR",       PTR_C_STR(uzbl.gui.sbar.progress_bar,                NULL)},
 +    { "TITLE",                  PTR_C_STR(uzbl.gui.main_title,                       NULL)},
 +    { "SELECTED_URI",           PTR_C_STR(uzbl.state.selected_url,                   NULL)},
 +    { "MODE",                   PTR_C_STR(uzbl.gui.sbar.mode_indicator,              NULL)},
 +    { "NAME",                   PTR_C_STR(uzbl.state.instance_name,                  NULL)},
 +
 +    { NULL,                     {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}}
- }, *n2v_p = var_name_to_ptr;
+ };
  
  
  const struct {
diff --cc uzbl.h
Simple merge