Add current_window function in plugin API, add window functions in english developer guide

src/plugins/aspell/weechat-aspell-config.c

@@ -107,7 +107,7 @@ weechat_aspell_config_change_default_dict (void *data,
     (void) data;
     (void) option;
     
-    weechat_aspell_create_spellers (weechat_current_buffer);
+    weechat_aspell_create_spellers (weechat_current_buffer ());
 }
 
 /*
@@ -122,7 +122,7 @@ weechat_aspell_config_dict_change (void *data,
     (void) data;
     (void) option;
     
-    weechat_aspell_create_spellers (weechat_current_buffer);
+    weechat_aspell_create_spellers (weechat_current_buffer ());
 }
 
 /*
@@ -141,7 +141,7 @@ weechat_aspell_config_dict_delete_option (void *data,
     (void) section;
     
     weechat_config_option_free (option);
-    weechat_aspell_create_spellers (weechat_current_buffer);
+    weechat_aspell_create_spellers (weechat_current_buffer ());
     
     return WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED;
 }
@@ -209,7 +209,7 @@ weechat_aspell_config_dict_create_option (void *data,
                         option_name, value);
     }
     else
-        weechat_aspell_create_spellers (weechat_current_buffer);
+        weechat_aspell_create_spellers (weechat_current_buffer ());
     
     return rc;
 }

src/plugins/aspell/weechat-aspell.c

@@ -970,7 +970,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     weechat_hook_modifier ("weechat_input_text_display",
                            &weechat_aspell_modifier_cb, NULL);
     
-    weechat_aspell_create_spellers (weechat_current_buffer);
+    weechat_aspell_create_spellers (weechat_current_buffer ());
     
     return WEECHAT_RC_OK;
 }

src/plugins/fifo/fifo.c

@@ -185,7 +185,7 @@ fifo_exec (const char *text)
     if (text2[0] == '*')
     {
         pos_msg = text2 + 1;
-        ptr_buffer = weechat_current_buffer;
+        ptr_buffer = weechat_current_buffer ();
     }
     else
     {

src/plugins/irc/irc-bar-item.c

@@ -52,7 +52,7 @@ irc_bar_item_buffer_title (void *data, struct t_gui_bar_item *item,
     (void) max_height;
     
     if (!window)
-        window = weechat_current_window;
+        window = weechat_current_window ();
     
     buffer = weechat_window_get_pointer (window, "buffer");
     
@@ -93,7 +93,7 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
     (void) max_height;
     
     if (!window)
-        window = weechat_current_window;
+        window = weechat_current_window ();
     
     buf_name[0] = '\0';
     modes[0] = '\0';
@@ -251,7 +251,7 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item,
     (void) max_height;
     
     if (!window)
-        window = weechat_current_window;
+        window = weechat_current_window ();
     
     buffer = weechat_window_get_pointer (window, "buffer");
     

src/plugins/scripts/lua/weechat-lua-api.c

@@ -3748,7 +3748,7 @@ weechat_lua_api_current_buffer (lua_State *L)
         LUA_RETURN_EMPTY;
     }
     
-    result = script_ptr2str (weechat_current_buffer);
+    result = script_ptr2str (weechat_current_buffer ());
     
     LUA_RETURN_STRING_FREE(result);
 }
@@ -3984,6 +3984,29 @@ weechat_lua_api_buffer_set (lua_State *L)
     LUA_RETURN_OK;
 }
 
+/*
+ * weechat_lua_api_current_window: get current window
+ */
+
+static int
+weechat_lua_api_current_window (lua_State *L)
+{
+    char *result;
+    
+    /* make C compiler happy */
+    (void) L;
+    
+    if (!lua_current_script)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("current_window");
+        LUA_RETURN_EMPTY;
+    }
+    
+    result = script_ptr2str (weechat_current_window ());
+    
+    LUA_RETURN_STRING_FREE(result);
+}
+
 /*
  * weechat_lua_api_window_get_integer: get a window property as integer
  */
@@ -5893,6 +5916,7 @@ const struct luaL_reg weechat_lua_api_funcs[] = {
     { "buffer_get_string", &weechat_lua_api_buffer_get_string },
     { "buffer_get_pointer", &weechat_lua_api_buffer_get_pointer },
     { "buffer_set", &weechat_lua_api_buffer_set },
+    { "current_window", &weechat_lua_api_current_window },
     { "window_get_integer", &weechat_lua_api_window_get_integer },
     { "window_get_string", &weechat_lua_api_window_get_string },
     { "window_get_pointer", &weechat_lua_api_window_get_pointer },

src/plugins/scripts/perl/weechat-perl-api.c

@@ -3173,7 +3173,7 @@ static XS (XS_weechat_api_current_buffer)
 	PERL_RETURN_EMPTY;
     }
     
-    result = script_ptr2str (weechat_current_buffer);
+    result = script_ptr2str (weechat_current_buffer ());
     
     PERL_RETURN_STRING_FREE(result);
 }
@@ -3364,6 +3364,30 @@ static XS (XS_weechat_api_buffer_set)
     PERL_RETURN_OK;
 }
 
+/*
+ * weechat::current_window: get current window
+ */
+
+static XS (XS_weechat_api_current_window)
+{
+    char *result;
+    dXSARGS;
+    
+    /* make C compiler happy */
+    (void) items;
+    (void) cv;
+    
+    if (!perl_current_script)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("current_window");
+	PERL_RETURN_EMPTY;
+    }
+    
+    result = script_ptr2str (weechat_current_window ());
+    
+    PERL_RETURN_STRING_FREE(result);
+}
+
 /*
  * weechat::window_get_integer: get a window property as integer
  */
@@ -4633,6 +4657,7 @@ weechat_perl_api_init (pTHX)
     newXS ("weechat::buffer_get_string", XS_weechat_api_buffer_get_string, "weechat");
     newXS ("weechat::buffer_get_pointer", XS_weechat_api_buffer_get_pointer, "weechat");
     newXS ("weechat::buffer_set", XS_weechat_api_buffer_set, "weechat");
+    newXS ("weechat::current_window", XS_weechat_api_current_window, "weechat");
     newXS ("weechat::window_get_integer", XS_weechat_api_window_get_integer, "weechat");
     newXS ("weechat::window_get_string", XS_weechat_api_window_get_string, "weechat");
     newXS ("weechat::window_get_pointer", XS_weechat_api_window_get_pointer, "weechat");

src/plugins/scripts/python/weechat-python-api.c

@@ -3365,7 +3365,7 @@ weechat_python_api_current_buffer (PyObject *self, PyObject *args)
         PYTHON_RETURN_EMPTY;
     }
     
-    result = script_ptr2str (weechat_current_buffer);
+    result = script_ptr2str (weechat_current_buffer ());
     
     PYTHON_RETURN_STRING_FREE(result);
 }
@@ -3569,6 +3569,31 @@ weechat_python_api_buffer_set (PyObject *self, PyObject *args)
     PYTHON_RETURN_OK;
 }
 
+/*
+ * weechat_python_api_current_window: get current window
+ */
+
+static PyObject *
+weechat_python_api_current_window (PyObject *self, PyObject *args)
+{
+    char *result;
+    PyObject *object;
+    
+    /* make C compiler happy */
+    (void) self;
+    (void) args;
+    
+    if (!python_current_script)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("current_window");
+        PYTHON_RETURN_EMPTY;
+    }
+    
+    result = script_ptr2str (weechat_current_window ());
+    
+    PYTHON_RETURN_STRING_FREE(result);
+}
+
 /*
  * weechat_python_api_window_get_integer get a window property as integer
  */
@@ -4922,6 +4947,7 @@ PyMethodDef weechat_python_funcs[] =
     { "buffer_get_string", &weechat_python_api_buffer_get_string, METH_VARARGS, "" },
     { "buffer_get_pointer", &weechat_python_api_buffer_get_pointer, METH_VARARGS, "" },
     { "buffer_set", &weechat_python_api_buffer_set, METH_VARARGS, "" },
+    { "current_window", &weechat_python_api_current_window, METH_VARARGS, "" },
     { "window_get_integer", &weechat_python_api_window_get_integer, METH_VARARGS, "" },
     { "window_get_string", &weechat_python_api_window_get_string, METH_VARARGS, "" },
     { "window_get_pointer", &weechat_python_api_window_get_pointer, METH_VARARGS, "" },

src/plugins/scripts/ruby/weechat-ruby-api.c

@@ -3850,7 +3850,7 @@ weechat_ruby_api_current_buffer (VALUE class)
         RUBY_RETURN_EMPTY;
     }
     
-    result = script_ptr2str (weechat_current_buffer);
+    result = script_ptr2str (weechat_current_buffer ());
     
     RUBY_RETURN_STRING_FREE(result);
 }
@@ -4078,6 +4078,30 @@ weechat_ruby_api_buffer_set (VALUE class, VALUE buffer, VALUE property,
     RUBY_RETURN_OK;
 }
 
