aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
3,912 Commits 32 Branches 59 Tags 24 MiB
b8e1e5a546
Commit Graph

975 Commits

Author SHA1 Message Date
Will Song
9463c67190
fix conflicts 2015-05-29 19:53:37 -05:00
Pete
fbc57765a3 Added window auto tidy. 2015-05-29 14:25:14 +01:00
James Booth
e4ad201324 Merge branch 'master' into stabber-tests 2015-05-25 21:17:06 +01:00
James Booth
06fe9bec37 Merge branch 'master' into openpgp 2015-05-25 21:16:51 +01:00
James Booth
304e08a9c0 Added jid to OTR errors in console 2015-05-25 21:16:10 +01:00
James Booth
80665ea051 Added rooms iq test 2015-05-24 04:13:28 +01:00
James Booth
58b5e39b95 Merge branch 'master' into openpgp 2015-05-10 01:45:07 +01:00
James Booth
aeffca496c Tidy ui_room_message 2015-05-10 01:44:34 +01:00
James Booth
487f5da17d Merge branch 'master' into openpgp 2015-05-10 01:08:30 +01:00
James Booth
aaad3ff909 Moved logic to notify_message 2015-05-10 01:03:34 +01:00
James Booth
8673488368 Merge branch 'master' into openpgp 2015-05-07 22:06:02 +01:00
James Booth
a2c6211732 Added ui_contact_online 2015-05-07 22:05:36 +01:00
James Booth
3fd9692aec Merge branch 'master' into pgp 2015-05-04 23:40:58 +01:00
James Booth
a71d1dab6a Use null check convention in windows.c 2015-05-04 23:12:55 +01:00
James Booth
c19a05ca09 Use null check convention in window.c 2015-05-04 23:11:32 +01:00
James Booth
dd386b4a4e Use null check convention in titlebar.c 2015-05-04 23:08:09 +01:00
James Booth
bf5646aee3 Use null check convention in statusbar.c 2015-05-04 23:07:36 +01:00
James Booth
dda812cd3e Use null check convention in notifier.c 2015-05-04 23:06:35 +01:00
James Booth
aefe458b60 Use null check convention in core.c 2015-05-04 23:05:52 +01:00
James Booth
2e2b3f9403 Use null check convention in console.c 2015-05-04 23:02:57 +01:00
James Booth
176fba84a0 Merge branch 'master' into pgp 2015-05-04 21:39:56 +01:00
James Booth
8ccbeade44 Added enc_mode to ProfChatWin 2015-05-04 21:38:19 +01:00
James Booth
aca102f542 Merge branch 'master' into pgp 2015-05-04 01:34:18 +01:00
James Booth
c8eaaa0ce9 Added ui_ev_new_private_win to ui events 2015-05-04 01:31:27 +01:00
James Booth
bb2b5d20d5 Merge branch 'master' into pgp 2015-05-04 00:57:17 +01:00
James Booth
ef54ff305e ui_outgoing_chat_msg now takes ProfChatWin as argument 2015-05-04 00:55:43 +01:00
James Booth
bab4da039a Merge branch 'master' into pgp 2015-05-04 00:43:36 +01:00
James Booth
c3d2a7e937 Added roster list function to get display name for messages 2015-05-03 23:38:46 +01:00
James Booth
bec9b53f10 Merge branch 'master' into pgp 2015-05-03 02:04:21 +01:00
James Booth
4e1c2a4f64 Show resource in status bar 2015-05-03 02:04:04 +01:00
James Booth
0bd642edf8 Merge branch 'master' into pgp 2015-04-30 23:38:28 +01:00
James Booth
e11e55e31a Move current win check to event, removed next and prev win functions 2015-04-30 22:43:08 +01:00
James Booth
a3a4b6267b Merge branch 'master' into pgp 2015-04-30 22:10:03 +01:00
James Booth
d68fb25dde Removed ui_win_switch_num 2015-04-30 22:09:39 +01:00
James Booth
20555fcb36 Added assert to ui_switch_win 2015-04-30 21:27:44 +01:00
James Booth
7730674f45 Merge branch 'master' into pgp 2015-04-30 21:24:06 +01:00
James Booth
0a6b76d6d3 Removed some ui functions, inlined 2015-04-30 21:23:43 +01:00
James Booth
d5188a160e Merge branch 'master' into pgp 2015-04-29 23:16:43 +01:00
James Booth
2e75e54460 Added ui_win_error_line() 2015-04-29 23:16:28 +01:00
James Booth
0fece78dfe Merge branch 'master' into pgp 2015-04-29 23:08:23 +01:00
James Booth
665c34414d Return result on OTR message sending 2015-04-29 22:59:44 +01:00
James Booth
15b34692fd Reuse ui_new_chat_win 2015-04-29 21:42:29 +01:00
James Booth
0296a60390 _win_show_history takes ProfChatWin as first arg 2015-04-29 21:19:20 +01:00
James Booth
5d827cafec Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-04-28 23:57:28 +01:00
James Booth
403e9b47fe Removed commented code 2015-04-28 23:00:06 +01:00
James Booth
bc445ccdfb Merge branch 'master' into pgp 2015-04-21 23:35:37 +01:00
James Booth
88739d5c59 Moved new chat win events to client events module 2015-04-21 23:28:52 +01:00
James Booth
65c0a87f97 Merge branch 'master' into pgp 2015-04-21 20:56:47 +01:00
James Booth
a4f9661da2 Removed unused otr check 2015-04-19 21:03:20 +01:00
James Booth
bcfbbac49a Merge branch 'master' into pgp 2015-04-12 02:16:13 +01:00
James Booth
57dc5f14ef Added option to show jids in occupants panel 2015-04-12 02:14:37 +01:00
James Booth
475dfebd97 Added pgpkeyid account setting, send signed presence 2015-03-23 23:38:06 +00:00
James Booth
f1f047889e Added individual options to send and request delivery receipts 2015-03-19 22:57:51 +00:00
James Booth
8e80a8ccf7 Merge remote-tracking branch 'origin/master' 2015-03-18 21:31:58 +00:00
James Booth
e7e94eed7f Added keybindings for rxvt 2015-03-18 21:30:43 +00:00
James Booth
d6977e31cd Fix buffer entry free 2015-03-17 20:42:21 +00:00
James Booth
981618b7da Added static functions to commands.c for sending messages 2015-03-16 01:29:03 +00:00
James Booth
fae2717f27 Tidied help 2015-03-15 20:04:53 +00:00
James Booth
2762f18a3e Added /receipts command 2015-03-15 19:48:19 +00:00
James Booth
b21edfaa51 Added receipt.sent theme setting 2015-03-15 19:35:25 +00:00
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
e5bb12a0d6 Added /time statusbar preference 2015-03-10 23:35:08 +00:00
James Booth
945f29873e Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 2015-03-08 21:51:50 +00:00
James Booth
2e493112bb Merge branch 'master' into readline 2015-03-08 18:12:50 +00:00
James Booth
6be4b400b8 Fixed swapping windows when in source win 2015-03-03 22:10:01 +00:00
James Booth
7ae71391de Merge branch 'master' into readline 2015-02-24 22:58:19 +00:00
James Booth
68a8ab3401 Updated default preferences 2015-02-24 22:53:57 +00:00
James Booth
84c02ffb72 Added /roster by preference to UI preferences summary 2015-02-24 22:24:20 +00:00
James Booth
9a408024d3 Merge branch 'master' into readline 2015-02-24 21:47:49 +00:00
James Booth
434fb1878b Fixed /resource preference display 2015-02-24 21:42:43 +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
32b8ead198 Merge branch 'master' into readline 2015-02-14 20:46:11 +00:00
James Booth
c9a6e10c26 Use single quotes for terminal notifier notifications to avoid variable expansion 2015-02-14 16:20:15 +00: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
13297a151f Merge branch 'master' into readline 
Conflicts:
	src/ui/inputwin.c
 2015-02-10 20:47:22 +00:00
James Booth
75d7663876 Free wins summary list 2015-02-10 19:42:13 +00:00
James Booth
30739ed157 Free contact list 2015-02-10 19:39:18 +00:00
James Booth
6bee6cb0fb Free string on backspace 2015-02-10 19:30:18 +00:00
Olivier LE MOAL
48f9f3b3b0 Add XEP-0280 support 2015-02-10 11:32:22 +01:00
James Booth
64774a947e Merge branch 'master' into readline 2015-02-09 22:11:25 +00:00
James Booth
5c9dd2802a Free lists on get muc and private windows 2015-02-09 22:08:47 +00:00
James Booth
75f791da8f Free hash table keys before modifying hash table 2015-02-09 21:53:55 +00:00
James Booth
1a98f1404b Free resource lists 2015-02-09 21:46:54 +00:00
James Booth
51ccb69580 Merge branch 'master' into readline 
Conflicts:
	src/ui/inputwin.c
 2015-02-09 21:28:08 +00:00
James Booth
aad7b3ed8a Free GTimer on switch to console 2015-02-09 20:15:24 +00:00
James Booth
893b58bf4e Use chat_state_free to free chat states 2015-02-09 20:11:51 +00:00
James Booth
23aaa51a2a Free utf8 substrings for delete word (ctrl-w) 2015-02-09 19:59:04 +00:00
James Booth
268c33e1c6 Free resource lists on /account command 2015-02-09 19:50:41 +00:00
Christian Storm
916a3d9451 Bind ^L to own clear method to retain ui elements 
When using readline's standard ^L binding, the screen
is completely cleared, including status and title bar.
By binding ^L to profanity's clear method, status and
title bar are retained.
 2015-02-08 12:15:01 +01:00
