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

386 Commits

Author SHA1 Message Date
James Booth
3f0addbc99 Added UI presence functions 2014-01-19 18:31:02 +00:00
James Booth
5610f70b35 Inlined ui_contact_online and ui_contact_offline 2014-01-19 17:51:32 +00:00
James Booth
692af0e9a0 Merge branch 'master' into plugins 2014-01-19 00:13:42 +00:00
James Booth
2f58b2488f Added port to /account show <account> 2014-01-19 00:09:51 +00:00
James Booth
4a97ec9293 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/command/command.c
	src/command/commands.c
	src/server_events.c
2014-01-18 00:23:56 +00:00
James Booth
b1de8a4005 Added OTR remaining system messages and colouring 2014-01-17 00:06:08 +00:00
James Booth
45aee2e778 Tidied OTR messages 2014-01-16 23:16:37 +00:00
James Booth
4f98bc8c25 Show OTR coloured status
Customisable within theme files e.g.:
titlebar.unencrypted=red
titlebar.encrypted=green
titlebar.trusted=red
titlebar.untrusted=green

Shows [unencrypted] for all non-OTR chat

Disable with '/otr warn off'
2014-01-16 22:44:23 +00:00
James Booth
6c59bb26da Set boolean when typing in titlebar 2014-01-16 20:37:25 +00:00
James Booth
f0e5e585f8 Removed title_bar_draw from UI module 2014-01-16 20:09:54 +00:00
James Booth
682601d479 Use title_bar_draw in title_bar_refresh 2014-01-16 19:58:21 +00:00
James Booth
69a63bd225 Added constant for console title 2014-01-16 19:47:00 +00:00
James Booth
2911093240 Remove manual memory allocation from titlebar 2014-01-16 19:34:05 +00:00
James Booth
91b5405782 Renamed recipient -> current_recipient in titlebar 2014-01-16 19:21:17 +00:00
James Booth
754ad86e3d Inlined _title_bar_draw_title and _title_bar_draw_presence 2014-01-16 19:06:32 +00:00
James Booth
4792ac8df6 Use title_bar_draw where possible in title bar 2014-01-16 19:03:14 +00:00
James Booth
7c7af7b25f Always erase and refresh titlebar when drawing 2014-01-16 18:58:04 +00:00
James Booth
95b5d141c3 Added _title_bar_draw_title when setting presence 2014-01-16 18:52:27 +00:00
James Booth
fa8801798c Removed _title_bar_show 2014-01-16 18:43:06 +00:00
James Booth
c32caa62e0 Removed title_bar_show from UI module 2014-01-16 18:32:24 +00:00
James Booth
16bf753ad0 Renamed title bar status -> presence 2014-01-16 18:22:50 +00:00
James Booth
9f6d6d44cc Renamed title_bar_set_status -> title_bar_set_presence 2014-01-16 18:13:22 +00:00
James Booth
b0e727a7ef Renamed title_bar -> win 2014-01-16 18:08:00 +00:00
James Booth
0a04ef1510 Renamed title_bar_title -> title_bar_console 2014-01-16 18:04:25 +00:00
James Booth
af1eab7810 Removed dirty flag from titlebar 2014-01-16 17:59:24 +00:00
James Booth
60820007ee Added setting /otr log on|off|redact 2014-01-13 20:17:45 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
2014-01-12 19:32:08 +00:00
James Booth
4e97c1e460 Merge branch 'master' into otr 2014-01-12 01:25:35 +00:00
James Booth
462e84ea82 Added /otr trust|untrust commands 2014-01-12 01:20:22 +00:00
James Booth
494aaadba4 Added /otr end command 2014-01-11 23:59:20 +00:00
James Booth
a3217bcf8c End OTR session when user closes chat window 2014-01-11 23:28:11 +00:00
James Booth
f35e485bd4 Handle window creation for incoming and outgoing OTR sessions 2014-01-11 21:44:24 +00:00
James Booth
03086c0384 Added /otr theirfp with hardcoded fingerprint 2014-01-11 19:10:00 +00:00
James Booth
b5469e2e06 Added [OTR] and (trusted/untrusted) to titlebar for OTR sessions 2014-01-11 18:24:44 +00:00
James Booth
bf494b1b07 Refactored setting window recipient 2014-01-11 18:06:46 +00:00
James Booth
9daefe170d Require '/otr start' from both parties before encryption used both ways 2014-01-11 17:03:01 +00:00
James Booth
98b1b96e59 Fixed win_handle_error_message 2014-01-08 22:20:05 +00:00
James Booth
bd79b97101 Merge branch 'master' into plugins
Conflicts:
	src/ui/core.c
2014-01-08 20:47:17 +00:00
James Booth
4cc4461c0f Removed handle error message function from ProfWin 2014-01-08 20:27:18 +00:00
James Booth
d99f1536ec Removed print message function from ProfWin 2014-01-08 20:11:53 +00:00
James Booth
0a97e79c68 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2014-01-03 18:21:32 +00:00
James Booth
c549595c60 Fixed incoming message plugin call 2014-01-03 18:11:25 +00:00
James Booth
785206a06c Tidied navigation help
Conflicts:

	src/ui/console.c
2014-01-02 18:06:53 +00:00
James Booth
c10c9286d1 Merge branch 'master' into plugins
Conflicts:
	src/ui/notifier.c
	src/ui/ui.h
	src/xmpp/roster.c
2014-01-02 02:19:06 +00:00
James Booth
9823b2fae2 Added full stop to /help service summary 2014-01-02 01:51:46 +00:00
James Booth
8840457e19 Merge remote-tracking branch 'louiecaulfield/master' 2013-12-29 15:41:22 +00:00
James Booth
2defeaefe3 Removed wins_refresh_console when not required for /sub command output
Implicitly called by cons_show
2013-12-27 23:38:45 +00:00
Jasper van Bourgognie
4a706f7a80 src/ui/core.c: Removed duplicate const keyword 2013-12-27 20:56:47 +01:00
James Booth
b83b262d47 Bind remaining ui functions in main.c 2013-12-23 00:23:22 +00:00
James Booth
7fe8f61b9b Bind console functions in main.c 2013-12-23 00:08:45 +00:00
James Booth
a6859354b4 Bind ui core functions in main.c 2013-12-22 23:54:22 +00:00
James Booth
581f58e47f Bind jabber functions in main.c 2013-12-22 23:13:05 +00:00
James Booth
5a5b1340aa Dynamically load UI functions, fixed tests 2013-12-22 22:14:15 +00:00
James Booth
d56f6dc39b Added mocks and stubs for cons_show 2013-12-19 21:05:39 +00:00
James Booth
ed079236aa Merge branch 'master' into plugins
Conflicts:
	src/command/commands.c
2013-12-18 00:41:57 +00:00
James Booth
079ea5304b Moved _ask_password to UI module 2013-12-15 19:38:23 +00:00
James Booth
5891ee0cc2 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	configure.ac
	src/command/command.c
	src/ui/console.c
	src/ui/core.c
	src/ui/muc_window.c
2013-12-15 17:14:00 +00:00
James Booth
107fdd355e Added simple mock test, refactored roster 2013-12-14 15:34:17 +00:00
James Booth
3e8e4579a5 Fixed version number on splash screen 2013-11-21 00:28:06 +00:00
James Booth
8c97658b8d Merge branch 'master' into refactor2
Conflicts:
	src/ui/core.c
2013-11-11 20:51:35 +00:00
James Booth
a0b80e730a Merge branch 'master' into plugins 2013-11-10 18:50:18 +00:00
James Booth
c5f76721ce Fixed compile error for -Wduplicate-decl-specifier on OSX 2013-11-10 18:48:55 +00:00
James Booth
305d2e5c85 Merge branch 'master' into plugins
Conflicts:
	src/profanity.c
2013-11-08 00:24:19 +00:00
James Booth
2b0108e6cc Allow "account" setting in [connection] to autconnect the account
closes #251
2013-11-07 23:04:12 +00:00
James Booth
99d3322834 Added MAX_PASSWORD_SIZE set to 64
fixes #245
2013-11-07 22:15:43 +00:00
James Booth
4abdb02396 Merge remote-tracking branch 'tsenart/passwords-on-accounts-file' 2013-11-07 21:43:11 +00:00
Tomás Senart
480589f0ae Use passwords from the accounts file
This commit makes it so that if the password in an account in the
accounts file is present, then use it. Otherwise ask for the password to
the user.
2013-10-14 20:15:51 +02:00
James Booth
3e86d108a3 Removed usages of ui_current_print_line from ui/core.c 2013-10-07 01:39:05 +01:00
James Booth
067c26eeea Tidy _ui_draw_win_title 2013-10-07 01:35:20 +01:00
James Booth
4cbfd5f0f9 Removed _win_show_error_msg 2013-10-07 01:30:20 +01:00
James Booth
c253d3cd1b Refactor ui_create_duck_win 2013-10-07 01:08:46 +01:00
James Booth
63f594b494 Refactor ui_recipient_gone 2013-10-07 01:06:19 +01:00
James Booth
2d534fb278 Added win_page_off 2013-10-07 00:59:17 +01:00
James Booth
acf1afe025 Moved idle chat state handling out of ui module 2013-10-07 00:51:00 +01:00
James Booth
383d91ec36 Added p_contact_create_display_string 2013-10-07 00:16:58 +01:00
James Booth
9bea1ce830 Moved win_show_status function to window module 2013-10-06 23:52:50 +01:00
James Booth
1d3256ffc7 PREF_STATUSES, moved checks to profanity module
Removed checks from muc presence, and when contact is offline on message
2013-10-06 23:46:35 +01:00
James Booth
7eb5bb6c3d Moved check for PREF_STATUSES 2013-10-06 23:39:27 +01:00
James Booth
4c64169d5b Rename window in ui_handle_error_message 2013-10-06 23:28:11 +01:00
James Booth
e2161d8acc Refactor wins_refresh_current 2013-10-06 23:25:01 +01:00
James Booth
c6c0a94bb0 Removed generic functions from ProfWin 2013-10-06 23:22:46 +01:00
James Booth
dd4deafe93 Refactor ui_current_error_line 2013-10-06 22:46:04 +01:00
James Booth
eee49e8ad8 Refactor ui_incoming_message 2013-10-06 19:20:03 +01:00
James Booth
3e7c6e2951 Moved status display when receiveing delayed delivery 2013-10-06 19:16:20 +01:00
James Booth
47c96ed4e7 ProfWin->print_incoming_message added 2013-10-06 19:11:51 +01:00
James Booth
78ee448a8d Use ProfWin->print_line for console typing notifications 2013-10-06 18:05:51 +01:00
James Booth
a527beabd3 Added show_char and attrs to ProfWin->print_line 2013-10-06 18:00:22 +01:00
James Booth
fc8982e761 Added muc_window 2013-10-06 17:46:22 +01:00
James Booth
922289d01f Merge branch 'master' into plugins
Conflicts:
	src/ui/console.c
2013-10-06 02:30:01 +01:00
James Booth
3cc080b06a Remove implicit refresh from ProfWin->print_line 2013-10-06 02:17:45 +01:00
James Booth
39fa133580 Refactored ui_current_print_line 2013-10-06 02:12:25 +01:00
James Booth
6441e06279 OO style for ProfWin type 2013-10-06 02:02:05 +01:00
James Booth
33fc43d5e2 Added win_refresh function 2013-10-06 01:30:53 +01:00
James Booth
9c1809a50e Refactored error message handling 2013-10-06 01:28:25 +01:00
James Booth
18b7def422 Refactor error handling to use win_type switch 2013-10-06 00:42:30 +01:00
James Booth
3dffc1d9ff Moved muc error handling to profanity.c 2013-10-06 00:26:03 +01:00
James Booth
710c49b6b8 Moved UI error handler code to ui/core 2013-10-06 00:05:23 +01:00
James Booth
738be65edc Fix crash when tidying windows 2013-10-03 00:02:30 +01:00
James Booth
6ff7177b9b Show current window in status bar 2013-10-02 23:33:48 +01:00
James Booth
2d77c75724 Merge branch 'master' into plugins 2013-09-26 00:43:46 +01:00
James Booth
2625630ff3 Next and previous windows, handle KEY_CODE_YES terms, jump empty wins 2013-09-26 00:25:04 +01:00
Jesse R. Adams
8be4cd1f27 Adding irssi style Alt-Left/Right window navigation 2013-09-25 12:51:54 -07:00
James Booth
18a8be8935 Added before_message_displayed hook 2013-09-19 22:10:11 +01:00
James Booth
cd816b94c2 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
2013-09-17 02:06:43 +01:00
James Booth
ee8ff948bf Use git revision in development strings 2013-09-17 01:28:35 +01:00
James Booth
d782b00711 Added git branch and revision to development builds 2013-09-17 00:59:37 +01:00
James Booth
d5c8a126b1 Merge branch 'master' into plugins 2013-09-13 16:32:09 +01:00
James Booth
e9361f834a Check for KEY_CODE_YES before sending typing notifications
fixes #239
2013-09-13 16:29:26 +01:00
James Booth
0510bdda2f Merge branch 'master' into plugins 2013-09-13 00:21:56 +01:00
James Booth
df14a46d48 Allow users to set default muc service and nickname per account
See #238

Conflicts:

	src/config/accounts.c
2013-09-12 23:34:30 +01:00
James Booth
e9a3164164 Merge branch 'master' into plugins 2013-09-09 08:25:53 +01:00
James Booth
e639f4cea6 Added window handling api 2013-09-09 01:24:05 +01:00
James Booth
dd7aa76528 Attempted fix for #236, no check for KEY_CODE_YES on unicode char 127 (delete) 2013-09-08 16:14:26 +01:00
James Booth
bed44a842f Merge branch 'master' into plugins 2013-09-04 23:18:29 +01:00
James Booth
ff8bb1bbbe Proper fix for #235 2013-09-04 23:14:35 +01:00
James Booth
afa0c839a4 Merge branch 'master' into plugins 2013-09-04 22:46:03 +01:00
James Booth
cbdb426343 Fix for issue #235, check for KEY_CODE_YES 2013-09-04 22:07:28 +01:00
James Booth
e6adae14c0 Merge branch 'master' into plugins 2013-09-01 03:32:00 +01:00
James Booth
343cc0a64c Fixed F key bindings 2013-08-31 23:00:46 +01:00
James Booth
13d079ddaa Merge branch 'master' into plugins 2013-08-31 15:14:30 +01:00
James Booth
694e332384 Show only nick or jid in /wins output 2013-08-31 15:07:05 +01:00
James Booth
5931de674f Merge branch 'master' into plugins
Conflicts:
	src/ui/console.c
2013-08-30 01:04:17 +01:00
James Booth
4ae817cd82 Fixed ">" indicator when tidying windows 2013-08-30 00:49:38 +01:00
James Booth
7f476b3e2c Fixed /close all and /close read to close extra windows 2013-08-30 00:33:46 +01:00
James Booth
48794e324c Fix count on /close all, and /close read 2013-08-30 00:21:41 +01:00
James Booth
00547bd116 Refactored status bar indicators 2013-08-30 00:10:05 +01:00
James Booth
f99504d0ec Handle ">" indicator when more than 10 wins open 2013-08-29 23:57:34 +01:00
James Booth
4bfb369d2f Set all inactive before tidy 2013-08-28 23:23:46 +01:00
James Booth
8a35bae267 Fixes to windows tidy 2013-08-28 23:09:54 +01:00
James Booth
b7e7cb9c68 Refactor updating window statuses 2013-08-28 22:11:44 +01:00
James Booth
30a4054937 Fixed showing active console after login fail 2013-08-28 22:07:40 +01:00
James Booth
88d4cf6e94 Fixed test for requiring window tidy 2013-08-28 21:45:46 +01:00
James Booth
a81d69dc7f Fixed window number for notify and room incoming message 2013-08-28 21:34:00 +01:00
James Booth
c08e85193c Show correct window number for incoming in console 2013-08-28 21:29:11 +01:00
James Booth
9ef7e2d233 Changes to status bar for unlimited windows - WIP 2013-08-28 00:50:15 +01:00
James Booth
b5eb095820 Removed limit on number of windows, WIP 2013-08-27 23:38:25 +01:00
James Booth
42c3a1c1f7 Added function to get next available window number, and tests 2013-08-27 22:02:23 +01:00
James Booth
8045b949a7 Refactor _cmd_close 2013-08-26 18:06:33 +01:00
James Booth
48572bdbcf Fixed indenting in ui/core.c 2013-08-26 17:50:26 +01:00
James Booth
bca379844d Free windows on exit 2013-08-26 17:47:29 +01:00
James Booth
18d11f2bcf Moved static function in console.c 2013-08-26 17:34:48 +01:00
James Booth
48feac3e77 Removed cons_create from console.c 2013-08-26 17:29:20 +01:00
James Booth
fd8a0b4970 Fixed freeing of recipient after message sent 2013-08-26 16:42:31 +01:00
James Booth
38be98cde5 Fix console references after merging master 2013-08-25 23:30:10 +01:00
James Booth
d3cfeb9d5c Merge branch 'master' into windows 2013-08-25 23:27:42 +01:00
James Booth
d2d4eb61ba Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/ui/notifier.c
2013-08-25 23:26:29 +01:00
Dmitry Podgorny
c7ec06ff65 removed strdup from g_string_append 2013-08-25 14:52:25 +03:00
Dmitry Podgorny
021d095536 small refactoring in statusbar.c 2013-08-24 00:39:03 +03:00
James Booth
3c39befa5e Fixed window refresh on presence 2013-08-20 23:54:41 +01:00
James Booth
770b572d58 Console module get console from windows 2013-08-20 23:18:23 +01:00