Commit Graph

58 Commits

Author SHA1 Message Date
Ilia Maslakov
3b5e2c052f Merge branch 'utf-8' into master
resolve conflicts:
	configure.ac
	src/complete.c
	src/file.c
	src/layout.c
	src/main.c
	src/menu.c
	src/screen.c
	src/util.c
	src/widget.c
	src/widget.h
2009-04-04 19:50:46 +00:00
Patrick Winnertz
ae987b923e Reverted the use of bool in favour of gboolean
Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:46:07 +01:00
Patrick Winnertz
5920d13810 First bunch of reverting stuff from mhl to switch back to glib
This removes the usage of stdbool.h in favour of mhl/tyes.h as we have to revert everything one by one

Signed-off-by: Patrick Winnertz <winnie@debian.org>
2009-02-05 23:09:37 +01:00
Enrico Weigelt, metux IT service
0c97636212 fixed #240 2009-02-04 01:11:56 +01:00
Enrico Weigelt, metux IT service
45964f373b replaced gboolean by bool (from mhl/types.h) 2009-02-02 05:07:56 +01:00
Sergei Trofimovich
60d8c1d615 completion: fixed completion of escaped commands in commandline
Changes:
 * added new flag: INPUT_COMPLETE_SHELL_ESC - forces
   filename completion return escaped names
 * cleaned up src/complete.c: removed global variables in
   favour of completion flags. Code changed respectively.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-01-31 21:46:32 +02:00
Sergei Trofimovich
455f2dbd66 complete: cleanup: #define to enum INPUT_COMPLETION_FLAGS
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-01-29 21:13:30 +02:00
Enrico Weigelt, metux IT service
7639b364af added a new parameter for completion flags to input_new 2009-01-29 19:17:43 +01:00
Slava Zanko
7f71be0d63 patches by Rostislav Beneš: mc-06-input
in input widget I made a lot of changes:
    1. rename some members in WInput to reflect more their functions
       (field_len -> field_width, ...)
    2. buffer for reading multibytes characters - charbuf, (taken from UTF-8
       patch)
    3. modified insert_char to accept mulstibytes characters, drawing changed
    4. works only with valid strings, str_fix_string used to assure that
       input->buffer is valid

changes in complete.c:
    - some iteration strings with ++/-- replaced with str_next_char,
    str_prev_char, where was needed. ++ was offset oriented, but str_next_char
    use directly referecne (char *), so result is not extra beatiful in every
     cases
    - other buffer for multibytes characters
    - complete only valid filenames
