core: return empty string for window and buffer pointers in focus hashtable when value is N/A

This commit is contained in:
Sebastien Helleu 2011-08-14 18:03:29 +02:00
parent 84d097a022
commit 1ca036e8d9
5 changed files with 17 additions and 10 deletions

View File

@ -8278,9 +8278,9 @@ Content of hashtable sent to callback (keys and values are of type "string"):
| _x | column on screen 2+| "0" ... "n"
| _y | line on screen 2+| "0" ... "n"
| _key | key or mouse event 2+| "button1", "button2-gesture-left", ...
| _window | pointer to window | "0x12345678" | "0x0"
| _window | pointer to window | "0x12345678" | ""
| _window_number | number of window | "1" ... "n" | "*"
| _buffer | pointer to buffer | "0x12345678" | "0x0"
| _buffer | pointer to buffer | "0x12345678" | ""
| _buffer_number | number of buffer | "1" ... "n" | "-1"
| _buffer_plugin | plugin name of buffer | "core", "irc", ... | ""
| _buffer_name | name of buffer | "weechat", "freenode.#weechat", ... | ""

View File

@ -8415,9 +8415,9 @@ Contenu de la hashtable envoyée au "callback" (les clés et valeurs sont de typ
| _x | colonne sur l'écran 2+| "0" ... "n"
| _y | ligne sur l'écran 2+| "0" ... "n"
| _key | touche ou évènement souris 2+| "button1", "button2-gesture-left", ...
| _window | pointeur vers la fenêtre | "0x12345678" | "0x0"
| _window | pointeur vers la fenêtre | "0x12345678" | ""
| _window_number | numéro de la fenêtre | "1" ... "n" | "*"
| _buffer | pointeur vers le tampon | "0x12345678" | "0x0"
| _buffer | pointeur vers le tampon | "0x12345678" | ""
| _buffer_number | numéro du tampon | "1" ... "n" | "-1"
| _buffer_plugin | nom d'extension du tampon | "core", "irc", ... | ""
| _buffer_name | nom du tampon | "weechat", "freenode.#weechat", ... | ""

View File

@ -8335,9 +8335,9 @@ Content of hashtable sent to callback (keys and values are of type "string"):
| _x | column on screen 2+| "0" ... "n"
| _y | line on screen 2+| "0" ... "n"
| _key | key or mouse event 2+| "button1", "button2-gesture-left", ...
| _window | pointer to window | "0x12345678" | "0x0"
| _window | pointer to window | "0x12345678" | ""
| _window_number | number of window | "1" ... "n" | "*"
| _buffer | pointer to buffer | "0x12345678" | "0x0"
| _buffer | pointer to buffer | "0x12345678" | ""
| _buffer_number | number of buffer | "1" ... "n" | "-1"
| _buffer_plugin | plugin name of buffer | "core", "irc", ... | ""
| _buffer_name | name of buffer | "weechat", "freenode.#weechat", ... | ""

View File

@ -1475,7 +1475,7 @@ gui_bar_item_focus_buffer_nicklist (void *data,
window = (struct t_gui_window *)value;
if (!window)
window = gui_current_window;
return NULL;
error = NULL;
bar_item_line = (int) strtol (str_bar_item_line, &error, 10);

View File

@ -52,9 +52,16 @@
snprintf (str_value, sizeof (str_value), "%ld", __time); \
hashtable_set (hashtable, __name, str_value);
#define FOCUS_PTR(__name, __pointer) \
snprintf (str_value, sizeof (str_value), \
"0x%lx", (long unsigned int)__pointer); \
hashtable_set (hashtable, __name, str_value);
if (__pointer) \
{ \
snprintf (str_value, sizeof (str_value), \
"0x%lx", (long unsigned int)__pointer); \
hashtable_set (hashtable, __name, str_value); \
} \
else \
{ \
hashtable_set (hashtable, __name, ""); \
}
/*