[997] in BarnOwl Developers
[D-O-H] r984 - in branches/barnowl_sqlite: . owl owl/perl/modules/IRC/lib/BarnOwl/Module/IRC
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:11:58 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@MIT.EDU
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Thu, 6 Mar 2008 21:09:24 -0500 (EST)
Author: nelhage
Date: 2008-03-06 21:09:23 -0500 (Thu, 06 Mar 2008)
New Revision: 984
Modified:
branches/barnowl_sqlite/
branches/barnowl_sqlite/owl/global.c
branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
branches/barnowl_sqlite/owl/perlwrap.pm
Log:
Merged revisions 977-983 via svnmerge from
svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/trunk
........
r978 | nelhage | 2008-03-01 19:29:54 -0500 (Sat, 01 Mar 2008) | 2 lines
Update perlwrap.pm documentation for the select() BarnOwl
........
r980 | nelhage | 2008-03-03 11:44:52 -0500 (Mon, 03 Mar 2008) | 2 lines
Render IRC notices as normal messages
........
r981 | shadow | 2008-03-03 15:00:24 -0500 (Mon, 03 Mar 2008) | 3 lines
ensure that even if ioctl(,TIOCGWINSZ,) returns 0s we never
set g->lines (and g->cols) to 0
........
r982 | nelhage | 2008-03-06 12:52:58 -0500 (Thu, 06 Mar 2008) | 2 lines
Typo fix in docs
........
Property changes on: branches/barnowl_sqlite
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-976
+ /trunk:1-983
Modified: branches/barnowl_sqlite/owl/global.c
===================================================================
--- branches/barnowl_sqlite/owl/global.c 2008-03-06 20:29:18 UTC (rev 983)
+++ branches/barnowl_sqlite/owl/global.c 2008-03-07 02:09:23 UTC (rev 984)
@@ -418,13 +418,21 @@
/* get the new size */
ioctl(STDIN_FILENO, TIOCGWINSZ, &size);
if (x==0) {
- g->lines=size.ws_row;
+ if (size.ws_row) {
+ g->lines=size.ws_row;
+ } else {
+ g->lines=LINES;
+ }
} else {
- g->lines=x;
+ g->lines=x;
}
if (y==0) {
- g->cols=size.ws_col;
+ if (size.ws_col) {
+ g->cols=size.ws_col;
+ } else {
+ g->cols=COLS;
+ }
} else {
g->cols=y;
}
Modified: branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-03-06 20:29:18 UTC (rev 983)
+++ branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-03-07 02:09:23 UTC (rev 984)
@@ -50,8 +50,8 @@
$self->conn->add_handler(['msg', 'notice', 'public', 'caction'],
sub { shift; $self->on_msg(@_) });
$self->conn->add_handler(['welcome', 'yourhost', 'created',
- 'luserclient', 'luserop', 'luserchannels', 'luserme',
- 'notice', 'error'],
+ 'luserclient', 'luserop', 'luserchannels', 'luserme',
+ 'error'],
sub { shift; $self->on_admin_msg(@_) });
$self->conn->add_handler(['myinfo', 'map', 'n_local', 'n_global',
'luserconns'],
Modified: branches/barnowl_sqlite/owl/perlwrap.pm
===================================================================
--- branches/barnowl_sqlite/owl/perlwrap.pm 2008-03-06 20:29:18 UTC (rev 983)
+++ branches/barnowl_sqlite/owl/perlwrap.pm 2008-03-07 02:09:23 UTC (rev 984)
@@ -88,7 +88,7 @@
Like C<start_question>, but echoes the user's input as C<*>s when they
input.
-=head2 start_editwin PROMPT CALLBACK
+=head2 start_edit_win PROMPT CALLBACK
Like C<start_question>, but displays C<PROMPT> on a line of its own
and opens the editwin. If the user cancels the edit win, C<CALLBACK>
@@ -126,6 +126,16 @@
Returns the number of colors this BarnOwl is capable of displaying
+=head2 add_dispatch FD CALLBACK
+
+Adds a file descriptor to C<BarnOwl>'s internal C<select()>
+loop. C<CALLBACK> will be invoked whenever data is available to be
+read from C<FD>.
+
+=head2 remove_dispatch FD
+
+Remove a file descriptor previously registered via C<add_dispatch>
+
=cut
@@ -774,9 +784,9 @@
=item $mainLoop
-Called on B<every pass> through the C<BarnOwl> main loop. Any
-functions with this hook should be very cheap, as they are very
-frequently by the runtime.
+Called on every pass through the C<BarnOwl> main loop. This is
+guaranteed to be called at least once/sec and may be called more
+frequently.
=item $getBuddyList