2009-01-26 11:46:31 +02:00
Slava Zanko
9450950fd4 patches by Rostislav Beneš: mc-05-check
very similar to button, for text used hotkey_t and changed drawning and
handling hotkey
2009-01-26 11:46:31 +02:00
Slava Zanko
8d6efd4cd0 patches by Rostislav Beneš: mc-04-radio
all options of radio box are stored in an array of hotkey_t, so radio box has own
copy of options now (in original mc has only a reference to options), changed
drawing and handling hotkey
2009-01-26 11:46:31 +02:00
Slava Zanko
9810380e9a patches by Rostislav Beneš: mc-03-button
text of button stored in hotkey_t instead of char*, modified achown.c, because
access directly button text, change in drawing button adn handling hotkey
2009-01-26 11:46:31 +02:00
Slava Zanko
55be4b67cb patches by Rostislav Beneš: mc-02-hotkey
add new structure hotkey_t for storings caption with hotkey in buttons, menus,...
contains three strings - start, hotkey, end. So hotkey could be any characters,
but mc's message handles works correct only with ascii characters.
for me is working with hotkey_t easier than how are stored hotkeys in original
mc.
2009-01-26 11:46:31 +02:00
Pavel Tsekov
9df32b5790 * src/widget.h: Define new mode for listbox insertion.
* src/widget.c (listbox_append_item): Implement LISTBOX_APPEND_SORTED
by insertsort.
* src/chown.c (init_chown): Use LISTBOX_APPEND_SORTED for user and
group list.
* src/achown.c (do_enter_key): Likewise.
2007-09-24 13:38:48 +00:00
Pavel Tsekov
049352e884 * src/widget.h (struct WRadio): Remove unused field
`upper_letter_is_hotkey'.
(radio_new): Remove the last argument from the function
declaration - it is unused.
* src/widget.c (radio_new): Remove the last argument from the
function declaration - it is unused.
* src/boxes.c: Adjust all callers to reflect the changes above.
* src/layout.c: Likewise.
* src/listmode.c: Likewise.
* src/option.c: Likewise.
* src/wtools.c: Likewise.
2006-02-28 16:15:21 +00:00
Roland Illig
6bf747eccf * widget.h (struct WButtonBar): Moved into widget.c.
* widget.c (struct WButtonBar): Moved from widget.h.
	* boxes.c: Don't dereference WButtonBar.
	* help.c: Likewise.
	* layout.c: Likewise.
	* view.c: Likewise.
2005-06-14 13:02:30 +00:00
Roland Illig
468ab7a3cd * widget.c: Added code to handle multiple types of functions for
commands.
	* widget.h: Likewise.
2005-06-14 12:11:38 +00:00
Roland Illig
160686b6a8 void
buttonbar_clear_label (Dlg_head *h, int idx)
{
    WButtonBar *bb = find_buttonbar (h);

    if (!bb)
	return;

    set_label_text (bb, idx, "");
    bb->labels[idx - 1].tag = BBFUNC_NONE;
}
2005-06-14 11:30:26 +00:00
Roland Illig
0fea1df332 * widget.h: Fixed prototype of input_callback(). 2005-05-24 11:50:12 +00:00
Pavel Roskin
c90d263d2c * .c: Sanitize all calls to functions from ctype.h. Fix gcc 4.0
warnings.
2005-05-11 01:16:58 +00:00
Roland Illig
a580664255 * Removed transition support macros. 2005-02-08 09:58:40 +00:00
Roland Illig
77391f3981 * widget.h: Renamed define_label to buttonbar_set_label. Renamed
define_label_data to buttonbar_set_label_data. Renamed
	redraw_labels to buttonbar_redraw. Provided compatibility macros
	to enable a smooth transition between the old and the new names.
	* widget.c: Likewise.
2005-02-08 09:40:52 +00:00
Roland Illig
d8e27971ae * widget.h: Moved constants to the appropriate places (just
before the variable they will be used with).
	* widget.c: HISTORY_FILE_NAME was not needed in widget.h,
	so it has been made private to this file.
2005-02-08 06:28:34 +00:00
Roland Illig
e6a4ffaba1 * widget.h: Added a new function button_get_text.
* widget.c: Likewise.
2005-02-06 23:08:02 +00:00
Roland Illig
e792cffb8d * *.h: Renamed multiple inclusion guards that started with a
double underscore. Added #includes for dependent files.
	* popt.c: Likewise.
	* popthelp.c: Likewise.
	* tree.c: Moved a macro from tree.h to here, as it is useless
	outside tree.c.
2004-12-03 19:17:46 +00:00
Roland Illig
243e84706e * Code cleanup: Added const qualifier for variables and
function declarations where possible. No functional changes.
2004-08-29 18:45:56 +00:00
Roland Illig
8458240147 * Code cleanup: Added const qualifier for variables and
function declarations where possible. No functional changes.
2004-08-29 16:42:40 +00:00
Roland Illig
207f7d126c Even more const-ification. 2004-08-17 00:00:32 +00:00
Roland Illig
b08778c9c6 Made the data type of some variables more appropriate. 2004-08-16 04:17:43 +00:00
Pavel Roskin
fce80af570 * widget.[ch] (listbox_search_text): Constify "text" argument.
(listbox_add_item): Ditto.

* find.c (add_to_list): Make inline.
(stop_idle): Ditto.
(status_update): Ditto.
(get_list_info): Ditto.

(push_directory): Constify "dir" argument and use
concat_dir_and_file() instead of g_strdup().

(find_add_match): Constify "dir" and "file" arguments.
(insert_file): Ditto. Don't append trailing PATH_SEP, it's done
in push_directory().

(search_content): Constify "directory" and "filename" arguments.
(do_search): Make "directory" char * instead of char[].
2003-10-30 16:43:22 +00:00
Pavel Roskin
98950838b4 * dlg.h: Merge with ...
* dialog.h: ... this.  Adjust all dependencies.
* dlg.c: Merge with ...
* dialog.c: ... this.
* Makefile.am (SRCS): Remove dlg.h and dlg.c.
2003-10-24 23:20:30 +00:00
Pavel Roskin
e355e25b56 * dlg.h: Use cb_ret_t and widget_msg_t in widget callbacks.
Massive adjustment for the above.
2003-09-10 22:48:54 +00:00
Pavel Roskin
af893babbd * widget.c: Implement new widget - groupbox.
* option.c: Use it.
2003-09-07 22:42:22 +00:00
Pavel Roskin
c757bbeda1 * widget.h: Define type bcback for button callbacks. 2003-09-01 08:16:08 +00:00
Pavel Roskin
f8e00e7b6a * widget.c (listbox_new): Remove "action" argument. Listboxes
without callbacks default to closing the dialog.  Adjust all
users.  This fixes double click on completion listbox.
* widget.h: Use uppercase names for the return values of the
listbox callback.
2003-09-01 07:31:56 +00:00
Pavel Roskin
bd4a76ebb3 * widget.h: Eliminate listbox_cback. Call listbox callback
whenever it's defined.  Adjust all users.
2003-09-01 05:58:38 +00:00
Pavel Roskin
58545e65c2 * widget.h: Use exact type in the listbox callback. Adjust all
legitimate users, remove all unused callbacks.
2003-09-01 05:43:20 +00:00
Pavel Roskin
2b9b18150e * widget.h (button_new): Remove unused extra argument. Adjust
all dependencies.
2003-09-01 02:07:02 +00:00
Pavel Roskin
fab6e8a493 * widget.h: Completely get rid of tkname. Rename it to histname
for the input widget.  Adjust all dependencies.
2003-09-01 00:18:37 +00:00
Pavel Roskin
10f65ac83d * dlg.h (struct Widget): Remove tkname field.
(init_widget): Remove tkname argument.
* widget.h (listbox_new): Likewise.
Adjust all dependencies.
2003-08-31 23:29:49 +00:00
Pavel Roskin
89e5cc319e * panel.h: Convert directory history to GList.
* widget.h: Convert input history to GList.
Adjust all dependencies.
2003-02-18 05:25:45 +00:00
Pavel Roskin
31f491b01e * dlg.h: Remove Dlg_head argument from callback_fn - it's
excessive and can be trivially derived from the widget.
(default_proc): Remove Dlg_head argument.  Change all callers.
* widget.c (listbox_draw): Remove Dlg_head argument.
2002-11-13 02:27:00 +00:00
Pavel Roskin
eb53b3e975 * dlg.c (widget_redraw): Remove.
* widget.c (find_buttonbar): Use find_widget_type().  Make
global.
(define_label): Remove paneletc argument.  Change all callers.
(define_label_data): Likewise.
(redraw_labels): Likewise.  Use find_buttonbar().
* view.c (view_adjust_size): Use find_buttonbar().
2002-11-12 23:33:15 +00:00
Pavel Roskin
e0194b11a0 * dlg.h: Move movefn definition ...
* win.h: ... where it's used.  Remove unused definitions.
* win.c: Remove unused code.
* key.h: Include mouse.h, don't rely on others doing it.
* widget.h: Include dlg.h.  Remove Tk-only fields.
* widget.c: Remove Tk-only fields.
2002-11-11 07:12:03 +00:00
Pavel Roskin
e917b70e56 * panel.h: Simplify interdependencies between headers. Use
forward declarations for structures.
* widget.h: Declare struct WListbox.
* wtools.h: Use forward declaration for struct WListbox to avoid
dependency on widget.h.
2002-11-11 06:23:59 +00:00
Pavel Roskin
f6f02a0295 * command.c: Make `command' a standard WInput widget, just
change its callback.  Eliminate input_w().  Adjust all
dependencies.
* widget.c (input_callback): Remove static attribute.
2002-09-20 19:36:55 +00:00
Pavel Roskin
2f9416892a * widget.c: Make more functions static. 2002-08-21 21:47:29 +00:00
Pavel Roskin
8e085b98fd * widget.h: Use type "buttonbarfn" more consistently.
* widget.c: Likewise.
2001-10-01 06:31:40 +00:00
Pavel Roskin
9b00e32f64 * view.c: Cleanup of preprocessor directives.
* view.h: Likewise.
* widget.c: Likewise.
* widget.h: Likewise.
2001-09-16 01:22:12 +00:00
Andrew V. Samoilov
8611daeb0c * widget.[ch] (label_new): Make text parameter const. 2001-07-31 11:04:21 +00:00