1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

552 Commits

Author SHA1 Message Date
James Booth
448c91af61 Fixed merge 2015-03-15 01:30:27 +00:00
James Booth
8c552e8a70 Merge branch 'master' into xep-0184 2015-03-15 01:27:09 +00:00
James Booth
49022068ef Added OTR error messages 2015-03-15 01:26:09 +00:00
James Booth
ca30ff3910 Merge branch 'master' into xep-0184
Conflicts:
	src/server_events.c
	src/ui/core.c
	src/ui/ui.h
	tests/ui/stub_ui.c
2015-03-14 23:10:51 +00:00
James Booth
385336c10b Don't switch window on sent carbon 2015-03-14 22:59:49 +00:00
James Booth
1014244408 Use colouring for message receipts 2015-03-14 16:05:13 +00:00
James Booth
bc6e32175d Removed from argument from outgoing message functions 2015-03-14 14:50:45 +00:00
James Booth
6fd5b617ef Renamed win_save_newline -> win_newline 2015-03-14 14:16:50 +00:00
James Booth
b84bddc46b Renamed win_save_println -> win_println 2015-03-14 14:14:46 +00:00
James Booth
e02dbe24da Renamed win_save_print -> win_print 2015-03-14 14:12:32 +00:00
James Booth
f4441ec64f Renamed win_save_vprint -> win_vprint 2015-03-14 14:10:10 +00:00
James Booth
57c7564445 Show message received text for receipts 2015-03-11 23:47:11 +00:00
James Booth
78becceedb Added basic delivery receipts 2015-03-11 23:18:28 +00:00
James Booth
7454bede8b Merge branch 'master' into readline 2015-02-23 00:50:58 +00:00
Christian Storm
a1d14c4526 Fixed spelling. 2015-02-17 10:52:37 +01:00
James Booth
b24510c776 Merge branch 'master' into readline
Conflicts:
	src/tools/history.c
	src/tools/history.h
2015-02-11 00:09:58 +00:00
James Booth
b3be26a214 Updated copyright 2015-02-10 23:16:09 +00:00
James Booth
a70aa0255f Moved command processing to main loop, allow resize during password prompt 2015-02-05 00:58:23 +00:00
James Booth
30180ac8bb Move SIGWINCH handling to ui/core.c, ignore signal whilst resizing 2015-02-04 23:35:28 +00:00
James Booth
1c157b04df Fixed arrow keys with debug 2015-02-02 23:17:47 +00:00
James Booth
5954c0d2fe Readline osx compatibility 2015-02-02 21:27:58 +00:00
James Booth
372cf822cb Merge branch 'master' into readline 2015-02-01 20:47:28 +00:00
James Booth
84688c063e Removed commented code, renamed win switch handlers 2015-01-31 22:12:27 +00:00
James Booth
28dd545877 Added paging handlers 2015-01-31 22:00:22 +00:00
James Booth
e6f27de552 Added SIGWINCH handler 2015-01-31 18:02:42 +00:00
James Booth
b3448eb265 Moved input blocking code to inputwin.c 2015-01-31 01:11:41 +00:00
James Booth
e161337b7f Debug input block 2015-01-31 00:31:08 +00:00
James Booth
a9ed64911d Removed history and various key handlers 2015-01-30 23:42:51 +00:00
James Booth
83bd207316 Moved readline code to inputwin.c 2015-01-30 23:28:02 +00:00
James Booth
9800a46adb Fixed compile error when no OTR support 2015-01-28 00:04:37 +00:00
James Booth
2cdbfc7eb7 Added gnu readline 2015-01-27 22:13:09 +00:00
James Booth
2ed78fe5af Extracted keyhandler for printable characters 2015-01-20 00:09:47 +00:00
James Booth
4c6cfcdca0 Simplified autocompleters and command history 2015-01-16 22:50:40 +00:00
James Booth
f0ffc31cd6 Renamed inp_get_char->inp_read 2015-01-15 23:46:54 +00:00
James Booth
51105720ab Moved input line to inputwin 2015-01-15 23:43:22 +00:00
James Booth
65fc4bcd9f Pass pointers to inp_get_char 2015-01-15 23:29:48 +00:00
James Booth
22e9be4a5f Renamed input->line 2015-01-15 22:55:54 +00:00
James Booth
ad896ef201 Moved input size to inputwin 2015-01-15 22:51:05 +00:00
James Booth
82c986775d Moved input to ui module, renamed ui_readline 2015-01-15 22:21:24 +00:00
James Booth
5be47cc5a9 Moved input size variable to ui module 2015-01-15 13:22:54 +00:00
James Booth
40f91de7a3 Moved string termination out of main loop 2015-01-15 01:27:24 +00:00
James Booth
aec1484806 Removed ch from main loop 2015-01-15 01:21:24 +00:00
James Booth
0007e3569e Moved remimder notification code out of main loop 2015-01-15 00:42:40 +00:00
James Booth
97aebb6113 Moved win_handle_page to window module 2015-01-15 00:14:12 +00:00
James Booth
db9a2cf0ab Inlined ui_handle_special_keys 2015-01-15 00:02:42 +00:00
James Booth
3984c660b6 Removed result from main loop 2015-01-14 23:57:45 +00:00
James Booth
a6160d52c6 Pass value rather than address of ch during main loop 2015-01-14 23:54:46 +00:00
James Booth
a39ac6cd07 Merge remote-tracking branch 'savar/dynamic_input_block' 2015-01-12 23:41:15 +00:00
Simon Effenberg
34148e2101 adding preference option for dynamic input blocking
/inpblock is now having subcommands 'timeout' and 'dynamic'
with:

/inpblock timeout <milliseconds>

and

/inpblock dynamic <on|off>

Defaults are:

/inpblock timeout 500
/inpblock dynamic on

To get the old behavior specify:

/inpblock timeout 20
/inpblock dynamic off

The dynamic mode will block incrementally after something
should be written to the window or after a key was pressed. So pressing
a key would set the timeout to 0ms and after 10 timeouts to the next
bigger one.

Example (with dynamic mode on):

"/inpblock timeout 50"

timeout series:

10x 0ms
10x 10ms (0ms + 10 times since last keypress)
10x 30ms (10ms + 20 times since last keypress)
*x50ms until next key was pressed or
2015-01-12 11:32:32 +01:00
Simon Effenberg
c7ff3255b8 trying to block (and save cpu power) more dynamically
instead of blocking too long if inpblock is set to something like
500ms the input timeout is not set directly to inpblock but is
increasing dynamically from 0 to inpblock by a little algorithm

FIXME: the call from the win_* method to the ui_input_* method looks
wrong.. this causes a cross reference which shouldn't be
2015-01-12 08:08:07 +01:00
James Booth
0d0ed9b7ca Merge remote-tracking branch 'incertia/exit-title'
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
2015-01-12 01:12:42 +00:00
James Booth
c64484c6ed Renamed titlebar preference 2015-01-12 00:43:42 +00:00
James Booth
13f0166aa0 Only show UI events for chat states when in session 2015-01-11 23:04:22 +00:00
James Booth
c16871d143 Added remaining chat states 2015-01-11 20:20:17 +00:00
James Booth
965e82b350 Added resource override for chat sessions 2015-01-10 21:07:40 +00:00
James Booth
31c0f2ba78 Added preferences for showing resource in titlebar and messages 2015-01-10 19:10:10 +00:00
James Booth
c3ad3c0ba6 Show resource in titlebar and on each message 2015-01-10 18:35:59 +00:00
James Booth
3e1832b02e Renamed resource -> resource_override 2015-01-10 18:17:10 +00:00
James Booth
5e7d2f5f91 Removed chat states from chat_session module, WIP 2015-01-08 00:57:25 +00:00
James Booth
ab963499b5 Log instead of showing error message when chat recipient not found 2015-01-06 21:51:41 +00:00
James Booth
9cb0d52e7d Added removal of chat sessions, only send gone when messages have been exchanged 2015-01-05 23:39:43 +00:00
James Booth
c2dccad818 Create chat session when no resource 2015-01-05 00:48:30 +00:00
James Booth
8326c8b3a2 Refactored chat session handling on sending message 2015-01-04 23:40:10 +00:00
Will Song
30610f7c48 Merge remote-tracking branch 'upstream/master' into exit-title 2015-01-03 12:41:42 -06:00
Will Song
832074de4a
fix tests (hopefully) and use /bin/echo to avoid use of builtin shell commands 2015-01-02 20:05:55 -06:00
James Booth
ad1460626f Use /bin/echo for terminal window title 2015-01-03 01:35:27 +00:00
Will Song
e4e1d5e29b
now using system("echo -ne ...") to print title 2015-01-01 23:02:41 -06:00
James Booth
1a61b4faf4 Changed logging for writing to terminal window title 2015-01-01 22:51:52 +00:00
James Booth
032baa78a1 Use system command to print window title 2014-12-31 01:48:52 +00:00
Will Song
3561ff4d97
set a nice title (instead of empty) on shutdown 2014-12-29 20:05:50 -06:00
James Booth
e7ddff61dc Merge remote-tracking branch 'savar/master' 2014-12-29 16:04:21 +00:00
James Booth
10a3a3a675 Use events for chat sessions 2014-12-29 01:17:59 +00:00
James Booth
4be06c0ae2 Moved chat_session_set_sent from message.c module 2014-12-29 00:31:57 +00:00
Simon Effenberg
d987897c0b fix idle calculation if not using LIBXSS
the inp_get_char was never returning ERR even without getting any input
so the idle timeout stuff was wasting CPU and wasn't working if LIBXSS
wasn't used.
2014-12-23 12:01:31 +01:00
James Booth
9d94ac5c63 Removed function pointers 2014-12-22 22:13:42 +00:00
James Booth
3cbeb7b483 Removed ui_current_set_otr 2014-12-22 00:37:06 +00:00
James Booth
bda98a416e Removed ui_close_current 2014-12-22 00:34:56 +00:00
James Booth
1c71cf0037 Removed functions from windows.c 2014-12-22 00:28:03 +00:00
James Booth
86dc29d8e8 Removed functions from window.c 2014-12-22 00:01:43 +00:00
James Booth
d5dee1632d Moved unread to window subtypes 2014-12-21 23:14:01 +00:00
James Booth
0c1bbb63c0 Added win_get_title 2014-12-21 22:01:56 +00:00
James Booth
9a322a028f Use class instead of base pointer 2014-12-21 19:40:15 +00:00
James Booth
39aae7f548 Removed TODOs 2014-12-20 18:48:35 +00:00
James Booth
6800bf1cad Fixed tests 2014-12-20 18:39:39 +00:00
James Booth
ea267e2017 Refactored all window recipients and types
Tests need fixing
2014-12-20 00:52:35 +00:00
James Booth
0146e62576 Refactoring window types, removing recipient and from references - wip 2014-12-18 23:57:19 +00:00
James Booth
4dc48b4b48 Added occupantswin.c 2014-12-16 23:37:23 +00:00
James Booth
48ec7b3b47 Moved roster functions 2014-12-16 23:00:05 +00:00
James Booth
0e7e931589 Added rosterwin.c 2014-12-16 22:14:15 +00:00
James Booth
0880b217cb Tidied subwin paging 2014-12-16 21:08:48 +00:00
James Booth
630fef015d Added new window and layout types 2014-12-16 01:39:47 +00:00
James Booth
070547a7ff Added window specific creation functions 2014-12-15 00:28:28 +00:00
James Booth
70f7db0d91 Subscription handler uses wins_new_chat 2014-12-11 00:02:51 +00:00
James Booth
8e46b9e75b Added win create functions for chat and private chat 2014-12-10 22:34:33 +00:00
James Booth
9ba5a576ba Split private message handling to separate functions 2014-12-10 22:23:33 +00:00
James Booth
c8ae55a88c Removed unused argument from _wins_show_history 2014-12-10 21:49:21 +00:00
James Booth
742748b05c Renamed chat_resource -> resource 2014-12-10 21:17:31 +00:00
James Booth
706f31422d Moved chat resource to WIN_CHAT type 2014-12-10 01:44:32 +00:00
James Booth
12d0d22ab3 Moved otr properties to WIN_CHAT type 2014-12-10 01:33:46 +00:00
James Booth
7b44ac97cc Added form to WIN_MUC_CONFIG type 2014-12-10 01:14:11 +00:00
James Booth
0ce924465f Added union for window types 2014-12-10 00:54:46 +00:00
James Booth
eeb6e6b8fc Use selected resource for sending messages 2014-12-03 23:36:39 +00:00
James Booth
71ed9ac2d1 Fixed /me messages in chat room history 2014-12-01 13:38:17 +00:00
James Booth
20fa96325d Added [ui] preferences to themes 2014-11-19 23:58:55 +00:00
James Booth
076576178c Update input window on /theme set 2014-11-19 16:32:26 +00:00
James Booth
74d9937573 Changed type to enum for presence colour attributes 2014-11-16 23:37:07 +00:00
James Booth
976e5aac0a Added support for bold theme settings 2014-11-16 21:56:19 +00:00
James Booth
ed4391ec8a Replaced colours with theme_item_t 2014-11-16 20:40:19 +00:00
James Booth
0a7c16747b Fixed freeing lists 2014-11-13 01:01:41 +00:00
James Booth
ada6f5a8b6 Fixed leaks 2014-11-13 00:47:07 +00:00
James Booth
4e429fe788 Implemented /roster by group 2014-11-13 00:22:22 +00:00
James Booth
15d0f679f6 Implemented roster grouped by presence 2014-11-12 23:19:07 +00:00
James Booth
eace543da5 Added /roster show|hide resource 2014-11-11 00:00:10 +00:00
James Booth
f715c0580c Added /roster show|hide offline 2014-11-10 23:51:13 +00:00
James Booth
497b07c1c3 Added /roster show|hide command, only show roster on connect success 2014-11-10 23:23:02 +00:00
James Booth
5d59d17642 Refactor subwin sizing and disabled wrapping 2014-11-10 22:47:53 +00:00
James Booth
04bacdcf38 Order resources in roster, allow paging roster 2014-11-10 01:10:43 +00:00
James Booth
48afa52390 Show resources and only subscribed contacts in roster panel 2014-11-10 00:46:20 +00:00
James Booth
36331e4908 Added simple roster 2014-11-10 00:31:11 +00:00
James Booth
fbda2b4170 Fixed history messages to work with wrapping 2014-11-09 00:36:25 +00:00
James Booth
bcfbc9f7b3 Added time to xmlconsole, handle newlines in messages 2014-11-08 22:35:47 +00:00
James Booth
571db23150 Use message theme settings in chat rooms 2014-11-07 21:05:51 +00:00
James Booth
0bde9a6121 Use message theme setting for regular chat 2014-11-07 20:54:55 +00:00
James Booth
74a2d4601f Removed hash_table_iter usage for room roster 2014-11-03 21:27:41 +00:00
James Booth
c4412fe823 Fixed various memory leaks 2014-11-01 01:48:36 +00:00
James Booth
5fc35bd6a6 Changed room help colour, added whitespace after invalid field setting 2014-10-24 00:21:00 +01:00
James Booth
fa834d003c Added locked messages when joining rooms 2014-10-23 23:58:25 +01:00
James Booth
60e3f91cf6 Removed console message when joining locked rooms 2014-10-23 23:56:31 +01:00
James Booth
272fbf2f0f Updated form field help 2014-10-19 01:27:44 +01:00
James Booth
04a6504689 Remove fields from command autocomplete on form submit/cancel 2014-10-18 23:56:10 +01:00
James Booth
6246c8b940 Add fields to command autocompleter on switch/previous/next 2014-10-18 23:16:19 +01:00
James Booth
bd03bbad73 Moved previous win function 2014-10-18 22:43:47 +01:00
James Booth
fc049c9eef Added /privileges command to set UI option for showing roles/affiliations in rooms 2014-10-18 20:22:34 +01:00
James Booth
0cc25e1b76 Removed debug messages when setting roles/affiliations 2014-10-18 19:19:01 +01:00
James Booth
77674beb7e Show occupants role/affiliation changes 2014-10-18 19:10:50 +01:00
James Booth
67755ca74d Added reason to role/affiliation changes 2014-10-18 01:37:52 +01:00
James Booth
3790b16299 Add output for when both role and affiliation changed at same time 2014-10-18 01:07:25 +01:00
James Booth
9134a65e97 Show occupants role and affiliation when they join a room 2014-10-18 00:52:42 +01:00
James Booth
014f0f7a91 Don't show join messages on subsequent /join commands 2014-10-18 00:40:44 +01:00
James Booth
9f2f54b2a0 Removed /duck command 2014-10-18 00:07:48 +01:00
James Booth
6b6ed6a93e Show role/affiliation on room join and on change 2014-10-12 02:10:46 +01:00
James Booth
77684cda00 Allow /role list and /affiliation list with no args 2014-10-12 01:10:46 +01:00
James Booth
cbe14d6e4e Implemented /occupants show 2014-10-09 21:42:09 +01:00
James Booth
73262221f5 Implemented /occupants hide 2014-10-09 21:27:16 +01:00
James Booth
778a495fbd Added /occupants commands, unfinished 2014-10-09 13:16:36 +01:00
James Booth
f6e0a219ff Add key codes for shift arrow keys on ITerm 2014-10-08 00:50:28 +01:00
James Booth
4f0009312f Added help to form config 2014-10-07 21:31:34 +01:00
James Booth
fb84c6dcd0 Fixed spelling 2014-10-07 21:21:03 +01:00
James Booth
b8ba9b038c Added scroll support to occupant list 2014-10-07 21:12:19 +01:00
James Booth
0c24b53bfa Added room occupants panel 2014-10-07 16:37:14 +01:00
James Booth
0e18b10b8e Include self in room roster 2014-10-07 01:16:46 +01:00
James Booth
78a1556f12 Added jid autocomplete for affiliation commands 2014-10-06 22:59:25 +01:00
James Booth
965f048b18 Implemented setting and listing roles 2014-10-06 21:42:09 +01:00
James Booth
d12534c58e Implemented /room kick command 2014-10-05 20:52:34 +01:00
James Booth
ac7bc02c63 Added /room kick command 2014-10-05 03:52:55 +01:00
James Booth
7584ddaa62 Added /room subject command 2014-10-05 03:05:46 +01:00
James Booth
2026ab4b6e Implemented getting affiliation list, and setting affiliation 2014-10-05 01:39:48 +01:00
James Booth
7090f04a92 Formatted /room info output 2014-10-02 23:52:17 +01:00
James Booth
25b04537e1 Added service discovery to /room info command 2014-10-02 23:37:10 +01:00
James Booth
60e0d5ef7b Store real jid with occupants 2014-10-01 13:27:01 +01:00
James Booth
b189f8f52e Show fixed form fields 2014-10-01 13:01:20 +01:00
James Booth
c90f4a37a3 Added /room <affiliation> command 2014-10-01 00:46:58 +01:00
James Booth
5879f497ad Added /room <role> command 2014-10-01 00:27:25 +01:00
James Booth
76d2b9e9b5 Moved room info output to ui module, added TODO for roles 2014-09-30 23:08:48 +01:00
James Booth
9bff9c850b Merge branch 'master' into muc_roles 2014-09-30 21:23:31 +01:00
James Booth
ded712c35c Fixed help for jid-multi form fields 2014-09-30 21:22:13 +01:00
James Booth
bca5a5f78d Merge branch 'master' into muc_roles
Conflicts:
	.gitignore
2014-09-30 20:46:26 +01:00
James Booth
fbeb107cbe Dont check for var attribute on form fields of type fixed 2014-09-30 20:44:00 +01:00
James Booth
4f7feedb65 Changed rooms to use Occupant type instead of PContact 2014-09-30 00:16:01 +01:00
James Booth
d25d6b4502 Tidied muc module 2014-09-28 22:09:20 +01:00
James Booth
95a2cec953 Handle errors for /disco info requests 2014-09-24 00:30:05 +01:00
James Booth
ab3fde185d Fixed messages for new rooms 2014-09-18 00:15:32 +01:00
James Booth
d2a06ab18e Handle result of room configuration submit 2014-09-17 21:48:55 +01:00
James Booth
672fcfe009 Show errors in room when can't retrieve room config 2014-09-17 20:59:56 +01:00
James Booth
0de9c1bdda Merge branch 'master' into roomconfig 2014-09-17 00:26:11 +01:00
James Booth
1847f87190 Fixed window switching when paged 2014-09-17 00:22:55 +01:00
James Booth
ef8b8e637d Added form field help 2014-09-16 21:51:16 +01:00
James Booth
0d9a145d45 Implemented /form help 2014-09-16 20:52:38 +01:00
James Booth
f494faac99 Show form fields after updating 2014-09-15 23:28:12 +01:00
James Booth
6b575aa8fc Added /form show 2014-09-15 22:51:53 +01:00
James Booth
c5b697dba7 Dont allow unsaved form windows to be closed 2014-09-15 22:31:15 +01:00
James Booth
de0ce0b80d Allow removing data from text-multi form fields 2014-09-14 18:36:44 +01:00
James Booth
b6242fbd3d Tidied form UI code 2014-09-14 01:56:53 +01:00
James Booth
7a12684523 Added /room remove command, reformetted form output 2014-09-14 01:53:52 +01:00
James Booth
68b839a508 Added /room add for *-multi 2014-09-14 00:18:06 +01:00
James Booth
b111419693 Added form type check on set 2014-09-13 22:39:06 +01:00
James Booth
42a14d0182 Added tags to form fields 2014-09-11 23:44:39 +01:00
James Booth
eba3a7cb30 Implemented /room config submit for saving room configuration 2014-09-10 23:05:35 +01:00
James Booth
5aa75b1f8b Extracted form field display code 2014-09-10 19:59:30 +01:00
James Booth
acc7df161d Added form field type enum 2014-09-10 13:18:36 +01:00
James Booth
f3187917fb Coloured room config form var tags 2014-09-10 00:32:40 +01:00
James Booth
f49a6a65d9 Implemented text-multi, jid-single and fixed display for room config forms 2014-09-10 00:25:44 +01:00
James Booth
0897cd7d17 Implemented jid-multi display for room config forms 2014-09-10 00:20:01 +01:00
James Booth
b6f4faf55b Implemented list-multi display for room config forms 2014-09-10 00:07:31 +01:00
James Booth
2ad4c7b4e0 Formatting of room config form 2014-09-09 00:14:40 +01:00
James Booth
85ccedd01c Create new window for room configuration 2014-09-07 00:49:42 +01:00
James Booth
47d1b1ea21 Moved room config UI code to ui/core.c 2014-09-07 00:22:11 +01:00
James Booth
1e0e5597c2 Added /room config edit and /room config cancel 2014-09-04 22:29:57 +01:00
James Booth
64521eb135 Handle /room config cancel 2014-09-03 22:00:08 +01:00
James Booth
57effcd504 Show message when room requires config 2014-09-03 00:23:04 +01:00