+/*
+ * weechat_ruby_api_current_window: get current window
+ */
+
+static VALUE
+weechat_ruby_api_current_window (VALUE class)
+{
+    char *result;
+    VALUE return_value;
+    
+    /* make C compiler happy */
+    (void) class;
+    
+    if (!ruby_current_script)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("current_window");
+        RUBY_RETURN_EMPTY;
+    }
+    
+    result = script_ptr2str (weechat_current_window ());
+    
+    RUBY_RETURN_STRING_FREE(result);
+}
+
 /*
  * weechat_ruby_api_window_get_integer: get a window property as integer
  */
@@ -5653,6 +5677,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
     rb_define_module_function (ruby_mWeechat, "buffer_get_string", &weechat_ruby_api_buffer_get_string, 2);
     rb_define_module_function (ruby_mWeechat, "buffer_get_pointer", &weechat_ruby_api_buffer_get_pointer, 2);
     rb_define_module_function (ruby_mWeechat, "buffer_set", &weechat_ruby_api_buffer_set, 3);
+    rb_define_module_function (ruby_mWeechat, "current_window", &weechat_ruby_api_current_window, 0);
     rb_define_module_function (ruby_mWeechat, "window_get_integer", &weechat_ruby_api_window_get_integer, 2);
     rb_define_module_function (ruby_mWeechat, "window_get_string", &weechat_ruby_api_window_get_string, 2);
     rb_define_module_function (ruby_mWeechat, "window_get_pointer", &weechat_ruby_api_window_get_pointer, 2);

src/plugins/scripts/tcl/weechat-tcl-api.c

@@ -3605,7 +3605,7 @@ weechat_tcl_api_current_buffer (ClientData clientData, Tcl_Interp *interp,
 	TCL_RETURN_EMPTY;
     }
     
-    result = script_ptr2str (weechat_current_buffer);
+    result = script_ptr2str (weechat_current_buffer ());
     
     TCL_RETURN_STRING_FREE(result);
 }
@@ -3818,6 +3818,33 @@ weechat_tcl_api_buffer_set (ClientData clientData, Tcl_Interp *interp,
     TCL_RETURN_OK;
 }
 
+/*
+ * weechat_tcl_api_current_window: get current window
+ */
+
+static int
+weechat_tcl_api_current_window (ClientData clientData, Tcl_Interp *interp,
+                                int objc, Tcl_Obj *CONST objv[])
+{
+    Tcl_Obj *objp;
+    char *result;
+    
+    /* make C compiler happy */
+    (void) clientData;
+    (void) objc;
+    (void) objv;
+    
+    if (!tcl_current_script)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("current_window");
+	TCL_RETURN_EMPTY;
+    }
+    
+    result = script_ptr2str (weechat_current_window ());
+    
+    TCL_RETURN_STRING_FREE(result);
+}
+
 /*
  * weechat_tcl_api_window_get_integer: get a window property as integer
  */
@@ -5378,6 +5405,8 @@ void weechat_tcl_api_init (Tcl_Interp *interp) {
                           weechat_tcl_api_buffer_get_pointer, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
     Tcl_CreateObjCommand (interp,"weechat::buffer_set",
                           weechat_tcl_api_buffer_set, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+    Tcl_CreateObjCommand (interp,"weechat::current_window",
+                          weechat_tcl_api_current_window, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
     Tcl_CreateObjCommand (interp,"weechat::window_get_integer",
                           weechat_tcl_api_window_get_integer, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
     Tcl_CreateObjCommand (interp,"weechat::window_get_string",

src/plugins/weechat-plugin.h

@@ -930,7 +930,7 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
                                __close_callback, __close_callback_data)
 #define weechat_buffer_search(__plugin, __name)                         \
     weechat_plugin->buffer_search(__plugin, __name)
-#define weechat_current_buffer                                          \
+#define weechat_current_buffer()                                        \
     weechat_plugin->buffer_search(NULL, NULL)
 #define weechat_buffer_clear(__buffer)                                  \
     weechat_plugin->buffer_clear(__buffer)
@@ -956,7 +956,7 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
     weechat_plugin->window_get_string(__window, __property)
 #define weechat_window_get_pointer(__window, __property)                \
     weechat_plugin->window_get_pointer(__window, __property)
-#define weechat_current_window                                          \
+#define weechat_current_window()                                        \
     weechat_plugin->window_get_pointer(NULL, "current")
 
 /* nicklist */