ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.291 by root, Tue Jun 6 02:55:50 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
233 276
234 delete $self->{root}; 277 delete $self->{root};
235 delete $self->{visible}; 278 delete $self->{visible};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
240 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
242 285
243 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
244} 306}
245 307
246sub hide { 308sub hide {
247 my ($self) = @_; 309 my ($self) = @_;
248 310
… …
250 312
251 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
252 if $self->{parent}; 314 if $self->{parent};
253} 315}
254 316
255sub move { 317sub move_abs {
256 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
257 319
258 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
259 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
260 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
261 323
262 $self->update; 324 $self->update;
263} 325}
264 326
265sub set_size { 327sub set_size {
266 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
267 329
268 $self->{user_w} = $w; 330 $self->{force_w} = $w;
269 $self->{user_h} = $h; 331 $self->{force_h} = $h;
270 332
271 $self->check_size; 333 $self->realloc;
272} 334}
273 335
274sub size_request { 336sub size_request {
275 require Carp; 337 require Carp;
276 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
278 340
279sub configure { 341sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
281 343
282 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
285 349
286 # use alignment to adjust x, y 350 # use alignment to adjust x, y
287 351
288 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 354 }
293 355
294 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 357 $self->{x} = $x;
296 $self->{y} = $y; 358 $self->{y} = $y;
297 $self->update; 359 $self->update;
298 } 360 }
299 361
300 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
302 } 369 }
303} 370}
304 371
305sub size_allocate { 372sub size_allocate {
306 # nothing to be done 373 # nothing to be done
307} 374}
308 375
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
316sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
317} 382}
318 383
319sub set_max_size { 384sub set_max_size {
320 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
321 386
322 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
323 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
324} 391}
325 392
326sub set_tooltip { 393sub set_tooltip {
327 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
328 395
… …
333 400
334 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
335 402
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
339 } 406 }
340} 407}
341 408
342# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
343sub coord2local { 410sub coord2local {
… …
380 447
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS; 449 unless $FOCUS;
383} 450}
384 451
385sub mouse_motion { } 452sub mouse_motion { 0 }
386sub button_up { } 453sub button_up { 0 }
387sub key_down { } 454sub key_down { 0 }
388sub key_up { } 455sub key_up { 0 }
389 456
390sub button_down { 457sub button_down {
391 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
392 459
393 $self->focus_in; 460 $self->focus_in;
394}
395 461
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
400sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
401 538
402sub draw { 539sub draw {
403 my ($self) = @_; 540 my ($self) = @_;
404 541
405 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
406 553
407 glPushMatrix; 554 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw;
410 glPopMatrix;
411 556
412 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
413 my ($x, $y) = @$self{qw(x y)};
414
415 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
416 glEnable GL_BLEND; 559 glEnable GL_BLEND;
417 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
418 glBegin GL_QUADS; 561 glBegin GL_QUADS;
419 glVertex $x , $y; 562 glVertex 0 , 0;
420 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
421 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
422 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
423 glEnd; 566 glEnd;
424 glDisable GL_BLEND; 567 glDisable GL_BLEND;
425 } 568 }
426 569
427 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 571 glPushMatrix;
429 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
431 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 575 glVertex 0 , 0;
433 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
434 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
435 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
436 glEnd; 579 glEnd;
437 glPopMatrix; 580 glPopMatrix;
438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
439 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
440} 586}
441 587
442sub _draw { 588sub _draw {
443 my ($self) = @_; 589 my ($self) = @_;
444 590
445 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
446}
447
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506} 592}
507 593
508sub DESTROY { 594sub DESTROY {
509 my ($self) = @_; 595 my ($self) = @_;
510 596
… …
542 628
543 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
544 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
545 631
546 glEnable GL_BLEND; 632 glEnable GL_BLEND;
547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548 glColor @$color; 634 glColor_premultiply @$color;
549 635
550 glBegin GL_QUADS; 636 glBegin GL_QUADS;
551 glVertex 0 , 0; 637 glVertex 0 , 0;
552 glVertex 0 , $h; 638 glVertex 0 , $h;
553 glVertex $w, $h; 639 glVertex $w, $h;
… …
568 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
570} 656}
571 657
572sub size_request { 658sub size_request {
573 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
574} 662}
575 663
576sub draw { } 664sub draw { }
577 665
578############################################################################# 666#############################################################################
… …
582our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
583 671
584sub new { 672sub new {
585 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
586 674
587 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
588 676
589 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
590 children => [], 678 children => [],
591 can_events => 0, 679 can_events => 0,
592 %arg, 680 %arg,
593 ); 681 );
682
594 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
595 685
596 $self 686 $self
597} 687}
598 688
599sub add { 689sub add {
… …
607 $self->{children} = [ 697 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
610 ]; 700 ];
611 701
612 $self->check_size (1); 702 $self->realloc;
613 $self->update;
614} 703}
615 704
616sub children { 705sub children {
617 @{ $_[0]{children} } 706 @{ $_[0]{children} }
618} 707}
… …
623 delete $child->{parent}; 712 delete $child->{parent};
624 $child->hide; 713 $child->hide;
625 714
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 716
628 $self->check_size (1); 717 $self->realloc;
629 $self->update;
630} 718}
631 719
632sub clear { 720sub clear {
633 my ($self) = @_; 721 my ($self) = @_;
634 722
… …
638 for (@$children) { 726 for (@$children) {
639 delete $_->{parent}; 727 delete $_->{parent};
640 $_->hide; 728 $_->hide;
641 } 729 }
642 730
643 $self->check_size; 731 $self->realloc;
644 $self->update;
645} 732}
646 733
647sub find_widget { 734sub find_widget {
648 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
649 736
650 $x -= $self->{x}; 737 $x -= $self->{x};
651 $y -= $self->{y}; 738 $y -= $self->{y};
652 739
653 my $res; 740 my $res;
654 741
655 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
657 and return $res; 744 and return $res;
658 } 745 }
659 746
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
709 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
710} 797}
711 798
712############################################################################# 799#############################################################################
713 800
801# back-buffered drawing area
802
714package CFClient::UI::Window; 803package CFClient::UI::Window;
715 804
716our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
717 806
718use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
736 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 826 $self->update;
738} 827}
739 828
740sub _render { 829sub _render {
830 my ($self) = @_;
831
741 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
742} 833}
743 834
744sub render_child { 835sub render_child {
745 my ($self) = @_; 836 my ($self) = @_;
746 837
747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
748 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
750 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
751 $self->_render; 849 $self->_render;
752 }; 850 };
753} 851}
754 852
755sub _draw { 853sub _draw {
756 my ($self) = @_; 854 my ($self) = @_;
757 855
758 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
759 857
760 my $tex = $self->{texture} 858 my $tex = $self->{texture}
761 or return; 859 or return;
762 860
763 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
765 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
766 864
767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
768 866
769 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
770} 868}
… …
786} 884}
787 885
788sub size_request { 886sub size_request {
789 my ($self) = @_; 887 my ($self) = @_;
790 888
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 890
793 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
794} 895}
795 896
796sub size_allocate { 897sub size_allocate {
797 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
798 899
900 my $child = $self->child;
901
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 904
802 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
803 $self->update; 906 $self->update;
804} 907}
805 908
… …
841} 944}
842 945
843sub _render { 946sub _render {
844 my ($self) = @_; 947 my ($self) = @_;
845 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 953
848 $self->SUPER::_render; 954 $self->SUPER::_render;
849} 955}
850 956
… …
853package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
854 960
855our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
856 962
857sub new { 963sub new {
858 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
859 967
860 my $self; 968 my $self;
861 969
862 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
863 vertical => 1, 971 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 973 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
867 }, 975 },
868 ; 976 ;
869 977
870 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 980 slider => $slider,
873 @_, 981 %arg,
874 ); 982 );
875 983
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
879 986
880 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
881} 994}
882 995
883sub update { 996sub update {
884 my ($self) = @_; 997 my ($self) = @_;
885 998
… …
924 1037
925 if ($self->{bg}) { 1038 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
927 1040
928 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
931 1044
932 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
933 glVertex 0 , 0; 1046 glVertex 0 , 0;
934 glVertex 0 , $h; 1047 glVertex 0 , $h;
935 glVertex $w, $h; 1048 glVertex $w, $h;
… …
948 1061
949our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
950 1063
951use CFClient::OpenGL; 1064use CFClient::OpenGL;
952 1065
953my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
956 1073
957sub new { 1074sub new {
958 my $class = shift; 1075 my ($class, %arg) = @_;
959 1076
960 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
961 1078
962 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1082 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1083 can_events => 1,
968 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
969 ); 1087 );
970 1088
971 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
972 align => 0, 1090 align => 0,
973 valign => 1, 1091 valign => 1,
974 text => $self->{title}, 1092 text => $title,
975 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
976 1095
977 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
978} 1104}
979 1105
980sub border { 1106sub border {
981 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
982} 1108}
983 1109
984sub size_request { 1110sub size_request {
985 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
986 1115
987 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
988 1117
989 ( 1118 (
990 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
993} 1122}
994 1123
995sub size_allocate { 1124sub size_allocate {
996 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
997 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
998 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1000 1137
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1005} 1139}
1006 1140
1007sub button_down { 1141sub button_down {
1008 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1009 1143
… …
1025 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1026 1160
1027 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1029 1163
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1168 $self->realloc;
1034 }; 1169 };
1035 1170
1036 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1175 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1042 1177
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1179
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1048 } 1188 1
1049} 1189}
1050 1190
1051sub button_up { 1191sub button_up {
1052 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1053 1193
1054 delete $self->{motion}; 1194 !!delete $self->{motion}
1055} 1195}
1056 1196
1057sub mouse_motion { 1197sub mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1059 1199
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1061} 1203}
1062 1204
1063sub _draw { 1205sub _draw {
1064 my ($self) = @_; 1206 my ($self) = @_;
1065 1207
1208 my $child = $self->{children}[0];
1209
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1212
1069 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1215
1072 my $border = $self->border; 1216 my $border = $self->border;
1073 1217
1074 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1223
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1082 1226
1083 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1232 }
1094 1233
1095 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1096 1235
1097 $self->{title}->draw if $self->{title};
1098
1099 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1100} 1242}
1101 1243
1102############################################################################# 1244#############################################################################
1103 1245
1104package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1126 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1127 1269
1128 $child->set_parent ($self); 1270 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1130 1272
1131 $self->check_size (1); 1273 $self->realloc;
1132} 1274}
1133 1275
1134# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1135sub clear { 1277sub clear {
1136 my ($self) = @_; 1278 my ($self) = @_;
… …
1141 for (@children) { 1283 for (@children) {
1142 delete $_->{parent}; 1284 delete $_->{parent};
1143 $_->hide; 1285 $_->hide;
1144 } 1286 }
1145 1287
1146 $self->check_size (1); 1288 $self->realloc;
1147 $self->update;
1148} 1289}
1149 1290
1150sub get_wh { 1291sub get_wh {
1151 my ($self) = @_; 1292 my ($self) = @_;
1152 1293
… …
1248 } 1389 }
1249} 1390}
1250 1391
1251############################################################################# 1392#############################################################################
1252 1393
1253package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1395
1257our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1258 1397
1259sub size_request { 1398sub size_request {
1260 my ($self) = @_; 1399 my ($self) = @_;
1261 1400
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1263 1402 ? (
1264 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1405 )
1267 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1268} 1410}
1269 1411
1270sub size_allocate { 1412sub size_allocate {
1271 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1272 1414
1273 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1416 my $children = $self->{children};
1276 1417
1277 my @h = map $_->{req_w}, @$children; 1418 my @req;
1278 1419
1279 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1280 1421 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1436 }
1295 } 1437 }
1296 1438
1297 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1298 1440
1299 my $y = 0; 1441 my $pos = 0;
1300 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1445
1305 $y += $h; 1446 $pos += $alloc;
1306 } 1447 }
1307 1448
1308 1 1449 1
1309} 1450}
1310 1451
1311############################################################################# 1452#############################################################################
1312 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1313package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1314 1470
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1318 1472
1319sub size_request { 1473sub new {
1320 my ($self) = @_; 1474 my $class = shift;
1321 1475
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1323 1477 vertical => 1,
1324 ( 1478 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1479 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1480}
1368 1481
1369############################################################################# 1482#############################################################################
1370 1483
1371package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1388 ellipsise => 3, # end 1501 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1390 fontsize => 1, 1503 fontsize => 1,
1391 align => -1, 1504 align => -1,
1392 valign => -1, 1505 valign => -1,
1393 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1394 can_events => 0, 1508 can_events => 0,
1395 %arg 1509 %arg
1396 ); 1510 );
1397 1511
1398 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1425 1539
1426 delete $self->{texture}; 1540 delete $self->{texture};
1427 $self->SUPER::update; 1541 $self->SUPER::update;
1428} 1542}
1429 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1430sub set_text { 1551sub set_text {
1431 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1432 1553
1433 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1434 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1435 1556
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1438 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1439 $self->update; 1562 $self->update;
1440 $self->check_size;
1441} 1563}
1442 1564
1443sub set_markup { 1565sub set_markup {
1444 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1445 1567
… …
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1572
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1452 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1453 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1454 $self->update; 1578 $self->update;
1455 $self->check_size;
1456} 1579}
1457 1580
1458sub size_request { 1581sub size_request {
1459 my ($self) = @_; 1582 my ($self) = @_;
1460 1583
1584 $self->{size_req} ||= do {
1461 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1462 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1466 1590
1467 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1468 1592
1469 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1470 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1471 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1472 1596
1473 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1474 1598
1475 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1477 } 1604 };
1478 1605
1479 ( 1606 @{ $self->{size_req} }
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1607}
1484 1608
1485sub size_allocate { 1609sub size_allocate {
1486 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1487 1611
1612 delete $self->{ox};
1613
1488 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489} 1616}
1490 1617
1491sub set_fontsize { 1618sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1493 1620
1494 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1622 delete $self->{texture};
1496 1623
1497 $self->update; 1624 $self->realloc;
1498 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1499} 1633}
1500 1634
1501sub _draw { 1635sub _draw {
1502 my ($self) = @_; 1636 my ($self) = @_;
1503 1637
… …
1509 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1647
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1515 1650
1651 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1519 1655
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1659 };
1526 1660
1527 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1529 1662
1530 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1533 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1535 } 1670 }
1536 1671
1537 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1538} 1673}
… …
1556 can_hover => 1, 1691 can_hover => 1,
1557 can_focus => 1, 1692 can_focus => 1,
1558 valign => 0, 1693 valign => 0,
1559 can_events => 1, 1694 can_events => 1,
1560 #text => ... 1695 #text => ...
1696 #hidden => "*",
1561 @_ 1697 @_
1562 ) 1698 )
1563} 1699}
1564 1700
1565sub _set_text { 1701sub _set_text {
… …
1567 1703
1568 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1569 1705
1570 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1571 1707
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 1709 $self->{text} = $text;
1576 1710
1577 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1579 1714
1580 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1581} 1719}
1582 1720
1583sub set_text { 1721sub set_text {
1584 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1585 1723
1586 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1725 $self->_set_text ($text);
1588 $self->update;
1589 $self->check_size;
1590} 1726}
1591 1727
1592sub get_text { 1728sub get_text {
1593 $_[0]{text} 1729 $_[0]{text}
1594} 1730}
… …
1624 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1761 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1762 $self->_emit ('escape');
1627 } elsif ($uni) { 1763 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1629 } 1767 }
1630 1768
1631 $self->_set_text ($text); 1769 $self->_set_text ($text);
1632 $self->update; 1770
1633 $self->check_size; 1771 $self->realloc;
1772
1773 1
1634} 1774}
1635 1775
1636sub focus_in { 1776sub focus_in {
1637 my ($self) = @_; 1777 my ($self) = @_;
1638 1778
… …
1653 utf8::encode $text; 1793 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1655 1795
1656 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1657 $self->update; 1797 $self->update;
1798
1799 1
1658} 1800}
1659 1801
1660sub mouse_motion { 1802sub mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1662# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1663} 1807}
1664 1808
1665sub _draw { 1809sub _draw {
1666 my ($self) = @_; 1810 my ($self) = @_;
1667 1811
1668 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1669 1813
1670 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1673 } else { 1817 } else {
1674 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1675 } 1819 }
1676 1820
1677 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1680 glVertex 0 , 0; 1824 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1744 } else { 1888 } else {
1745 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1746 } 1890 }
1747 1891
1748 } else { 1892 } else {
1749 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1750 } 1896 1
1751
1752} 1897}
1753 1898
1754############################################################################# 1899#############################################################################
1755 1900
1756package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1765 1910
1766sub new { 1911sub new {
1767 my $class = shift; 1912 my $class = shift;
1768 1913
1769 $class->SUPER::new ( 1914 $class->SUPER::new (
1770 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1771 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1773 can_hover => 1, 1919 can_hover => 1,
1774 align => 0, 1920 align => 0,
1775 valign => 0, 1921 valign => 0,
… …
1784 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1785 1931
1786 $self->emit ("activate") 1932 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1934 && $y >= 0 && $y < $self->{h};
1935
1936 1
1789} 1937}
1790 1938
1791sub _draw { 1939sub _draw {
1792 my ($self) = @_; 1940 my ($self) = @_;
1793 1941
1794 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 1943
1800 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1803 1947
… …
1822 1966
1823sub new { 1967sub new {
1824 my $class = shift; 1968 my $class = shift;
1825 1969
1826 $class->SUPER::new ( 1970 $class->SUPER::new (
1827 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1828 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 1975 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 1976 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 1977 state => 0,
… …
1836} 1981}
1837 1982
1838sub size_request { 1983sub size_request {
1839 my ($self) = @_; 1984 my ($self) = @_;
1840 1985
1841 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1842} 1987}
1843 1988
1844sub button_down { 1989sub button_down {
1845 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1846 1991
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1851 } 2000 1
1852} 2001}
1853 2002
1854sub _draw { 2003sub _draw {
1855 my ($self) = @_; 2004 my ($self) = @_;
1856 2005
1857 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1858 2007
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 2009
1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1862 2013
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 2015
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 2017
… …
2021 2172
2022 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
2024 2175
2025 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
2026 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2027 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2181
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2131 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2285 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2286 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2287 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2138 vertical => 0, 2290 vertical => 0,
2139 can_hover => 1, 2291 can_hover => 1,
2140 inner_pad => 0.02, 2292 inner_pad => 0.02,
2141 @_ 2293 @_
2142 ); 2294 );
… …
2145 $self->update; 2297 $self->update;
2146 2298
2147 $self 2299 $self
2148} 2300}
2149 2301
2302sub changed { }
2303
2150sub set_range { 2304sub set_range {
2151 my ($self, $range) = @_; 2305 my ($self, $range) = @_;
2152 2306
2153 ($range, $self->{range}) = ($self->{range}, $range); 2307 ($range, $self->{range}) = ($self->{range}, $range);
2154 2308
… …
2180} 2334}
2181 2335
2182sub size_request { 2336sub size_request {
2183 my ($self) = @_; 2337 my ($self) = @_;
2184 2338
2185 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2340}
2190 2341
2191sub button_down { 2342sub button_down {
2192 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2193 2344
2194 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2195 2346
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2348
2198 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2199} 2350}
2200 2351
2201sub mouse_motion { 2352sub mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2203 2354
… …
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2359
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2361
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2212 } 2367 1
2213} 2368}
2214 2369
2215sub update { 2370sub update {
2216 my ($self) = @_; 2371 my ($self) = @_;
2217 2372
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2219 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2220 2382
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2384 my $range = ($hi - $page - $lo) || 1e-100;
2223 2385
… …
2229 $value = ($value - $lo) / $range; 2391 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2392 $value = $value * $self->{scale} + $self->{offset};
2231 2393
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2395 $self->{knob_w} = $knob_w;
2234 }); 2396 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2397
2242 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2243 2399
2244 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2245 2401
… …
2439 2595
2440 delete $self->{texture}; 2596 delete $self->{texture};
2441 } 2597 }
2442 2598
2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 2600 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 2601 glClear GL_COLOR_BUFFER_BIT;
2446 2602
2447 my $top = int $self->{children}[1]{range}[0]; 2603 my $top = int $self->{children}[1]{range}[0];
2448 2604
2449 my $y0 = $top; 2605 my $y0 = $top;
… …
2484sub _draw { 2640sub _draw {
2485 my ($self) = @_; 2641 my ($self) = @_;
2486 2642
2487 glEnable GL_TEXTURE_2D; 2643 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 2645 glColor 0, 0, 0, 1;
2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2646 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2491 glDisable GL_TEXTURE_2D; 2647 glDisable GL_TEXTURE_2D;
2492 2648
2493 $self->{children}[1]->draw; 2649 $self->{children}[1]->draw;
2494 2650
2495} 2651}
… …
2544 2700
2545sub new { 2701sub new {
2546 my $class = shift; 2702 my $class = shift;
2547 2703
2548 my $self = $class->SUPER::new ( 2704 my $self = $class->SUPER::new (
2549 state => 0, 2705 state => 0,
2550 connect_activate => \&toggle_flopper, 2706 on_activate => \&toggle_flopper,
2551 @_ 2707 @_
2552 ); 2708 );
2553 2709
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2710 $self
2560} 2711}
2561 2712
2562sub toggle_flopper { 2713sub toggle_flopper {
2563 my ($self) = @_; 2714 my ($self) = @_;
2564 2715
2565 # TODO: use animation 2716 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2717}
2577 2718
2578############################################################################# 2719#############################################################################
2579 2720
2580package CFClient::UI::Tooltip; 2721package CFClient::UI::Tooltip;
… …
2593} 2734}
2594 2735
2595sub set_tooltip_from { 2736sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2737 my ($self, $widget) = @_;
2597 2738
2739 my $tooltip = $widget->{tooltip};
2740
2741 if ($ENV{CFPLUS_DEBUG} & 2) {
2742 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}";
2746 }
2747
2598 $self->add (new CFClient::UI::Label 2748 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2749 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2751 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2752 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2753 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2754 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2615 2765
2616sub size_allocate { 2766sub size_allocate {
2617 my ($self, $w, $h) = @_; 2767 my ($self, $w, $h) = @_;
2618 2768
2619 $self->SUPER::size_allocate ($w - 4, $h - 4); 2769 $self->SUPER::size_allocate ($w - 4, $h - 4);
2770}
2771
2772sub visibility_change {
2773 my ($self, $visible) = @_;
2774
2775 return unless $visible;
2776
2777 $self->{root}->on_post_alloc ("move_$self" => sub {
2778 my $widget = $self->{owner}
2779 or return;
2780
2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782
2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784 if $x + $self->{w} > $::WIDTH;
2785
2786 $self->move_abs ($x, $y);
2787 });
2620} 2788}
2621 2789
2622sub _draw { 2790sub _draw {
2623 my ($self) = @_; 2791 my ($self) = @_;
2624 2792
… …
2641 glVertex $w, $h; 2809 glVertex $w, $h;
2642 glVertex $w, 0; 2810 glVertex $w, 0;
2643 glEnd; 2811 glEnd;
2644 2812
2645 glTranslate 2 - 0.375, 2 - 0.375; 2813 glTranslate 2 - 0.375, 2 - 0.375;
2814
2646 $self->SUPER::_draw; 2815 $self->SUPER::_draw;
2647} 2816}
2648 2817
2649############################################################################# 2818#############################################################################
2650 2819
… …
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2878 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2710 2879
2711 if ($tex) { 2880 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 2881 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 2883 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2717 } 2886 }
2718} 2887}
2719 2888
… …
2726 $self->SUPER::DESTROY; 2895 $self->SUPER::DESTROY;
2727} 2896}
2728 2897
2729############################################################################# 2898#############################################################################
2730 2899
2731package CFClient::UI::Inventory; 2900package CFClient::UI::Buttonbar;
2732 2901
2733our @ISA = CFClient::UI::ScrolledWindow::; 2902our @ISA = CFClient::UI::HBox::;
2734 2903
2735sub new { 2904# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 2905
2776############################################################################# 2906#############################################################################
2777 2907
2778package CFClient::UI::Menu; 2908package CFClient::UI::Menu;
2779 2909
… …
2791 ); 2921 );
2792 2922
2793 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2923 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2794 2924
2795 for my $item (@{ $self->{items} }) { 2925 for my $item (@{ $self->{items} }) {
2796 my ($widget, $cb) = @$item; 2926 my ($widget, $cb, $tooltip) = @$item;
2797 2927
2798 # handle various types of items, only text for now 2928 # handle various types of items, only text for now
2799 if (!ref $widget) { 2929 if (!ref $widget) {
2800 $widget = new CFClient::UI::Label 2930 $widget = new CFClient::UI::Label
2801 can_hover => 1, 2931 can_hover => 1,
2802 can_events => 1, 2932 can_events => 1,
2803 text => $widget; 2933 text => $widget,
2934 tooltip => $tooltip
2804 } 2935 }
2805 2936
2806 $self->{item}{$widget} = $item; 2937 $self->{item}{$widget} = $item;
2807 2938
2808 $self->{vbox}->add ($widget); 2939 $self->{vbox}->add ($widget);
… …
2820 # maybe save $GRAB? must be careful about events... 2951 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 2952 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 2953 $self->{button} = $ev->{button};
2823 2954
2824 $self->show; 2955 $self->show;
2825 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2956 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2826} 2957}
2827 2958
2828sub mouse_motion { 2959sub mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2830 2961
2831 # TODO: should use vbox->find_widget or so 2962 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 2964 $self->{hover} = $self->{item}{$HOVER};
2965
2966 0
2834} 2967}
2835 2968
2836sub button_up { 2969sub button_up {
2837 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2838 2971
… …
2840 undef $GRAB; 2973 undef $GRAB;
2841 $self->hide; 2974 $self->hide;
2842 2975
2843 $self->_emit ("popdown"); 2976 $self->_emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 2977 $self->{hover}[1]->() if $self->{hover};
2978 } else {
2979 return 0
2980 }
2981
2845 } 2982 1
2846} 2983}
2847 2984
2848############################################################################# 2985#############################################################################
2849 2986
2850package CFClient::UI::Statusbox; 2987package CFClient::UI::Multiplexer;
2851 2988
2852our @ISA = CFClient::UI::VBox::; 2989our @ISA = CFClient::UI::Container::;
2853 2990
2854sub new { 2991sub new {
2855 my $class = shift; 2992 my $class = shift;
2856 2993
2857 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 @_,
2996 );
2997
2998 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} };
3000
3001 $self
3002}
3003
3004sub add {
3005 my ($self, @widgets) = @_;
3006
3007 $self->SUPER::add (@widgets);
3008
3009 $self->{current} = $self->{children}[0]
3010 if @{ $self->{children} };
3011}
3012
3013sub set_current_page {
3014 my ($self, $page_or_widget) = @_;
3015
3016 my $widget = ref $page_or_widget
3017 ? $page_or_widget
3018 : $self->{children}[$page_or_widget];
3019
3020 $self->{current} = $widget;
3021 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022
3023 $self->_emit (page_changed => $self->{current});
3024
3025 $self->realloc;
3026}
3027
3028sub visible_children {
3029 $_[0]{current}
3030}
3031
3032sub size_request {
3033 my ($self) = @_;
3034
3035 $self->{current}->size_request
3036}
3037
3038sub size_allocate {
3039 my ($self, $w, $h) = @_;
3040
3041 $self->{current}->configure (0, 0, $w, $h);
3042}
3043
3044sub _draw {
3045 my ($self) = @_;
3046
3047 $self->{current}->draw;
3048}
3049
3050#############################################################################
3051
3052package CFClient::UI::Notebook;
3053
3054our @ISA = CFClient::UI::VBox::;
3055
3056sub new {
3057 my $class = shift;
3058
3059 my $self = $class->SUPER::new (
3060 buttonbar => (new CFClient::UI::Buttonbar),
3061 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3062 # filter => # will be put between multiplexer and $self
3063 @_,
3064 );
3065
3066 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3067 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3068
3069 $self
3070}
3071
3072sub add {
3073 my ($self, $title, $widget, $tooltip) = @_;
3074
3075 Scalar::Util::weaken $self;
3076
3077 $self->{buttonbar}->add (new CFClient::UI::Button
3078 markup => $title,
3079 tooltip => $tooltip,
3080 on_activate => sub { $self->set_current_page ($widget) },
3081 );
3082
3083 $self->{multiplexer}->add ($widget);
3084}
3085
3086sub set_current_page {
3087 my ($self, $page) = @_;
3088
3089 $self->{multiplexer}->set_current_page ($page);
3090 $self->_emit (page_changed => $self->{multiplexer}{current});
3091}
3092
3093#############################################################################
3094
3095package CFClient::UI::Combobox;
3096
3097use utf8;
3098
3099our @ISA = CFClient::UI::Button::;
3100
3101sub new {
3102 my $class = shift;
3103
3104 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ...
3106 value => undef,
3107 @_,
3108 );
3109
3110 $self->_set_value ($self->{value});
3111
3112 $self
3113}
3114
3115sub button_down {
3116 my ($self, $ev) = @_;
3117
3118 my @menu_items;
3119
3120 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_;
3122
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3124 }
3125
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127}
3128
3129sub _set_value {
3130 my ($self, $value) = @_;
3131
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3133 or return;
3134
3135 $self->{value} = $item->[1];
3136 $self->set_markup ("$item->[0] ⇓");
3137 $self->set_tooltip ($item->[2]);
3138}
3139
3140sub set_value {
3141 my ($self, $value) = @_;
3142
3143 return unless $self->{value} ne $value;
3144
3145 $self->_set_value ($value);
3146 $self->_emit (changed => $value);
3147}
3148
3149#############################################################################
3150
3151package CFClient::UI::Statusbox;
3152
3153our @ISA = CFClient::UI::VBox::;
3154
3155sub new {
3156 my $class = shift;
3157
3158 my $self = $class->SUPER::new (
2858 fontsize => 0.8, 3159 fontsize => 0.8,
2859 @_, 3160 @_,
2860 ) 3161 );
3162
3163 Scalar::Util::weaken (my $this = $self);
3164
3165 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3166
3167 $self
2861} 3168}
2862 3169
2863sub reorder { 3170sub reorder {
2864 my ($self) = @_; 3171 my ($self) = @_;
2865 my $NOW = time; 3172 my $NOW = Time::HiRes::time;
3173
3174 # freeze display when hovering over any label
3175 return if $CFClient::UI::TOOLTIP->{owner}
3176 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3177 values %{ $self->{item} };
2866 3178
2867 while (my ($k, $v) = each %{ $self->{item} }) { 3179 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3180 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 } 3181 }
2870 3182
… …
2873 my @items = sort { 3185 my @items = sort {
2874 $a->{pri} <=> $b->{pri} 3186 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id} 3187 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} }; 3188 } values %{ $self->{item} };
2877 3189
3190 $self->{timer}->interval (1);
3191
2878 my $count = 10 + 1; 3192 my $count = 10 + 1;
2879 for my $item (@items) { 3193 for my $item (@items) {
2880 last unless --$count; 3194 last unless --$count;
2881 3195
2882 push @widgets, $item->{label} ||= do { 3196 my $label = $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all) 3197 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1 3198 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}" 3199 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text}; 3200 : $item->{text};
2887 3201
… …
2895 tooltip => $item->{tooltip}, 3209 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP, 3210 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67, 3211 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize}, 3212 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44, 3213 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg}, 3214 fg => [@{ $item->{fg} }],
2901 can_events => 1, 3215 can_events => 1,
2902 can_hover => 1 3216 can_hover => 1
2903 }; 3217 };
3218
3219 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3220 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3221 $label->update;
3222 $label->set_max_size (undef, $label->{req_h} * $diff)
3223 if $diff < 1;
3224 $self->{timer}->interval (1/30);
3225 } else {
3226 $label->{fg}[3] = $item->{fg}[3] || 1;
3227 }
3228
3229 push @widgets, $label;
2904 } 3230 }
2905 3231
2906 $self->clear; 3232 $self->clear;
2907 $self->SUPER::add (reverse @widgets); 3233 $self->SUPER::add (reverse @widgets);
2908} 3234}
… …
2913 $text =~ s/^\s+//; 3239 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//; 3240 $text =~ s/\s+$//;
2915 3241
2916 return unless $text; 3242 return unless $text;
2917 3243
2918 my $timeout = time + ((delete $arg{timeout}) || 60); 3244 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2919 3245
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3246 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921 3247
2922 if (my $item = $self->{item}{$group}) { 3248 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) { 3249 if ($item->{text} eq $text) {
… …
2953 3279
2954 $self->reorder; 3280 $self->reorder;
2955 $self->SUPER::reconfigure; 3281 $self->SUPER::reconfigure;
2956} 3282}
2957 3283
3284sub DESTROY {
3285 my ($self) = @_;
3286
3287 $self->{timer}->cancel;
3288
3289 $self->SUPER::DESTROY;
3290}
3291
2958############################################################################# 3292#############################################################################
2959 3293
2960package CFClient::UI::Root; 3294package CFClient::UI::Inventory;
2961 3295
2962our @ISA = CFClient::UI::Container::; 3296our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3297
2966sub new { 3298sub new {
2967 my $class = shift; 3299 my $class = shift;
2968 3300
2969 $class->SUPER::new ( 3301 my $self = $class->SUPER::new (
3302 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3303 @_,
3304 );
3305
3306 $self
3307}
3308
3309sub set_items {
3310 my ($self, $items) = @_;
3311
3312 $self->{child}->clear;
3313 return unless $items;
3314
3315 my @items = sort {
3316 ($a->{type} <=> $b->{type})
3317 or ($a->{name} cmp $b->{name})
3318 } @$items;
3319
3320 $self->{real_items} = \@items;
3321
3322 my $row = 0;
3323 for my $item (@items) {
3324 CFClient::Item::update_widgets $item;
3325
3326 $self->{child}->add (0, $row, $item->{face_widget});
3327 $self->{child}->add (1, $row, $item->{desc_widget});
3328 $self->{child}->add (2, $row, $item->{weight_widget});
3329
3330 $row++;
3331 }
3332}
3333
3334#############################################################################
3335
3336package CFClient::UI::BindEditor;
3337
3338our @ISA = CFClient::UI::FancyFrame::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3344
3345 $self->add (my $vb = new CFClient::UI::VBox);
3346
3347
3348 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3349 text => "start recording",
3350 tooltip => "Start/Stops recording of actions."
3351 ."All subsequent actions after the recording started will be captured."
3352 ."The actions are displayed after the record was stopped."
3353 ."To bind the action you have to click on the 'Bind' button",
3354 on_activate => sub {
3355 unless ($self->{recording}) {
3356 $self->start;
3357 } else {
3358 $self->stop;
3359 }
3360 });
3361
3362 $vb->add (new CFClient::UI::Label text => "Actions:");
3363 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3364
3365 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3366 $vb->add (my $hb = new CFClient::UI::HBox);
3367 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3368 $hb->add (new CFClient::UI::Button
3369 text => "bind",
3370 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3371 on_activate => sub {
3372 $self->ask_for_bind;
3373 });
3374
3375 $vb->add (my $hb = new CFClient::UI::HBox);
3376 $hb->add (new CFClient::UI::Button
3377 text => "ok",
3378 expand => 1,
3379 tooltip => "This closes the binding editor and saves the binding",
3380 on_activate => sub {
3381 $self->hide;
3382 $self->commit;
3383 });
3384
3385 $hb->add (new CFClient::UI::Button
3386 text => "cancel",
3387 expand => 1,
3388 tooltip => "This closes the binding editor without saving",
3389 on_activate => sub {
3390 $self->hide;
3391 $self->{binding_cancel}->()
3392 if $self->{binding_cancel};
3393 });
3394
3395 $self->update_binding_widgets;
3396
3397 $self
3398}
3399
3400sub commit {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 if ($sym != 0 && @$cmds > 0) {
3404 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3405 ."'. Don't forget 'Save Config'!");
3406 $self->{binding_change}->($mod, $sym, $cmds)
3407 if $self->{binding_change};
3408 } else {
3409 $::STATUSBOX->add ("No action bound, no key or action specified!");
3410 $self->{binding_cancel}->()
3411 if $self->{binding_cancel};
3412 }
3413}
3414
3415sub start {
3416 my ($self) = @_;
3417
3418 $self->{rec_btn}->set_text ("stop recording");
3419 $self->{recording} = 1;
3420 $self->clear_command_list;
3421 $::CONN->start_record if $::CONN;
3422}
3423
3424sub stop {
3425 my ($self) = @_;
3426
3427 $self->{rec_btn}->set_text ("start recording");
3428 $self->{recording} = 0;
3429
3430 my $rec;
3431 $rec = $::CONN->stop_record if $::CONN;
3432 return unless ref $rec eq 'ARRAY';
3433 $self->set_command_list ($rec);
3434}
3435
3436
3437sub ask_for_bind_and_commit {
3438 my ($self) = @_;
3439 $self->ask_for_bind (1);
3440}
3441
3442sub ask_for_bind {
3443 my ($self, $commit) = @_;
3444
3445 CFClient::Binder::open_binding_dialog (sub {
3446 my ($mod, $sym) = @_;
3447 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3448 $self->update_binding_widgets;
3449 $self->commit if $commit;
3450 });
3451}
3452
3453# $mod and $sym are the modifiers and key symbol
3454# $cmds is a array ref of strings (the commands)
3455# $cb is the callback that is executed on OK
3456# $ccb is the callback that is executed on CANCEL and
3457# when the binding was unsuccessful on OK
3458sub set_binding {
3459 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3460
3461 $self->clear_command_list;
3462 $self->{recording} = 0;
3463 $self->{rec_btn}->set_text ("start recording");
3464
3465 $self->{binding} = [$mod, $sym];
3466 $self->{commands} = $cmds;
3467
3468 $self->{binding_change} = $cb;
3469 $self->{binding_cancel} = $ccb;
3470
3471 $self->update_binding_widgets;
3472}
3473
3474# this is a shortcut method that asks for a binding
3475# and then just binds it.
3476sub do_quick_binding {
3477 my ($self, $cmds) = @_;
3478 $self->set_binding (undef, undef, $cmds, sub {
3479 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3480 });
3481 $self->ask_for_bind (1);
3482}
3483
3484sub update_binding_widgets {
3485 my ($self) = @_;
3486 my ($mod, $sym, $cmds) = $self->get_binding;
3487 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3488 $self->set_command_list ($cmds);
3489}
3490
3491sub get_binding {
3492 my ($self) = @_;
3493 return (
3494 $self->{binding}->[0],
3495 $self->{binding}->[1],
3496 [ grep { defined $_ } @{$self->{commands}} ]
3497 );
3498}
3499
3500sub clear_command_list {
3501 my ($self) = @_;
3502 $self->{cmdbox}->clear ();
3503}
3504
3505sub set_command_list {
3506 my ($self, $cmds) = @_;
3507
3508 $self->{cmdbox}->clear ();
3509 $self->{commands} = $cmds;
3510
3511 my $idx = 0;
3512
3513 for (@$cmds) {
3514 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3515
3516 my $i = $idx;
3517 $hb->add (new CFClient::UI::Label text => $_);
3518 $hb->add (new CFClient::UI::Button
3519 text => "delete",
3520 tooltip => "Deletes the action from the record",
3521 on_activate => sub {
3522 $self->{cmdbox}->remove ($hb);
3523 $cmds->[$i] = undef;
3524 });
3525
3526
3527 $idx++
3528 }
3529}
3530
3531#############################################################################
3532
3533package CFClient::UI::SpellList;
3534
3535our @ISA = CFClient::UI::Table::;
3536
3537sub new {
3538 my $class = shift;
3539
3540 my $self = $class->SUPER::new (
3541 binding => [],
3542 commands => [],
3543 @_,
3544 )
3545}
3546
3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3549my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3551my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3553
3554sub rebuild_spell_list {
3555 my ($self) = @_;
3556
3557 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear;
3559
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3561 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564
3565 my $row = 0;
3566
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_};
3569
3570 $row++;
3571
3572 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face},
3574 can_hover => 1,
3575 can_events => 1,
3576 tooltip => $spell->{message},
3577 );
3578
3579 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1,
3581 text => $spell->{name},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591 # TODO: should be done via popup
3592 $self->add (5, $row, new CFClient::UI::Button
3593 text => "bind",
3594 tooltip => "bind spell readying (cast command) to key",
3595 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596 );
3597 }
3598 });
3599}
3600
3601sub add_spell {
3602 my ($self, $spell) = @_;
3603
3604 $self->{spell}->{$spell->{name}} = $spell;
3605 $self->rebuild_spell_list;
3606}
3607
3608sub remove_spell {
3609 my ($self, $spell) = @_;
3610
3611 delete $self->{spell}->{$spell->{name}};
3612 $self->rebuild_spell_list;
3613}
3614
3615#############################################################################
3616
3617package CFClient::UI::Root;
3618
3619our @ISA = CFClient::UI::Container::;
3620
3621use List::Util qw(min max);
3622
3623use CFClient::OpenGL;
3624
3625sub new {
3626 my $class = shift;
3627
3628 my $self = $class->SUPER::new (
2970 visible => 1, 3629 visible => 1,
2971 @_, 3630 @_,
2972 ) 3631 );
2973}
2974 3632
2975sub configure { 3633 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3634
2978 $self->{w} = $w; 3635 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3636}
2988 3637
2989sub size_request { 3638sub size_request {
2990 my ($self) = @_; 3639 my ($self) = @_;
2991 3640
2992 ($self->{w}, $self->{h}) 3641 ($self->{w}, $self->{h})
3642}
3643
3644sub _to_pixel {
3645 my ($coord, $size, $max) = @_;
3646
3647 $coord =
3648 $coord eq "center" ? ($max - $size) * 0.5
3649 : $coord eq "max" ? $max
3650 : $coord;
3651
3652 $coord = 0 if $coord < 0;
3653 $coord = $max - $size if $coord > $max - $size;
3654
3655 int $coord + 0.5
2993} 3656}
2994 3657
2995sub size_allocate { 3658sub size_allocate {
2996 my ($self, $w, $h) = @_; 3659 my ($self, $w, $h) = @_;
2997 3660
2998 for my $child ($self->children) { 3661 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3662 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 3663
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3664 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3665 $Y = $child->{force_y} if exists $child->{force_y};
3003 3666
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3667 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3668 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3669
3010 $child->configure ($X, $Y, $W, $H); 3670 $child->configure ($X, $Y, $W, $H);
3011 } 3671 }
3012} 3672}
3013 3673
… …
3024} 3684}
3025 3685
3026sub update { 3686sub update {
3027 my ($self) = @_; 3687 my ($self) = @_;
3028 3688
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3689 $::WANT_REFRESH++;
3031} 3690}
3032 3691
3033sub add { 3692sub add {
3034 my ($self, @children) = @_; 3693 my ($self, @children) = @_;
3035 3694
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3695 $_->{is_toplevel} = 1
3044 3696 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3697
3050 $self->SUPER::add (@children); 3698 $self->SUPER::add (@children);
3051} 3699}
3052 3700
3053sub remove { 3701sub remove {
3054 my ($self, @children) = @_; 3702 my ($self, @children) = @_;
3055 3703
3056 $self->SUPER::remove (@children); 3704 $self->SUPER::remove (@children);
3705
3706 delete $self->{is_toplevel}
3707 for @children;
3057 3708
3058 while (@children) { 3709 while (@children) {
3059 my $w = pop @children; 3710 my $w = pop @children;
3060 push @children, $w->children; 3711 push @children, $w->children;
3061 $w->set_invisible; 3712 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 3731 while ($self->{refresh_hook}) {
3081 $_->() 3732 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3733 for values %{delete $self->{refresh_hook}};
3083 } 3734 }
3084 3735
3085 if ($self->{check_size}) { 3736 if ($self->{realloc}) {
3086 my @queue = ([], []); 3737 my %queue;
3738 my @queue;
3739 my $widget;
3087 3740
3088 for (;;) { 3741 outer:
3089 if ($self->{check_size}) { 3742 while () {
3090 # heuristic: check containers last 3743 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3744 for $widget (values %$realloc) {
3092 for values %{delete $self->{check_size}} 3745 $widget->{visible} or next; # do not resize invisible widgets
3746
3747 $queue{$widget+0}++ and next; # duplicates are common
3748
3749 push @{ $queue[$widget->{visible}] }, $widget;
3750 }
3093 } 3751 }
3094 3752
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3753 while () {
3754 @queue or last outer;
3096 3755
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3756 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3757 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 3758
3759 pop @queue;
3760 }
3761
3762 delete $queue{$widget+0};
3763
3764 my ($w, $h) = $widget->size_request;
3765
3766 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3767 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3768
3769 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3770 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3771
3772 $w = $widget->{force_w} if exists $widget->{force_w};
3773 $h = $widget->{force_h} if exists $widget->{force_h};
3774
3775 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3776 || delete $widget->{force_realloc}) {
3105 $widget->{req_w} = $w; 3777 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3778 $widget->{req_h} = $h;
3107 3779
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3780 $self->{size_alloc}{$widget+0} = $widget;
3109 3781
3110 $widget->{parent}->check_size
3111 if $widget->{parent}; 3782 if (my $parent = $widget->{parent}) {
3783 $self->{realloc}{$parent+0} = $parent
3784 unless $queue{$parent+0};
3785
3786 $parent->{force_size_alloc} = 1;
3787 $self->{size_alloc}{$parent+0} = $parent;
3788 }
3112 } 3789 }
3790
3791 delete $self->{realloc}{$widget+0};
3113 } 3792 }
3114 } 3793 }
3115 3794
3116 while ($self->{size_alloc}) { 3795 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3796 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 my ($widget, $w, $h) = @$_; 3797 values %$size_alloc;
3798
3799 while () {
3800 my $widget = pop @queue || last;
3801
3802 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3119 3803
3120 $w = 0 if $w < 0; 3804 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3805 $h = 0 if $h < 0;
3122 3806
3807 $w = int $w + 0.5;
3808 $h = int $h + 0.5;
3809
3810 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3811 $widget->{old_w} = $widget->{w};
3812 $widget->{old_h} = $widget->{h};
3813
3123 $widget->{w} = $w; 3814 $widget->{w} = $w;
3124 $widget->{h} = $h; 3815 $widget->{h} = $h;
3816
3125 $widget->emit (size_allocate => $w, $h); 3817 $widget->emit (size_allocate => $w, $h);
3818 }
3126 } 3819 }
3127 } 3820 }
3128 3821
3129 while ($self->{post_alloc_hook}) { 3822 while ($self->{post_alloc_hook}) {
3130 $_->() 3823 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3824 for values %{delete $self->{post_alloc_hook}};
3132 } 3825 }
3826
3133 3827
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3828 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3829 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 3830 glClear GL_COLOR_BUFFER_BIT;
3137 3831
… …
3139 glLoadIdentity; 3833 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3834 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 3835 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 3836 glLoadIdentity;
3143 3837
3838 {
3839 package CFClient::UI::Base;
3840
3841 ($draw_x, $draw_y, $draw_w, $draw_h) =
3842 (0, 0, $self->{w}, $self->{h});
3843 }
3844
3144 $self->_draw; 3845 $self->_draw;
3145} 3846}
3146 3847
3147############################################################################# 3848#############################################################################
3148 3849

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines