console/boot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fonts and lwd and nottui and more progress towards the irc client

Browse Source
This commit is contained in:
cqc
2021-10-20 14:15:08 -05:00
parent 50073f19e1
commit 4054f78564
39 changed files with 1291 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dune
View File

@ -15,6 +15,7 @@
zed
lambda-term
irmin-unix
nottui-pretty
ocaml-compiler-libs.common
ocaml-compiler-libs.bytecomp
ocaml-compiler-libs.toplevel))
@ -34,6 +35,8 @@
irc-client-lwt
irc-client-unix
irc-client-tls
nottui-lwt
nottui-pretty
))
(executable
@ -58,7 +61,10 @@
zed
lambda-term
irmin-unix
inuit
nottui
nottui-pretty
nottui-lwt
uuseg
irc-client
irc-client-lwt
irc-client-unix

202
fonts/LICENSE.txt Normal file
View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

94
fonts/OFL.txt Normal file
View File

@ -0,0 +1,94 @@
Copyright (c) 1994-2021, SIL International (http://www.sil.org/),
with Reserved Font Names "Scheherazade" and "SIL".
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

77
fonts/README.txt Normal file
View File

@ -0,0 +1,77 @@
Roboto Mono Variable Font
=========================
This download contains Roboto Mono as both variable fonts and static fonts.
Roboto Mono is a variable font with this axis:
wght
This means all the styles are contained in these files:
RobotoMono-VariableFont_wght.ttf
RobotoMono-Italic-VariableFont_wght.ttf
If your app fully supports variable fonts, you can now pick intermediate styles
that aren’t available as static fonts. Not all apps support variable fonts, and
in those cases you can use the static font files for Roboto Mono:
static/RobotoMono-Thin.ttf
static/RobotoMono-ExtraLight.ttf
static/RobotoMono-Light.ttf
static/RobotoMono-Regular.ttf
static/RobotoMono-Medium.ttf
static/RobotoMono-SemiBold.ttf
static/RobotoMono-Bold.ttf
static/RobotoMono-ThinItalic.ttf
static/RobotoMono-ExtraLightItalic.ttf
static/RobotoMono-LightItalic.ttf
static/RobotoMono-Italic.ttf
static/RobotoMono-MediumItalic.ttf
static/RobotoMono-SemiBoldItalic.ttf
static/RobotoMono-BoldItalic.ttf
Get started
-----------
1. Install the font files you want to use
2. Use your app's font picker to view the font family and all the
available styles
Learn more about variable fonts
-------------------------------
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
https://variablefonts.typenetwork.com
https://medium.com/variable-fonts
In desktop apps
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
Online
https://developers.google.com/fonts/docs/getting_started
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
Installing fonts
MacOS: https://support.apple.com/en-us/HT201749
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
Android Apps
https://developers.google.com/fonts/docs/android
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
License
-------
Please read the full license text (LICENSE.txt) to understand the permissions,
restrictions and requirements for usage, redistribution, and modification.
You can use them freely in your products & projects - print or digital,
commercial or otherwise.
This isn't legal advice, please consider consulting a lawyer and see the full
license for all details.

BIN
fonts/Roboto-Black.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-BlackItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-Bold.ttf Executable file → Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-BoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-Italic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-Light.ttf Executable file → Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-LightItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-Medium.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-MediumItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-Regular.ttf
View File

Binary file not shown.

BIN
fonts/Roboto-Thin.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto-ThinItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto.zip Normal file
View File

Binary file not shown.

BIN
fonts/RobotoMono-Italic-VariableFont_wght.ttf Normal file
View File

Binary file not shown.

BIN
fonts/RobotoMono-VariableFont_wght.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Roboto_Mono.zip Normal file
View File

Binary file not shown.

BIN
fonts/ScheherazadeNew-Bold.ttf Normal file
View File

Binary file not shown.

BIN
fonts/ScheherazadeNew-Regular.ttf Normal file
View File

Binary file not shown.

BIN
fonts/Scheherazade_New.zip Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-Bold.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-BoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-ExtraLight.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-ExtraLightItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-Italic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-Light.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-LightItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-Medium.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-MediumItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-Regular.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-SemiBold.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-SemiBoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-Thin.ttf Normal file
View File

Binary file not shown.

BIN
fonts/static/RobotoMono-ThinItalic.ttf Normal file
View File

Binary file not shown.

1569
human.ml
View File

File diff suppressed because it is too large Load Diff

260
irc.ml
View File

@ -14,102 +14,244 @@ open Lwt_react
module F = Fmt
module Communicator = struct
type msg = {content: string; time: string; mutable seen: bool}
module Message = struct
type t = {content: string; time: string; mutable seen: bool}
let create_msg ?(time = "<ts>") content =
{content; time; seen= false}
let make ?(time = "<ts>") content = {content; time; seen= false}
end
type channel =
{ mutable name: string
; mutable content: msg list
; mutable recv: msg -> unit }
module Channel = struct
type t = {name: string; content: Message.t list Lwd.var}
let add_msg (c : channel) msg = c.content <- msg :: c.content
let add_msg (c : t) (msg : Message.t) =
F.epr "Channel.add_msg msg.content=\"%s\"@." msg.content ;
let cn = Lwd.peek c.content in
Lwd.set c.content (msg :: cn)
type t = {mutable channel: channel; mutable subs: t list}
type protocol = Irc | Email | Rss | Mublog
let make name = {name; content= Lwd.var []}
end
let make_channel ?(recv = add_msg) name =
let c = {name; content= []; recv= (fun _ -> ())} in
{c with recv= recv c}
module Tree = struct
open Channel
open Message
let make () : t =
let channel = make_channel "top" in
channel.recv (create_msg "Wecome to the Communicator") ;
channel.recv (create_msg "Currently only IRC is implemented") ;
{channel; subs= []}
type t =
{ channel: Channel.t
; subs: t Lwd_table.t
; focus: Nottui.Focus.handle }
type connection = unit Lwt.t
type protocol = Irc | Email | Rss | Mublog | ActivityPub
let add (comm : t) ch : unit =
let c' =
{ channel= ch
; subs= Lwd_table.make ()
; focus= Nottui.Focus.make () } in
Lwd_table.append' comm.subs c'
let make_top () =
let channel = Channel.make "communicator-top" in
add_msg channel (Message.make "Welcome to the Communicator") ;
add_msg channel
(Message.make "Currently only IRC is implemented") ;
{channel; subs= Lwd_table.make (); focus= Nottui.Focus.make ()}
end
module Irc = struct
module C = Irc_client_tls
module M = Irc_message
let connection (c : t) server port nick channels : unit Lwt.t =
let add_msg cn str = add_msg cn.channel (create_msg str) in
C.reconnect_loop ~after:30
let connection (c : Tree.t) server port nick
(channels : string list) : Channel.t =
let channel =
Channel.make ("IRC: " ^ server ^ ":" ^ string_of_int port)
in
let _c' = Tree.add c channel in
let add_msg str = Channel.add_msg channel (Message.make str) in
let channel_assoc = ref [] in
let make_ch name =
let ch = Channel.make name in
Tree.add c ch ;
channel_assoc := (name, ch) :: !channel_assoc ;
ch in
Lwt.async
(C.reconnect_loop ~after:30
~connect:(fun () ->
Lwt_io.printl "Connecting..."
>>= fun () ->
add_msg "Connecting..." ;
C.connect_by_name ~server ~port ~nick ()
>>= fun c ->
Lwt_io.printl "connect_by_name returned"
>>= fun () -> Lwt.return c )
~f:(fun connection ->
Lwt_io.printl "Connected"
>>= fun () ->
add_msg "Connected" ;
Lwt_list.iter_p
(fun channel ->
let joiner = C.send_join ~connection ~channel in
(* make_channel c ~sender:(fun s ->
C.send_privmsg ~target:channel ~message:s) channel ; *)
joiner )
(fun chname ->
C.send_join ~connection ~channel:chname
>>= fun () ->
ignore (make_ch chname) ;
Lwt.return_unit )
channels )
~callback:(fun _connection result ->
match result with
| Result.Ok ({M.command= M.Other _; _} as msg) ->
add_msg c
(F.str "Got unknown message: %s\n" (M.to_string msg)) ;
add_msg (M.to_string msg) ;
Lwt.return_unit
| Result.Ok ({M.command= M.PRIVMSG (target, data); _} as msg)
| Result.Ok
{M.command= M.PRIVMSG (target, data); prefix= user}
->
add_msg c
(F.str "Got PRIVMSG: target=%s, data=%s; %s\n" target
data (M.to_string msg) ) ;
let user =
match user with
| Some u -> List.hd (String.split_on_char '!' u)
| None -> "unknown" in
( match List.assoc_opt target !channel_assoc with
| Some ch -> Channel.add_msg ch
| None -> Channel.add_msg (make_ch target) )
(Message.make (F.str "<%s> %s" user data)) ;
Lwt.return_unit
| Result.Ok msg ->
add_msg c (M.to_string msg) ;
add_msg (M.to_string msg) ;
Lwt.return_unit
| Result.Error e -> Lwt_io.printl e )
()
| Result.Error e -> Lwt_io.printl e ) ) ;
channel
end
module Panel = struct
let panel (c : t) =
let open Panel in
let te = Textedit.make "" () in
Textedit.panel ~height:20. te
>>= fun p ->
Lwt.return
{ p with
act=
(fun panel events ->
Textedit.clear te ;
List.iter
(fun m ->
Textedit.insert te
(F.str "[%s] %s\n" m.time m.content) )
c.channel.content ;
p.act panel events ) }
open Nottui
module P = Nottui_pretty
let string ?attr text = P.ui (Nottui_widgets.string ?attr text)
let ( ^^ ) = P.( ^^ )
let ( ^/^ ) a b = P.(a ^^ break 1 ^^ b)
let messagelist (ch : Channel.t) : P.t Lwd.t =
Lwd.map (Lwd.get ch.content) ~f:(fun (msgs : Message.t list) ->
List.fold_left
(fun doc (msg : Message.t) ->
F.epr "Communicator.Panel.messagelist ch.content=%s@."
msg.content ;
doc
^^ P.group
( string msg.time ^/^ string " | "
^/^ string msg.content )
^^ P.hardline )
P.empty msgs )
open Nottui_widgets
(*type focustree =
{channel: Channel.t; subs: focustree list; focus: Focus.handle}
let channeltree (tree : Tree.t) : focustree Lwd.t =
let rec fold (tree : Tree.t) : focustree list Lwd.t =
Lwd_table.map_reduce
(fun _row (tree : Tree.t) ->
Lwd.map (fold tree) ~f:(fun (subs : focustree list) ->
{ channel= tree.channel
; subs
; focus= Focus.make () } ))
([], fun a b -> List.append a b)
tree.subs in
let {channel= tree.channel; subs= fold tree; focus= Focus.make ()} *)
let channelview (tree : Tree.t) : 'a Lwd.t * Channel.t Lwd.var =
let channel = Lwd.var tree.channel in
let rec fold ?(indent = 0) ?superfocus (tree : Tree.t) :
'a Lwd.t =
let subfocus = Focus.make () in
Lwd.join
(Lwd_table.map_reduce
(fun row (tree : Tree.t) ->
let focus =
match superfocus with
| Some sf ->
Lwd.map2 (Focus.status sf)
(Focus.status tree.focus)
~f:(fun superfocus' focus' ->
if Focus.has_focus superfocus' then
F.epr
"Focus.has_focus superfocus' = true@." ;
Focus.release sf ;
Focus.request tree.focus ;
focus' )
| None -> Focus.status tree.focus in
Lwd.map2
(Lwd.map focus ~f:(fun focus ->
if Focus.has_focus focus then
Lwd.set channel tree.channel ;
Ui.keyboard_area ~focus
(fun key ->
match key with
| `ASCII 'w', [] -> (
match Lwd_table.prev row with
| Some r -> (
match Lwd_table.get r with
| Some r ->
Focus.release tree.focus ;
Focus.request r.focus ;
`Handled
| None -> `Unhandled )
| None -> `Unhandled )
| `ASCII 'a', [] -> (
match superfocus with
| Some f ->
Focus.release tree.focus ;
Focus.request f ;
`Handled
| None -> `Unhandled )
| `ASCII 's', [] -> (
match Lwd_table.next row with
| Some r -> (
match Lwd_table.get r with
| Some r ->
Focus.release tree.focus ;
Focus.request r.focus ;
`Handled
| None -> `Unhandled )
| None -> `Unhandled )
| `ASCII 'd', [] ->
Focus.release tree.focus ;
Focus.request subfocus ;
`Handled
| _ -> `Unhandled )
(Ui.join_x
(Ui.join_x
( if Focus.has_focus focus then
string "+"
else string "" )
(string (String.make indent '-')) )
(string Tree.(tree.channel.name)) ) ) )
(fold ~indent:(indent + 1) ~superfocus:subfocus tree)
~f:(fun parent subs -> Ui.join_y parent subs) )
(Lwd_utils.lift_monoid Ui.pack_y)
tree.subs ) in
(fold tree, channel)
let messageview (ch : Channel.t Lwd.var) =
Panel.Nottui.scroll_area
(Lwd.map
(Lwd.bind (Lwd.get ch) ~f:messagelist)
~f:(P.pretty 200) )
let commview c =
let cv, ch = channelview c in
Nottui_widgets.h_pane
(Panel.Nottui.scroll_area cv)
(messageview ch)
type view = Channel of (Channel.t * view list) | Cursor of view
let panel (comm : Tree.t) =
let base = Lwd.var Nottui_widgets.empty_lwd in
Lwd.set base (commview comm) ;
Panel.Nottui.panel (Lwd.join (Lwd.get base)) ()
end
end
let _ =
let comm = Communicator.make () in
let hackint =
let comm = Communicator.Tree.make_top () in
let _irc =
Communicator.Irc.connection comm "irc.hackint.org" 6697 "cqcaml"
["#CQC"] in
Lwt.async (fun () -> hackint) ;
root_actor := std_actor (Communicator.Panel.panel comm)
(**