James Booth
b7a8e7d942 Merge branch 'master' into readline 2015-02-06 22:05:38 +00:00
James Booth
f447ac4189 Free win layout 2015-02-06 21:39:53 +00:00
James Booth
f08657fa9a Handle home scroll 2015-02-06 14:11:21 +00:00
James Booth
2e83d23873 Removed unused function 2015-02-06 00:20:06 +00:00
James Booth
113cb6cf9a Removed debug logging 2015-02-05 01:00:06 +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
d64c4a69d7 Removed unused functions from inputwin.c 2015-02-04 22:22:18 +00:00
James Booth
b2536e91c0 Fixed input timout returning EINVAL on OSX 2015-02-04 01:04:56 +00:00
James Booth
7ab301869f Moved readline startup hook 2015-02-03 23:27:06 +00:00
James Booth
8b58eb68d3 Tidied inputwin.c 2015-02-03 23:07:15 +00:00
James Booth
af345b6700 Updated navigation help 2015-02-03 22:24:47 +00:00
James Booth
82ddbf332d Added OSX readline keyseq bindings 2015-02-03 21:38:48 +00:00
James Booth
b76501f0bc Removed mbstate_t use 2015-02-03 21:08:34 +00:00
James Booth
836fdd2eb1 Remove state passed to wide char len check 2015-02-03 21:04:51 +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
51a5426006 Added include for timeval struct 2015-02-01 21:01:00 +00:00
James Booth
372cf822cb Merge branch 'master' into readline 2015-02-01 20:47:28 +00:00
James Booth
702ea0b5f3 Use getc wrapper for autocomplete reset check 2015-02-01 20:14:07 +00:00
James Booth
a9af8785a7 Added more ignore characters to handle activity 2015-02-01 00:35:42 +00:00
James Booth
e8b6c505cb Handle word wrapping wide chars 2015-02-01 00:14:11 +00:00
James Booth
a19c0a5989 Added scroll handler 2015-01-31 22:29:44 +00:00
James Booth
84688c063e Removed commented code, renamed win switch handlers 2015-01-31 22:12:27 +00:00
James Booth
baa122e7dc Added function key bindings 2015-01-31 22:08:00 +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
fe10f2b2e3 Clear autocompleters on printable chars 2015-01-31 16:51:09 +00:00
James Booth
2b11baa564 Added readline tab handler 2015-01-31 01:58:15 +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
f94b6ef0a2 Added idle and activity handlers 2015-01-31 00:20:25 +00:00
James Booth
1cf5592b1f Removed unused variables 2015-01-30 23:46:34 +00:00
James Booth
784a2ea862 Removed commented code 2015-01-30 23:44:17 +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
351ff752a7 Renamed command group presence->presences to avoid clash 2015-01-28 20:35:00 +00:00
Will Song
7f436d614b
use custom format string for time preference 2015-01-27 19:55:16 -06: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
25d31101bf Added key insert tests, extracted key_ctrl_left handler 2015-01-20 23:02:04 +00:00
James Booth
2ed78fe5af Extracted keyhandler for printable characters 2015-01-20 00:09:47 +00:00
James Booth
0e8092afef Inlined static functions in inputwin 2015-01-19 20:51:41 +00:00
James Booth
9ecdb39433 Refactor inputwin.c 2015-01-18 22:55:51 +00:00
James Booth
8954adc620 Handle wide chars for arrow keys and backspace 2015-01-18 19:55:48 +00:00
James Booth
89260280d1 Fix backspace for utf8 wide chars 2015-01-17 22:03:22 +00:00
James Booth
ba89297382 Added utf8_display_len 2015-01-17 21:09:40 +00:00
James Booth
4ac11ddcd6 Merge branch 'master' into inp-utf8 2015-01-16 23:39:34 +00:00
James Booth
036d13b80c Removed debug 2015-01-16 23:38:21 +00:00
James Booth
18f05c59ee Fixed merge 2015-01-16 23:35:31 +00:00
James Booth
8805fd5c38 Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-16 23:34:32 +00:00
James Booth
e1db13ea2b Renamed input variables 2015-01-16 23:32:57 +00:00
James Booth
972d524fdc Merge branch 'master' into inp-utf8 2015-01-16 23:12:00 +00:00
James Booth
4c6cfcdca0 Simplified autocompleters and command history 2015-01-16 22:50:40 +00:00
James Booth
9fad03af74 Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-16 00:41:02 +00:00
James Booth
7a5deca77c Removed static function arguments in inputwin.c 2015-01-16 00:36:42 +00:00
James Booth
f0ffc31cd6 Renamed inp_get_char->inp_read 2015-01-15 23:46:54 +00:00
James Booth
9083bfdb5c Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-15 23:45:18 +00:00
James Booth
51105720ab Moved input line to inputwin 2015-01-15 23:43:22 +00:00
James Booth
bb11dc0973 Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-15 23:31:06 +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
e326aaa84f Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-15 22:53:50 +00:00
James Booth
ad896ef201 Moved input size to inputwin 2015-01-15 22:51:05 +00:00
James Booth
173a3a82bb Merge branch 'master' into inp-utf8 2015-01-15 22:25:15 +00:00
James Booth
82c986775d Moved input to ui module, renamed ui_readline 2015-01-15 22:21:24 +00:00
James Booth
a7dff070a4 Merge branch 'master' into inp-utf8 2015-01-15 13:31:13 +00:00
James Booth
5be47cc5a9 Moved input size variable to ui module 2015-01-15 13:22:54 +00:00
James Booth
6beeec03d4 Merge branch 'master' into inp-utf8 2015-01-15 01:31:23 +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
78bfd8da40 Merge branch 'master' into inp-utf8 2015-01-15 01:06:33 +00:00
James Booth
0007e3569e Moved remimder notification code out of main loop 2015-01-15 00:42:40 +00:00
James Booth
17b966adb4 Merge branch 'master' into inp-utf8 2015-01-15 00:19:22 +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
41b2b1c51f Calculate input win display size includes wide characters 2015-01-14 23:17:10 +00:00
James Booth
274d6e843e Show eval_password if exists on /account show 2015-01-13 00:51:21 +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
Will Song
e57fa1633a add exit title preference to group and add command for setting the preference 2015-01-08 10:18:29 -06: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