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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.456 by root, Fri Dec 28 11:44:02 2007 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use DC;
9use DC::Pod;
11use CFClient::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
98 117
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
101} 126}
102 127
103sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
104 my ($ev) = @_; 129 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 130
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 132
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 134
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
112 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 137
114 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 140 $grab->update if $grab;
117 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
118 142
143 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
120 } 145 }
121} 146}
122 147
123sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
124 my ($ev) = @_; 149 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
126 151
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 153
129 if ($widget != $HOVER) { 154 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 155
132 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 157 if $HOVER;
140} 158}
141 159
142# convert position array to integers 160# convert position array to integers
143sub harmonize { 161sub harmonize {
… …
193 reconfigure_widgets; 211 reconfigure_widgets;
194} 212}
195 213
196############################################################################# 214#############################################################################
197 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
198package CFClient::UI::Base; 224package DC::UI::Base;
199 225
200use strict; 226use strict;
201 227
202use CFClient::OpenGL; 228use DC::OpenGL;
203 229
204sub new { 230sub new {
205 my $class = shift; 231 my $class = shift;
206 232
207 my $self = bless { 233 my $self = bless {
… …
212 h => undef, 238 h => undef,
213 can_events => 1, 239 can_events => 1,
214 @_ 240 @_
215 }, $class; 241 }, $class;
216 242
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
218 244
219 for (keys %$self) { 245 for (keys %$self) {
220 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
222 } 248 }
223 } 249 }
224 250
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
230 256
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 259
234 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
239 265
240sub destroy { 266sub destroy {
241 my ($self) = @_; 267 my ($self) = @_;
242 268
243 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
244 %$self = (); 271 %$self = ();
245} 272}
246 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
247sub show { 278sub show {
248 my ($self) = @_; 279 my ($self) = @_;
249 280
250 return if $self->{parent}; 281 return if $self->{parent};
251 282
252 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
253} 284}
254 285
255sub set_visible { 286sub set_visible {
256 my ($self) = @_; 287 my ($self) = @_;
257 288
… …
278 delete $self->{root}; 309 delete $self->{root};
279 310
280 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
282 313
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
284 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
285 316
286 $self->focus_out; 317 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
289} 319}
290 320
291sub set_visibility { 321sub set_visibility {
292 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
293 323
294 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
295 325
296 $visible ? $self->hide 326 $visible ? $self->show
297 : $self->show; 327 : $self->hide;
298} 328}
299 329
300sub toggle_visibility { 330sub toggle_visibility {
301 my ($self) = @_; 331 my ($self) = @_;
302 332
… …
308sub hide { 338sub hide {
309 my ($self) = @_; 339 my ($self) = @_;
310 340
311 $self->set_invisible; 341 $self->set_invisible;
312 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
313 $self->{parent}->remove ($self) 346 $parent->remove ($self);
314 if $self->{parent}; 347 }
315} 348}
316 349
317sub move_abs { 350sub move_abs {
318 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
319 352
… …
331 $self->{force_h} = $h; 364 $self->{force_h} = $h;
332 365
333 $self->realloc; 366 $self->realloc;
334} 367}
335 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
336sub size_request { 379sub size_request {
337 require Carp; 380 require Carp;
338 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
339} 382}
340 383
384sub baseline_shift {
385 0
386}
387
341sub configure { 388sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
343 390
344 if ($self->{aspect}) { 391 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
346 393
347 $w = List::Util::min $w, int $h * $self->{aspect}; 394 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 395 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
349 396
350 # use alignment to adjust x, y 397 # use alignment to adjust x, y
351 398
352 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
… …
367 414
368 $self->{root}{size_alloc}{$self+0} = $self; 415 $self->{root}{size_alloc}{$self+0} = $self;
369 } 416 }
370} 417}
371 418
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 419sub children {
377 # nop 420 # nop
378} 421}
379 422
380sub visible_children { 423sub visible_children {
… …
398 441
399 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
400 443
401 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
402 445
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 446 if ($DC::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 447 delete $DC::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 448 $DC::UI::TOOLTIP_WATCHER->invoke;
406 } 449 }
407} 450}
408 451
409# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
410sub coord2local { 453sub coord2local {
411 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
412 455
456 return (undef, undef) unless $self->{parent};
457
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 459}
415 460
416# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
417sub coord2global { 462sub coord2global {
418 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
419 464
465 return (undef, undef) unless $self->{parent};
466
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 468}
422 469
423sub focus_in { 470sub invoke_focus_in {
424 my ($self) = @_; 471 my ($self) = @_;
425 472
426 return if $FOCUS == $self; 473 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 474 return unless $self->{can_focus};
428 475
429 my $focus = $FOCUS; $FOCUS = $self; 476 $FOCUS = $self;
430 477
431 $self->_emit (focus_in => $focus); 478 $self->update;
432 479
433 $focus->update if $focus; 480 0
434 $FOCUS->update;
435} 481}
436 482
437sub focus_out { 483sub invoke_focus_out {
438 my ($self) = @_; 484 my ($self) = @_;
439 485
440 return unless $FOCUS == $self; 486 return unless $FOCUS == $self;
441 487
442 my $focus = $FOCUS; undef $FOCUS; 488 undef $FOCUS;
443 489
444 $self->_emit (focus_out => $focus); 490 $self->update;
445 491
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 492 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 493 unless $FOCUS;
450}
451 494
495 0
496}
497
498sub grab_focus {
499 my ($self) = @_;
500
501 $FOCUS->emit ("focus_out") if $FOCUS;
502 $self->emit ("focus_in");
503}
504
452sub mouse_motion { 0 } 505sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 506sub invoke_button_up { 0 }
454sub key_down { 0 } 507sub invoke_key_down { 0 }
455sub key_up { 0 } 508sub invoke_key_up { 0 }
509sub invoke_mouse_wheel { 0 }
456 510
457sub button_down { 511sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 512 my ($self, $ev, $x, $y) = @_;
459 513
460 $self->focus_in; 514 $self->grab_focus;
461 515
462 0 516 0
463} 517}
464 518
519sub connect {
520 my ($self, $signal, $cb) = @_;
521
522 push @{ $self->{signal_cb}{$signal} }, $cb;
523
524 defined wantarray and DC::guard {
525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
526 @{ $self->{signal_cb}{$signal} };
527 }
528}
529
530sub disconnect_all {
531 my ($self, $signal) = @_;
532
533 delete $self->{signal_cb}{$signal};
534}
535
536my %has_coords = (
537 button_down => 1,
538 button_up => 1,
539 mouse_motion => 1,
540 mouse_wheel => 1,
541);
542
543sub emit {
544 my ($self, $signal, @args) = @_;
545
546 # I do not really like this solution, but I do not like duplication
547 # and needlessly verbose code, either.
548 my @append
549 = $has_coords{$signal}
550 ? $args[0]->xy ($self)
551 : ();
552
553 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
554
555 for my $cb (
556 @{$self->{signal_cb}{$signal} || []}, # before
557 ($self->can ("invoke_$signal") || sub { 1 }), # closure
558 ) {
559 return $cb->($self, @args, @append) || next;
560 }
561
562 # parent
563 $self->{parent} && $self->{parent}->emit ($signal, @args)
564}
565
465sub find_widget { 566#sub find_widget {
466 my ($self, $x, $y) = @_; 567# in .xs
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 568
477sub set_parent { 569sub set_parent {
478 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
479 571
480 Scalar::Util::weaken ($self->{parent} = $parent); 572 DC::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 573 $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} 574}
506 575
507sub realloc { 576sub realloc {
508 my ($self) = @_; 577 my ($self) = @_;
509 578
… …
534 603
535# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless. 605# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538 607
539sub draw { 608#sub draw {
540 my ($self) = @_; 609#CFPlus.xs
541
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);
553
554 glPushMatrix;
555 glTranslate $self->{x}, $self->{y}, 0;
556
557 if ($self == $HOVER && $self->{can_hover}) {
558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
559 glEnable GL_BLEND;
560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
561 glBegin GL_QUADS;
562 glVertex 0 , 0;
563 glVertex $self->{w}, 0;
564 glVertex $self->{w}, $self->{h};
565 glVertex 0 , $self->{h};
566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
580 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 }
583
584 $self->_draw;
585 glPopMatrix;
586}
587 610
588sub _draw { 611sub _draw {
589 my ($self) = @_; 612 my ($self) = @_;
590 613
591 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
592} 615}
593 616
594sub DESTROY { 617sub DESTROY {
595 my ($self) = @_; 618 my ($self) = @_;
596 619
597 delete $WIDGET{$self+0}; 620 return if DC::in_destruct;
598 621
622 local $@;
599 eval { $self->destroy }; 623 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
625
626 delete $WIDGET{$self+0};
601} 627}
602 628
603############################################################################# 629#############################################################################
604 630
605package CFClient::UI::DrawBG; 631package DC::UI::DrawBG;
606 632
607our @ISA = CFClient::UI::Base::; 633our @ISA = DC::UI::Base::;
608 634
609use strict; 635use strict;
610use CFClient::OpenGL; 636use DC::OpenGL;
611 637
612sub new { 638sub new {
613 my $class = shift; 639 my $class = shift;
614
615 # range [value, low, high, page]
616 640
617 $class->SUPER::new ( 641 $class->SUPER::new (
618 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
619 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
620 @_ 644 @_
… …
632 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
633 657
634 glEnable GL_BLEND; 658 glEnable GL_BLEND;
635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
636 glColor_premultiply @$color; 660 glColor_premultiply @$color;
637
638 glBegin GL_QUADS;
639 glVertex 0 , 0;
640 glVertex 0 , $h;
641 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
642 glVertex $w, 0;
643 glEnd;
644
645 glDisable GL_BLEND; 662 glDisable GL_BLEND;
646 } 663 }
647} 664}
648 665
649############################################################################# 666#############################################################################
650 667
651package CFClient::UI::Empty; 668package DC::UI::Empty;
652 669
653our @ISA = CFClient::UI::Base::; 670our @ISA = DC::UI::Base::;
654 671
655sub new { 672sub new {
656 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
658} 675}
… …
665 682
666sub draw { } 683sub draw { }
667 684
668############################################################################# 685#############################################################################
669 686
670package CFClient::UI::Container; 687package DC::UI::Container;
671 688
672our @ISA = CFClient::UI::Base::; 689our @ISA = DC::UI::Base::;
673 690
674sub new { 691sub new {
675 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
676 693
677 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
… …
681 can_events => 0, 698 can_events => 0,
682 %arg, 699 %arg,
683 ); 700 );
684 701
685 $self->add (@$children) 702 $self->add (@$children)
686 if $children; 703 if $children && @$children;
687 704
688 $self 705 $self
706}
707
708sub realloc {
709 my ($self) = @_;
710
711 $self->{force_realloc} = 1;
712 $self->{force_size_alloc} = 1;
713 $self->SUPER::realloc;
689} 714}
690 715
691sub add { 716sub add {
692 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
693 718
694 $_->set_parent ($self) 719 $_->set_parent ($self)
695 for @widgets; 720 for @widgets;
696 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
697 use sort 'stable'; 723 use sort 'stable';
698 724
699 $self->{children} = [ 725 $self->{children} = [
700 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
701 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
702 ]; 728 ];
703 729
704 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
705} 735}
706 736
707sub children { 737sub children {
708 @{ $_[0]{children} } 738 @{ $_[0]{children} }
709} 739}
710 740
711sub remove { 741sub remove {
712 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
713 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
714 delete $child->{parent}; 747 delete $child->{parent};
715 $child->hide; 748 $child->hide;
716
717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
718 751
719 $self->realloc; 752 $self->realloc;
720} 753}
721 754
722sub clear { 755sub clear {
723 my ($self) = @_; 756 my ($self) = @_;
724 757
725 my $children = delete $self->{children}; 758 my $children = $self->{children};
726 $self->{children} = []; 759 $self->{children} = [];
727 760
728 for (@$children) { 761 for (@$children) {
729 delete $_->{parent}; 762 delete $_->{parent};
730 $_->hide; 763 $_->hide;
… …
750} 783}
751 784
752sub _draw { 785sub _draw {
753 my ($self) = @_; 786 my ($self) = @_;
754 787
755 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
756} 789}
757 790
758############################################################################# 791#############################################################################
759 792
760package CFClient::UI::Bin; 793package DC::UI::Bin;
761 794
762our @ISA = CFClient::UI::Container::; 795our @ISA = DC::UI::Container::;
763 796
764sub new { 797sub new {
765 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
766 799
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 800 my $child = (delete $arg{child}) || new DC::UI::Empty::;
768 801
769 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
770} 803}
771 804
772sub add { 805sub add {
773 my ($self, $child) = @_; 806 my ($self, $child) = @_;
774 807
775 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
776 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
777} 810}
778 811
779sub remove { 812sub remove {
780 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
781 814
782 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
783 816
784 $self->{children} = [new CFClient::UI::Empty] 817 $self->{children} = [new DC::UI::Empty]
785 unless @{$self->{children}}; 818 unless @{$self->{children}};
786} 819}
787 820
788sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
789 822
790sub size_request { 823sub size_request {
791 $_[0]{children}[0]->size_request 824 $_[0]{children}[0]->size_request
792} 825}
793 826
794sub size_allocate { 827sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 828 my ($self, $w, $h) = @_;
796 829
797 $self->{children}[0]->configure (0, 0, $w, $h); 830 $self->{children}[0]->configure (0, 0, $w, $h);
831
832 1
798} 833}
799 834
800############################################################################# 835#############################################################################
801
802# back-buffered drawing area 836# back-buffered drawing area
803 837
804package CFClient::UI::Window; 838package DC::UI::Window;
805 839
806our @ISA = CFClient::UI::Bin::; 840our @ISA = DC::UI::Bin::;
807 841
808use CFClient::OpenGL; 842use DC::OpenGL;
809 843
810sub new { 844sub new {
811 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
812 846
813 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
… …
818 852
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 853 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 854 $self->SUPER::update;
821} 855}
822 856
823sub size_allocate { 857sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 858 my ($self, $w, $h) = @_;
825 859
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 860 $self->update;
861
862 $self->SUPER::invoke_size_allocate ($w, $h)
828} 863}
829 864
830sub _render { 865sub _render {
831 my ($self) = @_; 866 my ($self) = @_;
832 867
… …
834} 869}
835 870
836sub render_child { 871sub render_child {
837 my ($self) = @_; 872 my ($self) = @_;
838 873
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
842 877
843 { 878 {
844 package CFClient::UI::Base; 879 package DC::UI::Base;
845 880
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
883
884 $self->_render;
848 } 885 }
849
850 $self->_render;
851 }; 886 };
852} 887}
853 888
854sub _draw { 889sub _draw {
855 my ($self) = @_; 890 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 891
859 my $tex = $self->{texture} 892 my $tex = $self->{texture}
860 or return; 893 or return;
861 894
862 glEnable GL_TEXTURE_2D; 895 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 896 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 897 glColor 0, 0, 0, 1;
865 898
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 899 $tex->draw_quad_alpha_premultiplied (0, 0);
867 900
868 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
869} 902}
870 903
871############################################################################# 904#############################################################################
872 905
873package CFClient::UI::ViewPort; 906package DC::UI::ViewPort;
874 907
908use List::Util qw(min max);
909
875our @ISA = CFClient::UI::Window::; 910our @ISA = DC::UI::Window::;
876 911
877sub new { 912sub new {
878 my $class = shift; 913 my $class = shift;
879 914
880 $class->SUPER::new ( 915 $class->SUPER::new (
… …
887sub size_request { 922sub size_request {
888 my ($self) = @_; 923 my ($self) = @_;
889 924
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 926
892 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
894 929
895 ($w, $h) 930 ($w, $h)
896} 931}
897 932
898sub size_allocate { 933sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 934 my ($self, $w, $h) = @_;
900 935
901 my $child = $self->child; 936 my $child = $self->child;
902 937
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 938 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 939 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 940
906 $self->child->configure (0, 0, $w, $h); 941 $self->child->configure (0, 0, $w, $h);
907 $self->update; 942 $self->update;
943
944 1
908} 945}
909 946
910sub set_offset { 947sub set_offset {
911 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
912 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
915 956
957 $self->emit (changed => $x, $y);
916 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
917} 978}
918 979
919# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 981sub coord2local {
921 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
937 998
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1001 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1003 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1004 $self->DC::UI::Base::find_widget ($x, $y)
944 } 1005 }
945} 1006}
946 1007
947sub _render { 1008sub _render {
948 my ($self) = @_; 1009 my ($self) = @_;
949 1010
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1011 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1012 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
952 1013
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1015
955 $self->SUPER::_render; 1016 $self->SUPER::_render;
956} 1017}
957 1018
958############################################################################# 1019#############################################################################
959 1020
960package CFClient::UI::ScrolledWindow; 1021package DC::UI::ScrolledWindow;
961 1022
962our @ISA = CFClient::UI::HBox::; 1023our @ISA = DC::UI::Table::;
963 1024
964sub new { 1025sub new {
965 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
966 1027
967 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
968 1029
969 my $self; 1030 my $self;
970 1031
971 my $slider = new CFClient::UI::Slider 1032 my $hslider = new DC::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub {
1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 },
1041 ;
1042
1043 my $vslider = new DC::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
972 vertical => 1, 1046 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1048 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1049 $self->{vpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1051 },
977 ; 1052 ;
978 1053
979 $self = $class->SUPER::new ( 1054 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1055 scroll_x => 0,
1056 scroll_y => 1,
1057 can_events => 1,
981 slider => $slider, 1058 hslider => $hslider,
1059 vslider => $vslider,
1060 col_expand => [1, 0],
1061 row_expand => [1, 0],
982 %arg, 1062 %arg,
983 ); 1063 );
984 1064
1065 $self->{vp} = new DC::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1068 expand => 1,
1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1084 ;
1085
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1086 $self->SUPER::add ($self->{vp});
1087
986 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
987 1089
988 $self 1090 $self
989} 1091}
990 1092
… …
992 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
993 1095
994 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
995} 1097}
996 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
997sub update { 1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
998 my ($self) = @_; 1134 my ($self, $ev) = @_;
999 1135
1000 $self->SUPER::update; 1136 $self->grab_focus;
1001 1137
1002 # todo: overwrite size_allocate of child 1138 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1139 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1140
1005} 1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1006 1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1151sub invoke_mouse_wheel {
1152 my ($self, $ev) = @_;
1153
1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1156
1157 1
1158}
1159
1160sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_;
1162
1163 if ($ev->{button} == 2) {
1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1007sub size_allocate { 1192sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1009 1194
1195 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1197}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1198
1019############################################################################# 1199#############################################################################
1020 1200
1021package CFClient::UI::Frame; 1201package DC::UI::Frame;
1022 1202
1023our @ISA = CFClient::UI::Bin::; 1203our @ISA = DC::UI::Bin::;
1024 1204
1025use CFClient::OpenGL; 1205use DC::OpenGL;
1026 1206
1027sub new { 1207sub new {
1028 my $class = shift; 1208 my $class = shift;
1029 1209
1030 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1040 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1041 1221
1042 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1045
1046 glBegin GL_QUADS;
1047 glVertex 0 , 0;
1048 glVertex 0 , $h;
1049 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1050 glVertex $w, 0;
1051 glEnd;
1052
1053 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1054 } 1227 }
1055 1228
1056 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1057} 1230}
1058 1231
1059############################################################################# 1232#############################################################################
1060 1233
1061package CFClient::UI::FancyFrame; 1234package DC::UI::FancyFrame;
1062 1235
1063our @ISA = CFClient::UI::Bin::; 1236our @ISA = DC::UI::Bin::;
1064 1237
1065use CFClient::OpenGL; 1238use DC::OpenGL;
1239
1240sub new {
1241 my ($class, %arg) = @_;
1242
1243 if ((exists $arg{label}) && !ref $arg{label}) {
1244 $arg{label} = new DC::UI::Label
1245 align => 1,
1246 valign => 0,
1247 text => $arg{label},
1248 fontsize => ($arg{border} || 0.8) * 0.75;
1249 }
1250
1251 my $self = $class->SUPER::new (
1252 # label => "",
1253 fg => [0.6, 0.3, 0.1],
1254 border => 0.8,
1255 style => 'single',
1256 %arg,
1257 );
1258
1259 $self
1260}
1261
1262sub add {
1263 my ($self, @widgets) = @_;
1264
1265 $self->SUPER::add (@widgets);
1266 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1267}
1268
1269sub border {
1270 int $_[0]{border} * $::FONTSIZE
1271}
1272
1273sub size_request {
1274 my ($self) = @_;
1275
1276 ($self->{label_w}, undef) = $self->{label}->size_request
1277 if $self->{label};
1278
1279 my ($w, $h) = $self->SUPER::size_request;
1280
1281 (
1282 $w + $self->border * 2,
1283 $h + $self->border * 2,
1284 )
1285}
1286
1287sub invoke_size_allocate {
1288 my ($self, $w, $h) = @_;
1289
1290 my $border = $self->border;
1291
1292 $w -= List::Util::max 0, $border * 2;
1293 $h -= List::Util::max 0, $border * 2;
1294
1295 if (my $label = $self->{label}) {
1296 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1297 $label->{h} = List::Util::min $h, $border;
1298 $label->invoke_size_allocate ($label->{w}, $label->{h});
1299 }
1300
1301 $self->child->configure ($border, $border, $w, $h);
1302
1303 1
1304}
1305
1306sub _draw {
1307 my ($self) = @_;
1308
1309 my $child = $self->{children}[0];
1310
1311 my $border = $self->border;
1312 my ($w, $h) = ($self->{w}, $self->{h});
1313
1314 $child->draw;
1315
1316 glColor @{$self->{fg}};
1317 glBegin GL_LINE_STRIP;
1318 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1319 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1322 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1324 glEnd;
1325
1326 if ($self->{label}) {
1327 glTranslate $border * 2, 0;
1328 $self->{label}->_draw;
1329 }
1330}
1331
1332#############################################################################
1333
1334package DC::UI::Toplevel;
1335
1336our @ISA = DC::UI::Bin::;
1337
1338use DC::OpenGL;
1066 1339
1067my $bg = 1340my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1341 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1070 1343
1071my @border = 1344my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347
1348my @icon =
1349 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png);
1074 1351
1075sub new { 1352sub new {
1076 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1077 1354
1078 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1356 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1357 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1358 border => 0.6,
1082 can_events => 1, 1359 can_events => 1,
1083 min_w => 16, 1360 min_w => 64,
1084 min_h => 16, 1361 min_h => 32,
1085 %arg, 1362 %arg,
1086 ); 1363 );
1087 1364
1088 $self->{title_widget} = new CFClient::UI::Label 1365 $self->{title_widget} = new DC::UI::Label
1089 align => 0, 1366 align => 0,
1090 valign => 1, 1367 valign => 1,
1091 text => $self->{title}, 1368 text => $self->{title},
1092 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1093 if exists $self->{title}; 1370 if exists $self->{title};
1094 1371
1095 unless ($self->{no_close_button}) { 1372 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1373 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1374 new DC::UI::ImageButton
1098 image => 'x1_close.png', 1375 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1376 on_activate => sub { $self->emit ("delete") };
1100 1377
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1378 $self->DC::UI::Container::add ($self->{close_button});
1102 } 1379 }
1103 1380
1104 $self 1381 $self
1105} 1382}
1106 1383
1107sub add { 1384sub add {
1108 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1109 1386
1110 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1388 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1390}
1114 1391
1115sub border { 1392sub border {
1116 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1117} 1394}
1118 1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1403}
1404
1119sub size_request { 1405sub size_request {
1120 my ($self) = @_; 1406 my ($self) = @_;
1121 1407
1122 $self->{title_widget}->size_request 1408 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1409 if $self->{title_widget};
1124 1410
1125 $self->{close_btn}->size_request 1411 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1412 if $self->{close_button};
1127 1413
1128 my ($w, $h) = $self->SUPER::size_request; 1414 my ($w, $h) = $self->SUPER::size_request;
1129 1415
1130 ( 1416 (
1131 $w + $self->border * 2, 1417 $w + $self->border * 2,
1132 $h + $self->border * 2, 1418 $h + $self->border * 2,
1133 ) 1419 )
1134} 1420}
1135 1421
1136sub size_allocate { 1422sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1423 my ($self, $w, $h) = @_;
1138 1424
1139 if ($self->{title_widget}) { 1425 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1426 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1427 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1429 }
1144 1430
1145 my $border = $self->border; 1431 my $border = $self->border;
1146 1432
1147 $h -= List::Util::max 0, $border * 2; 1433 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1434 $w -= List::Util::max 0, $border * 2;
1149 1435
1150 $self->child->configure ($border, $border, $w, $h); 1436 $self->child->configure ($border, $border, $w, $h);
1151 1437
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1439 if $self->{close_button};
1154}
1155 1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1448
1449 1
1450}
1451
1156sub button_down { 1452sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1158 1454
1159 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1456 my $border = $self->border;
1161 1457
… …
1192 1488
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1490
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1492 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1494 };
1199 } else { 1495 } else {
1200 return 0; 1496 return 0;
1201 } 1497 }
1202 1498
1203 1 1499 1
1204} 1500}
1205 1501
1206sub button_up { 1502sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1208 1504
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1505 ! ! delete $self->{motion}
1213} 1506}
1214 1507
1215sub mouse_motion { 1508sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1217 1510
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1512
1220 !!$self->{motion} 1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1221} 1522}
1222 1523
1223sub _draw { 1524sub _draw {
1224 my ($self) = @_; 1525 my ($self) = @_;
1225 1526
… …
1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1233 1534
1234 my $border = $self->border; 1535 my $border = $self->border;
1235 1536
1236 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1237 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1241 1556
1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1243 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1244 1559
1245 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1258 $self->{title_widget}->_draw; 1573 $self->{title_widget}->_draw;
1259 1574
1260 glTranslate 0, - ($border - $self->{h}); 1575 glTranslate 0, - ($border - $self->{h});
1261 } 1576 }
1262 1577
1263 $self->{close_btn}->draw 1578 $self->{close_button}->draw
1264 if $self->{close_btn}; 1579 if $self->{close_button};
1265} 1580}
1266 1581
1267############################################################################# 1582#############################################################################
1268 1583
1269package CFClient::UI::Table; 1584package DC::UI::Table;
1270 1585
1271our @ISA = CFClient::UI::Base::; 1586our @ISA = DC::UI::Container::;
1272 1587
1273use List::Util qw(max sum); 1588use List::Util qw(max sum);
1274 1589
1275use CFClient::OpenGL; 1590use DC::OpenGL;
1276 1591
1277sub new { 1592sub new {
1278 my $class = shift; 1593 my $class = shift;
1279 1594
1280 $class->SUPER::new ( 1595 $class->SUPER::new (
1281 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1282 @_, 1598 @_,
1283 ) 1599 )
1284} 1600}
1285 1601
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288}
1289
1290sub add { 1602sub add {
1291 my ($self, $x, $y, $child) = @_; 1603 my ($self, @widgets) = @_;
1292 1604
1293 $child->set_parent ($self); 1605 for my $child (@widgets) {
1294 $self->{children}[$y][$x] = $child; 1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1295 1609
1296 $self->realloc; 1610 $self->SUPER::add (@widgets);
1297} 1611}
1298 1612
1299sub remove { 1613sub add_at {
1614 my $self = shift;
1615
1616 my @widgets;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{c_row} = $row;
1622 $child->{c_col} = $col;
1623
1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1300 my ($self, $child) = @_; 1631 my ($self) = @_;
1301 1632
1302 # TODO: not yet implemented 1633 my (@w, @h);
1303}
1304
1305# TODO: move to container class maybe? send children a signal on removal?
1306sub clear {
1307 my ($self) = @_;
1308 1634
1309 my @children = $self->children; 1635 my @children = $self->children;
1310 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1311 1646 }
1312 for (@children) {
1313 delete $_->{parent};
1314 $_->hide;
1315 }
1316 1647
1317 $self->realloc; 1648 # second pass, rows
1318} 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1319
1320sub get_wh {
1321 my ($self) = @_;
1322
1323 my (@w, @h);
1324
1325 for my $y (0 .. $#{$self->{children}}) {
1326 my $row = $self->{children}[$y]
1327 or next;
1328
1329 for my $x (0 .. $#$row) {
1330 my $widget = $row->[$x]
1331 or next;
1332 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1333 1651
1334 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1335 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1336 } 1656 }
1337 } 1657 }
1338 1658
1339 (\@w, \@h) 1659 (\@w, \@h)
1340} 1660}
… …
1348 (sum @$ws), 1668 (sum @$ws),
1349 (sum @$hs), 1669 (sum @$hs),
1350 ) 1670 )
1351} 1671}
1352 1672
1353sub size_allocate { 1673sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1674 my ($self, $w, $h) = @_;
1355 1675
1356 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1357 1677
1358 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1359 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1360 1680
1361 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1362 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1363 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1364 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1365 1685
1366 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1687
1370 CFClient::UI::harmonize $ws; 1688 DC::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1371 CFClient::UI::harmonize $hs; 1696 DC::UI::harmonize $hs;
1372 1697
1373 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1374 1700
1375 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1376 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1377 or next;
1378 1703
1379 my $x = 0; 1704 $widget->configure (
1380 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1381 1707 );
1382 for my $c (0 .. $#$row) { 1708 }
1383 my $col_w = $ws->[$c];
1384 1709
1385 if (my $widget = $row->[$c]) { 1710 1
1386 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1387 }
1388 1712
1389 $x += $col_w; 1713#############################################################################
1714
1715package DC::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = DC::UI::Container::;
1720
1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_;
1723
1724 $rel ? $val * $max : $val
1725}
1726
1727sub size_request {
1728 my ($self) = @_;
1729
1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1731
1732 # determine overall size by querying abs widgets
1733 for my $child ($self->visible_children) {
1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1737
1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1390 } 1740 }
1391
1392 $y += $row_h;
1393 } 1741 }
1394 1742
1395} 1743 my $W = $x2 - $x1;
1744 my $H = $y2 - $y1;
1396 1745
1397sub find_widget { 1746 # now layout remaining widgets
1747 for my $child ($self->visible_children) {
1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1754 }
1755 }
1756
1757 my $W = $x2 - $x1;
1758 my $H = $y2 - $y1;
1759
1760 ($W, $H)
1761}
1762
1763sub invoke_size_allocate {
1398 my ($self, $x, $y) = @_; 1764 my ($self, $W, $H) = @_;
1399 1765
1400 $x -= $self->{x}; 1766 for my $child ($self->visible_children) {
1401 $y -= $self->{y}; 1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1402 1769
1403 my $res; 1770 $x += $child->{c_halign} * $child->{req_w};
1771 $y += $child->{c_valign} * $child->{req_h};
1404 1772
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1406 $res = $_->find_widget ($x, $y) 1774 }
1407 and return $res; 1775
1408 } 1776 1
1409
1410 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411}
1412
1413sub _draw {
1414 my ($self) = @_;
1415
1416 for (grep $_, @{$self->{children}}) {
1417 $_->draw for grep $_, @$_;
1418 }
1419} 1777}
1420 1778
1421############################################################################# 1779#############################################################################
1422 1780
1423package CFClient::UI::Box; 1781package DC::UI::Box;
1424 1782
1425our @ISA = CFClient::UI::Container::; 1783our @ISA = DC::UI::Container::;
1426 1784
1427sub size_request { 1785sub size_request {
1428 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1429 1789
1430 $self->{vertical} 1790 $self->{vertical}
1431 ? ( 1791 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1434 ) 1794 )
1435 : ( 1795 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1438 ) 1798 )
1439} 1799}
1440 1800
1441sub size_allocate { 1801sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
1443 1803
1444 my $space = $self->{vertical} ? $h : $w; 1804 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1805 my @children = $self->visible_children;
1446 1806
1447 my @req; 1807 my @req;
1448 1808
1449 if ($self->{homogeneous}) { 1809 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1810 @req = ($space / (@children || 1)) x @children;
1451 } else { 1811 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1812 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1813 my $req = List::Util::sum @req;
1454 1814
1455 if ($req > $space) { 1815 if ($req > $space) {
1456 # ah well, not enough space 1816 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1817 $_ *= $space / $req for @req;
1458 } else { 1818 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1819 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1820
1461 $space = ($space - $req) / $expand; # remaining space to give away 1821 $space = ($space - $req) / $expand; # remaining space to give away
1462 1822
1463 $req[$_] += $space * $children->[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1824 for 0 .. $#children;
1465 } 1825 }
1466 } 1826 }
1467 1827
1468 CFClient::UI::harmonize \@req; 1828 DC::UI::harmonize \@req;
1469 1829
1470 my $pos = 0; 1830 my $pos = 0;
1471 for (0 .. $#$children) { 1831 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1834
1475 $pos += $alloc; 1835 $pos += $alloc;
1476 } 1836 }
1477 1837
1478 1 1838 1
1479} 1839}
1480 1840
1481############################################################################# 1841#############################################################################
1482 1842
1483package CFClient::UI::HBox; 1843package DC::UI::HBox;
1484 1844
1485our @ISA = CFClient::UI::Box::; 1845our @ISA = DC::UI::Box::;
1486 1846
1487sub new { 1847sub new {
1488 my $class = shift; 1848 my $class = shift;
1489 1849
1490 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1493 ) 1853 )
1494} 1854}
1495 1855
1496############################################################################# 1856#############################################################################
1497 1857
1498package CFClient::UI::VBox; 1858package DC::UI::VBox;
1499 1859
1500our @ISA = CFClient::UI::Box::; 1860our @ISA = DC::UI::Box::;
1501 1861
1502sub new { 1862sub new {
1503 my $class = shift; 1863 my $class = shift;
1504 1864
1505 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1508 ) 1868 )
1509} 1869}
1510 1870
1511############################################################################# 1871#############################################################################
1512 1872
1513package CFClient::UI::Label; 1873package DC::UI::Label;
1514 1874
1515our @ISA = CFClient::UI::DrawBG::; 1875our @ISA = DC::UI::DrawBG::;
1516 1876
1517use CFClient::OpenGL; 1877use DC::OpenGL;
1518 1878
1519sub new { 1879sub new {
1520 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1521 1881
1522 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1885 #active_bg => none
1526 #font => default_font 1886 #font => default_font
1527 #text => initial text 1887 #text => initial text
1528 #markup => initial narkup 1888 #markup => initial narkup
1529 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1890 #style => 0, # render flags
1530 ellipsise => 3, # end 1891 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1892 layout => (new DC::Layout),
1532 fontsize => 1, 1893 fontsize => 1,
1533 align => -1, 1894 align => -1,
1534 valign => -1, 1895 valign => -1,
1535 padding_x => 2, 1896 padding_x => 2,
1536 padding_y => 2, 1897 padding_y => 2,
1537 can_events => 0, 1898 can_events => 0,
1538 %arg 1899 %arg
1539 ); 1900 );
1540 1901
1541 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1903 my $layout = new DC::Layout;
1543 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1905 $self->{template} = $layout;
1545 } 1906 }
1546 1907
1547 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1551 } 1912 }
1552 1913
1553 $self 1914 $self
1554} 1915}
1555 1916
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1917sub update {
1567 my ($self) = @_; 1918 my ($self) = @_;
1568 1919
1569 delete $self->{texture}; 1920 delete $self->{texture};
1570 $self->SUPER::update; 1921 $self->SUPER::update;
… …
1575 1926
1576 delete $self->{ox}; 1927 delete $self->{ox};
1577 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1578} 1929}
1579 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1580sub set_text { 1937sub set_text {
1581 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1582 1939
1583 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
1585 1942
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1943 $self->{layout}->set_text ($text);
1588 1944
1589 delete $self->{size_req}; 1945 delete $self->{size_req};
1590 $self->realloc; 1946 $self->realloc;
1591 $self->update; 1947 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1953 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1954 $self->{text} = "M$markup";
1599 1955
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1956 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1957
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1958 $self->{layout}->set_markup ($markup);
1604 1959
1605 delete $self->{size_req}; 1960 delete $self->{size_req};
1606 $self->realloc; 1961 $self->realloc;
1607 $self->update; 1962 $self->update;
… …
1609 1964
1610sub size_request { 1965sub size_request {
1611 my ($self) = @_; 1966 my ($self) = @_;
1612 1967
1613 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1614 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1615 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1616 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1619 1976
1620 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
1621 1978
1622 if (exists $self->{template}) { 1979 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1980 $self->{template}->set_font ($self->{font}) if $self->{font};
1981 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1982 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1983
1626 my ($w2, $h2) = $self->{template}->size; 1984 my ($w2, $h2) = $self->{template}->size;
1627 1985
1628 $w = List::Util::max $w, $w2; 1986 $w = List::Util::max $w, $w2;
… …
1633 }; 1991 };
1634 1992
1635 @{ $self->{size_req} } 1993 @{ $self->{size_req} }
1636} 1994}
1637 1995
1996sub baseline_shift {
1997 $_[0]{layout}->descent
1998}
1999
1638sub size_allocate { 2000sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 2001 my ($self, $w, $h) = @_;
1640 2002
1641 delete $self->{ox}; 2003 delete $self->{ox};
1642 2004
1643 delete $self->{texture} 2005 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2006 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2007
2008 1
1645} 2009}
1646 2010
1647sub set_fontsize { 2011sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2012 my ($self, $fontsize) = @_;
1649 2013
1650 $self->{fontsize} = $fontsize; 2014 $self->{fontsize} = $fontsize;
2015 delete $self->{size_req};
1651 delete $self->{texture}; 2016 delete $self->{texture};
1652 2017
1653 $self->realloc; 2018 $self->realloc;
1654} 2019}
1655 2020
1656sub reconfigure { 2021sub reconfigure {
1657 my ($self) = @_; 2022 my ($self) = @_;
1658 2023
1659 delete $self->{size_req}; 2024 delete $self->{size_req};
2025 delete $self->{texture};
1660 2026
1661 $self->SUPER::reconfigure; 2027 $self->SUPER::reconfigure;
1662} 2028}
1663 2029
1664sub _draw { 2030sub _draw {
1665 my ($self) = @_; 2031 my ($self) = @_;
1666 2032
1667 $self->SUPER::_draw; # draw background, if applicable 2033 $self->SUPER::_draw; # draw background, if applicable
1668 2034
1669 my $tex = $self->{texture} ||= do { 2035 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2036 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2037 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2038 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2039 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2040 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2041 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2042
1677 new_from_layout CFClient::Texture $self->{layout} 2043 [$self->{layout}->size]
1678 }; 2044 };
1679 2045
1680 unless (exists $self->{ox}) { 2046 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2047 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2048 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1684 2050
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1688 }; 2056 };
1689 2057
1690 glEnable GL_TEXTURE_2D; 2058# unless ($self->{list}) {
1691 2059# $self->{list} = DC::OpenGL::glGenList;
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2060# DC::OpenGL::glNewList $self->{list};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694 2062# DC::OpenGL::glEndList;
1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 } 2063# }
2064#
2065# DC::OpenGL::glCallList $self->{list};
1703 2066
1704 glDisable GL_TEXTURE_2D; 2067 $self->{layout}->draw;
1705} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
1706 2077
1707############################################################################# 2078#############################################################################
1708 2079
1709package CFClient::UI::EntryBase; 2080package DC::UI::EntryBase;
1710 2081
1711our @ISA = CFClient::UI::Label::; 2082our @ISA = DC::UI::Label::;
1712 2083
1713use CFClient::OpenGL; 2084use DC::OpenGL;
1714 2085
1715sub new { 2086sub new {
1716 my $class = shift; 2087 my $class = shift;
1717 2088
1718 $class->SUPER::new ( 2089 $class->SUPER::new (
1719 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1720 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1721 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1722 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1723 can_hover => 1, 2096 can_hover => 1,
1724 can_focus => 1, 2097 can_focus => 1,
1725 valign => 0, 2098 valign => 0,
1726 can_events => 1, 2099 can_events => 1,
2100 ellipsise => 0,
2101 padding_x => 4,
2102 padding_y => 2,
1727 #text => ... 2103 #text => ...
1728 #hidden => "*", 2104 #hidden => "*",
1729 @_ 2105 @_
1730 ) 2106 )
1731} 2107}
… …
1742 2118
1743 $text =~ s/./*/g if $self->{hidden}; 2119 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 2120 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 2121 delete $self->{size_req};
1746 2122
1747 $self->_emit (changed => $self->{text}); 2123 $self->emit (changed => $self->{text});
1748 2124
1749 $self->realloc; 2125 $self->realloc;
1750 $self->update; 2126 $self->update;
1751} 2127}
1752 2128
… …
1767 my ($w, $h) = $self->SUPER::size_request; 2143 my ($w, $h) = $self->SUPER::size_request;
1768 2144
1769 ($w + 1, $h) # add 1 for cursor 2145 ($w + 1, $h) # add 1 for cursor
1770} 2146}
1771 2147
1772sub key_down { 2148sub invoke_key_down {
1773 my ($self, $ev) = @_; 2149 my ($self, $ev) = @_;
1774 2150
1775 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1778 2154
1779 my $text = $self->get_text; 2155 my $text = $self->get_text;
2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1780 2158
1781 if ($uni == 8) { 2159 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2167 } elsif ($sym == DC::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == DC::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1790 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 2183 $self->emit ('escape');
1795 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2188 } else {
1798 return 0; 2189 return 0;
1799 } 2190 }
1800 2191
1801 $self->_set_text ($text); 2192 $self->_set_text ($text);
1802 2193
1803 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1804 2196
1805 1 2197 1
1806} 2198}
1807 2199
1808sub focus_in { 2200sub invoke_focus_in {
1809 my ($self) = @_; 2201 my ($self) = @_;
1810 2202
1811 $self->{last_activity} = $::NOW; 2203 $self->{last_activity} = $::NOW;
1812 2204
1813 $self->SUPER::focus_in; 2205 $self->SUPER::invoke_focus_in
1814} 2206}
1815 2207
1816sub button_down { 2208sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1818 2210
1819 $self->SUPER::button_down ($ev, $x, $y); 2211 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2212
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2214
1823 # byte-index to char-index 2215 # byte-index to char-index
1824 my $text = $self->{text}; 2216 my $text = $self->{text};
1825 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1827 2219
1828 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1829 $self->update; 2221 $self->update;
1830 2222
1831 1 2223 1
1832} 2224}
1833 2225
1834sub mouse_motion { 2226sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2228# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 2229
1838 0 2230 1
1839} 2231}
1840 2232
1841sub _draw { 2233sub _draw {
1842 my ($self) = @_; 2234 my ($self) = @_;
1843 2235
… …
1850 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
1851 } 2243 }
1852 2244
1853 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855 glBegin GL_QUADS;
1856 glVertex 0 , 0;
1857 glVertex 0 , $self->{h};
1858 glVertex $self->{w}, $self->{h}; 2247 glRect 0, 0, $self->{w}, $self->{h};
1859 glVertex $self->{w}, 0;
1860 glEnd;
1861 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
1862 2249
1863 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
1864 2251
1865 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
… …
1867 2254
1868 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
1869 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
1870 utf8::encode $text; 2257 utf8::encode $text;
1871 2258
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1873 } 2260 }
1874 2261
1875 glColor @{$self->{fg}}; 2262 glColor_premultiply @{$self->{active_fg}};
1876 glBegin GL_LINES; 2263 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2264 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2265 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2266 glEnd;
1880 }
1881}
1882 2267
2268 glLineWidth 3;
2269 glColor @{$self->{active_outline}};
2270 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2271 glLineWidth 1;
2272
2273 } else {
2274 glColor @{$self->{outline}};
2275 glBegin GL_LINE_STRIP;
2276 glVertex .5, $self->{h} * .5;
2277 glVertex .5, $self->{h} - 2.5;
2278 glVertex $self->{w} - .5, $self->{h} - 2.5;
2279 glVertex $self->{w} - .5, $self->{h} * .5;
2280 glEnd;
2281 }
2282}
2283
2284#############################################################################
2285
1883package CFClient::UI::Entry; 2286package DC::UI::Entry;
1884 2287
1885our @ISA = CFClient::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
1886 2289
1887use CFClient::OpenGL; 2290use DC::OpenGL;
1888 2291
1889sub key_down { 2292sub invoke_key_down {
1890 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
1891 2294
1892 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
1893 2296
1894 if ($sym == 13) { 2297 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2298 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2299 my $txt = $self->get_text;
2300
1897 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2303 $self->emit (activate => $txt);
1900 $self->update; 2304 $self->update;
1901 2305
1902 } elsif ($sym == CFClient::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
1905 } 2309 }
1906 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2314 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2316 }
1913 2317
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2321
1918 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2324 } else {
1921 $self->set_text ($self->{history_saveback}); 2325 $self->set_text ($self->{history_saveback});
1922 } 2326 }
1923 2327
1924 } else { 2328 } else {
1925 return $self->SUPER::key_down ($ev) 2329 return $self->SUPER::invoke_key_down ($ev)
1926 } 2330 }
1927 2331
1928 1 2332 1
1929} 2333}
1930 2334
1931############################################################################# 2335#############################################################################
1932 2336
1933package CFClient::UI::Button; 2337package DC::UI::TextEdit;
1934 2338
1935our @ISA = CFClient::UI::Label::; 2339our @ISA = DC::UI::EntryBase::;
1936 2340
1937use CFClient::OpenGL; 2341use DC::OpenGL;
1938
1939my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png);
1942 2342
1943sub new { 2343sub new {
1944 my $class = shift; 2344 my $class = shift;
1945 2345
1946 $class->SUPER::new ( 2346 $class->SUPER::new (
1947 padding_x => 4,
1948 padding_y => 4, 2347 padding_y => 4,
1949 fg => [1, 1, 1], 2348
1950 active_fg => [0, 0, 1], 2349 @_
2350 )
2351}
2352
2353sub move_cursor_ver {
2354 my ($self, $dy) = @_;
2355
2356 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2357
2358 $y += $dy;
2359
2360 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2361 $self->{cursor} = $index;
2362 delete $self->{cur_h};
2363 $self->update;
2364 return;
2365 }
2366}
2367
2368sub invoke_key_down {
2369 my ($self, $ev) = @_;
2370
2371 my $sym = $ev->{sym};
2372
2373 if ($sym == DC::SDLK_UP) {
2374 $self->move_cursor_ver (-1);
2375 } elsif ($sym == DC::SDLK_DOWN) {
2376 $self->move_cursor_ver (+1);
2377 } else {
2378 return $self->SUPER::invoke_key_down ($ev)
2379 }
2380
2381 1
2382}
2383
2384#############################################################################
2385
2386package DC::UI::ButtonBin;
2387
2388our @ISA = DC::UI::Bin::;
2389
2390use DC::OpenGL;
2391
2392my @tex =
2393 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2394 qw(b1_button_inactive.png b1_button_active.png);
2395
2396sub new {
2397 my $class = shift;
2398
2399 $class->SUPER::new (
1951 can_hover => 1, 2400 can_hover => 1,
1952 align => 0, 2401 align => 0,
1953 valign => 0, 2402 valign => 0,
1954 can_events => 1, 2403 can_events => 1,
1955 @_ 2404 @_
1956 ) 2405 )
1957} 2406}
1958 2407
1959sub activate { }
1960
1961sub button_up { 2408sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
1963 2410
1964 $self->emit ("activate") 2411 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2412 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2413 && $y >= 0 && $y < $self->{h};
… …
1969} 2416}
1970 2417
1971sub _draw { 2418sub _draw {
1972 my ($self) = @_; 2419 my ($self) = @_;
1973 2420
1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1975
1976 glEnable GL_TEXTURE_2D; 2421 glEnable GL_TEXTURE_2D;
1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1978 glColor 0, 0, 0, 1; 2423 glColor 0, 0, 0, 1;
1979 2424
2425 my $tex = $tex[$GRAB == $self];
1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2426 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981 2427
1982 glDisable GL_TEXTURE_2D; 2428 glDisable GL_TEXTURE_2D;
1983 2429
1984 $self->SUPER::_draw; 2430 $self->SUPER::_draw;
1985} 2431}
1986 2432
1987############################################################################# 2433#############################################################################
1988 2434
2435package DC::UI::Button;
2436
2437our @ISA = DC::UI::Label::;
2438
2439use DC::OpenGL;
2440
2441my @tex =
2442 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2443 qw(b1_button_inactive.png b1_button_active.png);
2444
2445sub new {
2446 my $class = shift;
2447
2448 $class->SUPER::new (
2449 padding_x => 8,
2450 padding_y => 4,
2451 fg => [1.0, 1.0, 1.0],
2452 active_fg => [0.8, 0.8, 0.8],
2453 can_hover => 1,
2454 align => 0,
2455 valign => 0,
2456 can_events => 1,
2457 @_
2458 )
2459}
2460
2461sub invoke_button_up {
2462 my ($self, $ev, $x, $y) = @_;
2463
2464 $self->emit ("activate")
2465 if $x >= 0 && $x < $self->{w}
2466 && $y >= 0 && $y < $self->{h};
2467
2468 1
2469}
2470
2471sub _draw {
2472 my ($self) = @_;
2473
2474 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2475
2476 glEnable GL_TEXTURE_2D;
2477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2478 glColor 0, 0, 0, 1;
2479
2480 my $tex = $tex[$GRAB == $self];
2481 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2482
2483 glDisable GL_TEXTURE_2D;
2484
2485 $self->SUPER::_draw;
2486}
2487
2488#############################################################################
2489
2490package DC::UI::CheckBox;
2491
2492our @ISA = DC::UI::DrawBG::;
2493
2494my @tex =
2495 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2496 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2497
2498use DC::OpenGL;
2499
2500sub new {
2501 my $class = shift;
2502
2503 $class->SUPER::new (
2504 padding_x => 2,
2505 padding_y => 2,
2506 fg => [1, 1, 1],
2507 active_fg => [1, 1, 0],
2508 bg => [0, 0, 0, 0.2],
2509 active_bg => [1, 1, 1, 0.5],
2510 state => 0,
2511 can_hover => 1,
2512 @_
2513 )
2514}
2515
2516sub size_request {
2517 my ($self) = @_;
2518
2519 (6) x 2
2520}
2521
2522sub toggle {
2523 my ($self) = @_;
2524
2525 $self->{state} = !$self->{state};
2526 $self->emit (changed => $self->{state});
2527 $self->update;
2528}
2529
2530sub invoke_button_down {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2534 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2535 $self->toggle;
2536 } else {
2537 return 0
2538 }
2539
2540 1
2541}
2542
2543sub _draw {
2544 my ($self) = @_;
2545
2546 $self->SUPER::_draw;
2547
2548 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2549
2550 my ($w, $h) = @$self{qw(w h)};
2551
2552 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2553
2554 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2555
2556 my $tex = $self->{state} ? $tex[1] : $tex[0];
2557
2558 glEnable GL_TEXTURE_2D;
2559 $tex->draw_quad_alpha (0, 0, $s, $s);
2560 glDisable GL_TEXTURE_2D;
2561}
2562
2563#############################################################################
2564
2565package DC::UI::Image;
2566
2567our @ISA = DC::UI::Base::;
2568
2569use DC::OpenGL;
2570
2571our %texture_cache;
2572
2573sub new {
2574 my $class = shift;
2575
2576 my $self = $class->SUPER::new (
2577 can_events => 0,
2578 scale => 1,
2579 @_,
2580 );
2581
2582 $self->{path} || $self->{tex}
2583 or Carp::croak "'path' or 'tex' attributes required";
2584
2585 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2586 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2587
2588 DC::weaken $texture_cache{$self->{path}};
2589
2590 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2591
2592 $self
2593}
2594
2595sub STORABLE_freeze {
2596 my ($self, $cloning) = @_;
2597
2598 $self->{path}
2599 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2600
2601 $self->{path}
2602}
2603
2604sub STORABLE_attach {
2605 my ($self, $cloning, $path) = @_;
2606
2607 $self->new (path => $path)
2608}
2609
2610sub size_request {
2611 my ($self) = @_;
2612
2613 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2614}
2615
2616sub _draw {
2617 my ($self) = @_;
2618
2619 my $tex = $self->{tex};
2620
2621 my ($w, $h) = ($self->{w}, $self->{h});
2622
2623 if ($self->{rot90}) {
2624 glRotate 90, 0, 0, 1;
2625 glTranslate 0, -$self->{w}, 0;
2626
2627 ($w, $h) = ($h, $w);
2628 }
2629
2630 glEnable GL_TEXTURE_2D;
2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2632
2633 $tex->draw_quad_alpha (0, 0, $w, $h);
2634
2635 glDisable GL_TEXTURE_2D;
2636}
2637
2638#############################################################################
2639
1989package CFClient::UI::ImageButton; 2640package DC::UI::ImageButton;
1990 2641
1991our @ISA = CFClient::UI::Image::; 2642our @ISA = DC::UI::Image::;
1992 2643
1993use CFClient::OpenGL; 2644use DC::OpenGL;
1994 2645
1995my %textures; 2646my %textures;
1996 2647
1997sub new { 2648sub new {
1998 my $class = shift; 2649 my $class = shift;
… …
2008 can_events => 1, 2659 can_events => 1,
2009 @_ 2660 @_
2010 ); 2661 );
2011} 2662}
2012 2663
2013sub activate { } 2664sub invoke_button_down {
2665 my ($self, $ev, $x, $y) = @_;
2014 2666
2667 1
2668}
2669
2015sub button_up { 2670sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2671 my ($self, $ev, $x, $y) = @_;
2017 2672
2018 $self->emit ("activate") 2673 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2674 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2675 && $y >= 0 && $y < $self->{h};
… …
2022 1 2677 1
2023} 2678}
2024 2679
2025############################################################################# 2680#############################################################################
2026 2681
2027package CFClient::UI::CheckBox; 2682package DC::UI::VGauge;
2028 2683
2029our @ISA = CFClient::UI::DrawBG::;
2030
2031my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035use CFClient::OpenGL;
2036
2037sub new {
2038 my $class = shift;
2039
2040 $class->SUPER::new (
2041 padding_x => 2,
2042 padding_y => 2,
2043 fg => [1, 1, 1],
2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
2047 state => 0,
2048 can_hover => 1,
2049 @_
2050 )
2051}
2052
2053sub size_request {
2054 my ($self) = @_;
2055
2056 (6) x 2
2057}
2058
2059sub button_down {
2060 my ($self, $ev, $x, $y) = @_;
2061
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
2070 1
2071}
2072
2073sub _draw {
2074 my ($self) = @_;
2075
2076 $self->SUPER::_draw;
2077
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088 glEnable GL_TEXTURE_2D;
2089 $tex->draw_quad_alpha (0, 0, $s, $s);
2090 glDisable GL_TEXTURE_2D;
2091}
2092
2093#############################################################################
2094
2095package CFClient::UI::Image;
2096
2097our @ISA = CFClient::UI::Base::; 2684our @ISA = DC::UI::Base::;
2098
2099use CFClient::OpenGL;
2100use Carp qw/confess/;
2101
2102our %loaded_images;
2103
2104sub new {
2105 my $class = shift;
2106
2107 my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111 $loaded_images{$self->{image}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119
2120 $self
2121}
2122
2123sub size_request {
2124 my ($self) = @_;
2125
2126 ($self->{tex}->{w}, $self->{tex}->{h})
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131
2132 my $tex = $self->{tex};
2133
2134 my ($w, $h) = ($self->{w}, $self->{h});
2135
2136 if ($self->{rot90}) {
2137 glRotate 90, 0, 0, 1;
2138 glTranslate 0, -$self->{w}, 0;
2139
2140 ($w, $h) = ($h, $w);
2141 }
2142
2143 glEnable GL_TEXTURE_2D;
2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146 $tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148 glDisable GL_TEXTURE_2D;
2149}
2150
2151#############################################################################
2152
2153package CFClient::UI::VGauge;
2154
2155our @ISA = CFClient::UI::Base::;
2156 2685
2157use List::Util qw(min max); 2686use List::Util qw(min max);
2158 2687
2159use CFClient::OpenGL; 2688use DC::OpenGL;
2160 2689
2161my %tex = ( 2690my %tex = (
2162 food => [ 2691 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2693 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2694 ],
2166 grace => [ 2695 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2168 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2697 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169 ], 2698 ],
2170 hp => [ 2699 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2701 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2702 ],
2174 mana => [ 2703 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2176 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2705 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177 ], 2706 ],
2178); 2707);
2179 2708
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2709# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2769 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2770 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2771
2243 my $h1 = $self->{h} * (1 - $ycut1); 2772 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2773 my $h2 = $self->{h} * (1 - $ycut2);
2774 my $h3 = $self->{h};
2775
2776 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2777
2246 glEnable GL_BLEND; 2778 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2779 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2780 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
… …
2268 2800
2269 if ($t3) { 2801 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2802 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2803 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2804 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2805 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2806 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2807 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2808 glEnd;
2277 } 2809 }
2278 2810
2279 glDisable GL_BLEND; 2811 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2812 glDisable GL_TEXTURE_2D;
2281} 2813}
2282 2814
2283############################################################################# 2815#############################################################################
2284 2816
2817package DC::UI::Progress;
2818
2819our @ISA = DC::UI::Label::;
2820
2821use DC::OpenGL;
2822
2823sub new {
2824 my ($class, %arg) = @_;
2825
2826 my $self = $class->SUPER::new (
2827 fg => [1, 1, 1],
2828 bg => [0, 0, 1, 0.2],
2829 bar => [0.7, 0.5, 0.1, 0.8],
2830 outline => [0.4, 0.3, 0],
2831 fontsize => 0.9,
2832 valign => 0,
2833 align => 0,
2834 can_events => 1,
2835 ellipsise => 1,
2836 label => "%d%%",
2837 %arg,
2838 );
2839
2840 $self->set_value ($arg{value} || -1);
2841
2842 $self
2843}
2844
2845sub set_label {
2846 my ($self, $label) = @_;
2847
2848 return if $self->{label} eq $label;
2849 $self->{label} = $label;
2850
2851 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2852}
2853
2854sub set_value {
2855 my ($self, $value) = @_;
2856
2857 if ($self->{value} ne $value) {
2858 $self->{value} = $value;
2859
2860 if ($value < 0) {
2861 $self->set_text ("-");
2862 } else {
2863 $self->set_text (sprintf $self->{label}, $value * 100);
2864 }
2865
2866 $self->update;
2867 }
2868}
2869
2870sub _draw {
2871 my ($self) = @_;
2872
2873 glEnable GL_BLEND;
2874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2875
2876 if ($self->{value} >= 0) {
2877 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2878
2879 glColor_premultiply @{$self->{bar}};
2880 glRect 2, 2, $s, $self->{h} - 2;
2881 glColor_premultiply @{$self->{bg}};
2882 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2883 }
2884
2885 glColor_premultiply @{$self->{outline}};
2886 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2887
2888 glDisable GL_BLEND;
2889
2890 {
2891 local $self->{bg}; # do not draw background
2892 $self->SUPER::_draw;
2893 }
2894}
2895
2896#############################################################################
2897
2898package DC::UI::ExperienceProgress;
2899
2900our @ISA = DC::UI::Progress::;
2901
2902sub new {
2903 my ($class, %arg) = @_;
2904
2905 my $self = $class->SUPER::new (
2906 tooltip => sub {
2907 my ($self) = @_;
2908
2909 sprintf "level %d\n%s points\n%s next level\n%s to go",
2910 $self->{lvl},
2911 ::formsep ($self->{exp}),
2912 ::formsep ($self->{nxt}),
2913 ::formsep ($self->{nxt} - $self->{exp}),
2914 },
2915 %arg
2916 );
2917
2918 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2919 if $::CONN;
2920
2921 $self
2922}
2923
2924sub DESTROY {
2925 my ($self) = @_;
2926
2927 delete $::CONN->{on_exp_update}{$self+0}
2928 if $::CONN;
2929
2930 $self->SUPER::DESTROY;
2931}
2932
2933sub set_value {
2934 my ($self, $lvl, $exp) = @_;
2935
2936 $self->{lvl} = $lvl;
2937 $self->{exp} = $exp;
2938
2939 my $v = -1;
2940
2941 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2942 my $l0 = $table->[$lvl - 1];
2943 my $l1 = $table->[$lvl];
2944
2945 $self->{nxt} = $l1;
2946
2947 $v = ($exp - $l0) / ($l1 - $l0);
2948 }
2949
2950 $self->SUPER::set_value ($v);
2951}
2952
2953#############################################################################
2954
2285package CFClient::UI::Gauge; 2955package DC::UI::Gauge;
2286 2956
2287our @ISA = CFClient::UI::VBox::; 2957our @ISA = DC::UI::VBox::;
2288 2958
2289sub new { 2959sub new {
2290 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2291 2961
2292 my $self = $class->SUPER::new ( 2962 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2964 can_hover => 1,
2295 can_events => 1, 2965 can_events => 1,
2296 %arg, 2966 %arg,
2297 ); 2967 );
2298 2968
2299 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2969 $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2300 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2970 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2301 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2971 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2302 2972
2303 $self 2973 $self
2304} 2974}
2305 2975
2306sub set_fontsize { 2976sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2997 $self->{value}->set_text ($val);
2328} 2998}
2329 2999
2330############################################################################# 3000#############################################################################
2331 3001
2332package CFClient::UI::Slider; 3002package DC::UI::Slider;
2333 3003
2334use strict; 3004use strict;
2335 3005
2336use CFClient::OpenGL; 3006use DC::OpenGL;
2337 3007
2338our @ISA = CFClient::UI::DrawBG::; 3008our @ISA = DC::UI::DrawBG::;
2339 3009
2340my @tex = 3010my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3011 map { new_from_file DC::Texture DC::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 3012 qw(s1_slider.png s1_slider_bg.png);
2343 3013
2344sub new { 3014sub new {
2345 my $class = shift; 3015 my $class = shift;
2346 3016
… …
2367 $self->update; 3037 $self->update;
2368 3038
2369 $self 3039 $self
2370} 3040}
2371 3041
2372sub changed { }
2373
2374sub set_range { 3042sub set_range {
2375 my ($self, $range) = @_; 3043 my ($self, $range) = @_;
2376 3044
2377 ($range, $self->{range}) = ($self->{range}, $range); 3045 ($range, $self->{range}) = ($self->{range}, $range);
2378 3046
… …
2398 if $unit; 3066 if $unit;
2399 3067
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3068 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 3069
2402 if ($value != $old_value) { 3070 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 3071 $self->emit (changed => $value);
2404 $self->update; 3072 $self->update;
2405 } 3073 }
2406} 3074}
2407 3075
2408sub size_request { 3076sub size_request {
2409 my ($self) = @_; 3077 my ($self) = @_;
2410 3078
2411 ($self->{req_w}, $self->{req_h}) 3079 ($self->{req_w}, $self->{req_h})
2412} 3080}
2413 3081
2414sub button_down { 3082sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2416 3084
2417 $self->SUPER::button_down ($ev, $x, $y); 3085 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 3086
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3087 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 3088
2421 $self->mouse_motion ($ev, $x, $y) 3089 $self->invoke_mouse_motion ($ev, $x, $y);
2422}
2423 3090
3091 1
3092}
3093
2424sub mouse_motion { 3094sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2426 3096
2427 if ($GRAB == $self) { 3097 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3098 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 3099
… …
2433 3103
2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3104 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else { 3105 } else {
2436 return 0; 3106 return 0;
2437 } 3107 }
3108
3109 1
3110}
3111
3112sub invoke_mouse_wheel {
3113 my ($self, $ev) = @_;
3114
3115 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3116
3117 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3118
3119 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2438 3120
2439 1 3121 1
2440} 3122}
2441 3123
2442sub update { 3124sub update {
… …
2493 glDisable GL_TEXTURE_2D; 3175 glDisable GL_TEXTURE_2D;
2494} 3176}
2495 3177
2496############################################################################# 3178#############################################################################
2497 3179
2498package CFClient::UI::ValSlider; 3180package DC::UI::ValSlider;
2499 3181
2500our @ISA = CFClient::UI::HBox::; 3182our @ISA = DC::UI::HBox::;
2501 3183
2502sub new { 3184sub new {
2503 my ($class, %arg) = @_; 3185 my ($class, %arg) = @_;
2504 3186
2505 my $range = delete $arg{range}; 3187 my $range = delete $arg{range};
2506 3188
2507 my $self = $class->SUPER::new ( 3189 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3190 slider => (new DC::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3191 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 3192 to_value => sub { shift },
2511 from_value => sub { shift }, 3193 from_value => sub { shift },
2512 %arg, 3194 %arg,
2513 ); 3195 );
2514 3196
… …
2534sub set_range { shift->{slider}->set_range (@_) } 3216sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 3217sub set_value { shift->{slider}->set_value (@_) }
2536 3218
2537############################################################################# 3219#############################################################################
2538 3220
2539package CFClient::UI::TextScroller; 3221package DC::UI::TextScroller;
2540 3222
2541our @ISA = CFClient::UI::HBox::; 3223our @ISA = DC::UI::HBox::;
2542 3224
2543use CFClient::OpenGL; 3225use DC::OpenGL;
2544 3226
2545sub new { 3227sub new {
2546 my $class = shift; 3228 my $class = shift;
2547 3229
2548 my $self = $class->SUPER::new ( 3230 my $self = $class->SUPER::new (
2549 fontsize => 1, 3231 fontsize => 1,
2550 can_events => 0, 3232 can_events => 1,
2551 indent => 0, 3233 indent => 0,
2552 #font => default_font 3234 #font => default_font
2553 @_, 3235 @_,
2554 3236
2555 layout => (new CFClient::Layout 1), 3237 layout => (new DC::Layout),
2556 par => [], 3238 par => [],
3239 max_par => 0,
2557 height => 0, 3240 height => 0,
2558 children => [ 3241 children => [
2559 (new CFClient::UI::Empty expand => 1), 3242 (new DC::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 3243 (new DC::UI::Slider vertical => 1),
2561 ], 3244 ],
2562 ); 3245 );
2563 3246
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 3247 $self->{children}[1]->connect (changed => sub { $self->update });
2565 3248
… …
2571 3254
2572 $self->{fontsize} = $fontsize; 3255 $self->{fontsize} = $fontsize;
2573 $self->reflow; 3256 $self->reflow;
2574} 3257}
2575 3258
3259sub size_request {
3260 my ($self) = @_;
3261
3262 my ($empty, $slider) = $self->visible_children;
3263
3264 local $self->{children} = [$empty, $slider];
3265 $self->SUPER::size_request
3266}
3267
2576sub size_allocate { 3268sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 3269 my ($self, $w, $h) = @_;
2578 3270
2579 $self->SUPER::size_allocate ($w, $h); 3271 my ($empty, $slider, @other) = @{ $self->{children} };
3272 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 3273
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3274 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3275 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 3276 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3277 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 3278
2586 $self->reflow; 3279 $self->reflow;
2587}
2588 3280
2589sub text_size { 3281 local $self->{children} = [$empty, $slider];
3282 $self->SUPER::invoke_size_allocate ($w, $h)
3283}
3284
3285sub invoke_mouse_wheel {
2590 my ($self, $text, $indent) = @_; 3286 my ($self, $ev) = @_;
3287
3288 return 0 unless $ev->{dy}; # only vertical movements
3289
3290 $self->{children}[1]->emit (mouse_wheel => $ev);
3291
3292 1
3293}
3294
3295sub get_layout {
3296 my ($self, $para) = @_;
2591 3297
2592 my $layout = $self->{layout}; 3298 my $layout = $self->{layout};
2593 3299
3300 $layout->set_font ($self->{font}) if $self->{font};
3301 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3302 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 3303 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3304 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 3305 $layout->set_markup ($para->{markup});
3306
3307 $layout->set_shapes (
3308 map
3309 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3310 @{$para->{widget}}
2598 3311 );
3312
2599 $layout->size 3313 $layout
2600} 3314}
2601 3315
2602sub reflow { 3316sub reflow {
2603 my ($self) = @_; 3317 my ($self) = @_;
2604 3318
… …
2611 3325
2612 # todo: base offset on lines or so, not on pixels 3326 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 3327 $self->{children}[1]->set_value ($offset);
2614} 3328}
2615 3329
3330sub current_paragraph {
3331 my ($self) = @_;
3332
3333 $self->{top_paragraph} - 1
3334}
3335
3336sub scroll_to {
3337 my ($self, $para) = @_;
3338
3339 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3340
3341 $self->{scroll_to} = $para;
3342 $self->update;
3343}
3344
2616sub clear { 3345sub clear {
2617 my ($self) = @_; 3346 my ($self) = @_;
3347
3348 my (undef, undef, @other) = @{ $self->{children} };
3349 $self->remove ($_) for @other;
2618 3350
2619 $self->{par} = []; 3351 $self->{par} = [];
2620 $self->{height} = 0; 3352 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3353 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 3354}
2623 3355
2624sub add_paragraph { 3356sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 3357 my $self = shift;
2626 3358
2627 for my $line (split /\n/, $text) { 3359 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 3360 $para = {
3361 fg => [1, 1, 1, 1],
3362 indent => 0,
3363 markup => "",
3364 widget => [],
3365 ref $para ? %$para : (markup => $para),
3366 w => 1e10,
3367 wrapped => 1,
3368 };
3369
3370 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3371 push @{$self->{par}}, $para;
3372 }
3373
3374 if (my $max = $self->{max_par}) {
3375 shift @{$self->{par}} while @{$self->{par}} > $max;
3376 }
3377
3378 $self->{need_reflow}++;
3379 $self->update;
3380}
3381
3382sub scroll_to_bottom {
3383 my ($self) = @_;
3384
3385 $self->{scroll_to} = $#{$self->{par}};
3386 $self->update;
3387}
3388
3389sub force_uptodate {
3390 my ($self) = @_;
3391
3392 if (delete $self->{need_reflow}) {
3393 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3394
3395 my $height = 0;
3396
3397 for my $para (@{$self->{par}}) {
3398 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3399 my $layout = $self->get_layout ($para);
3400 my ($w, $h) = $layout->size;
3401
3402 $para->{w} = $w + $para->{indent};
3403 $para->{h} = $h;
3404 $para->{wrapped} = $layout->has_wrapped;
3405 }
3406
3407 $para->{y} = $height;
3408 $height += $para->{h};
3409 }
3410
2629 $self->{height} += $h; 3411 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3412 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 3413
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3414 delete $self->{texture};
3415 }
3416
3417 if (my $paridx = delete $self->{scroll_to}) {
3418 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3419 }
2634} 3420}
2635 3421
2636sub update { 3422sub update {
2637 my ($self) = @_; 3423 my ($self) = @_;
2638 3424
… …
2641 return unless $self->{h} > 0; 3427 return unless $self->{h} > 0;
2642 3428
2643 delete $self->{texture}; 3429 delete $self->{texture};
2644 3430
2645 $ROOT->on_post_alloc ($self => sub { 3431 $ROOT->on_post_alloc ($self => sub {
3432 $self->force_uptodate;
3433
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3434 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3435
2648 if (delete $self->{need_reflow}) {
2649 my $height = 0;
2650
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2667
2668 $self->{height} = $height;
2669
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2671
2672 delete $self->{texture};
2673 }
2674
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3436 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3437 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3438 glClear GL_COLOR_BUFFER_BIT;
2678 3439
3440 package DC::UI::Base;
3441 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3442 (0, 0, $self->{w}, $self->{h});
3443
3444 my $top = int $self->{children}[1]{range}[0];
3445
3446 my $paridx = 0;
3447 my $top_paragraph;
2679 my $top = int $self->{children}[1]{range}[0]; 3448 my $top = int $self->{children}[1]{range}[0];
2680 3449
2681 my $y0 = $top; 3450 my $y0 = $top;
2682 my $y1 = $top + $H; 3451 my $y1 = $top + $H;
2683 3452
2684 my $y = 0;
2685
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 3453 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3454 my $h = $para->{h};
3455 my $y = $para->{y};
2696 3456
2697 if ($y0 < $y + $h && $y < $y1) { 3457 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3458 my $layout = $self->get_layout ($para);
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 3459
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3460 $layout->render ($para->{indent}, $y - $y0);
3461 $layout->draw;
2704 3462
2705 glRasterPos $par->[3], $y - $y0; 3463 if (my @w = @{ $para->{widget} }) {
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3464 my @s = $layout->get_shapes;
3465
3466 for (@w) {
3467 my ($dx, $dy) = splice @s, 0, 2, ();
3468
3469 $_->{x} = $dx + $para->{indent};
3470 $_->{y} = $dy + $y - $y0;
3471
3472 $_->draw;
3473 }
3474 }
2707 } 3475 }
2708 3476
2709 $y += $h; 3477 $paridx++;
3478 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3479 }
2711 3480
2712 glDisable GL_BLEND; 3481 $self->{top_paragraph} = $top_paragraph;
2713 }; 3482 };
2714 }); 3483 });
3484}
3485
3486sub reconfigure {
3487 my ($self) = @_;
3488
3489 $self->SUPER::reconfigure;
3490
3491 $_->{w} = 1e10 for @{ $self->{par} };
3492 $self->reflow;
2715} 3493}
2716 3494
2717sub _draw { 3495sub _draw {
2718 my ($self) = @_; 3496 my ($self) = @_;
2719 3497
… …
2722 glColor 0, 0, 0, 1; 3500 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3501 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 3502 glDisable GL_TEXTURE_2D;
2725 3503
2726 $self->{children}[1]->draw; 3504 $self->{children}[1]->draw;
2727
2728} 3505}
2729 3506
2730############################################################################# 3507#############################################################################
2731 3508
2732package CFClient::UI::Animator; 3509package DC::UI::Animator;
2733 3510
2734use CFClient::OpenGL; 3511use DC::OpenGL;
2735 3512
2736our @ISA = CFClient::UI::Bin::; 3513our @ISA = DC::UI::Bin::;
2737 3514
2738sub moveto { 3515sub moveto {
2739 my ($self, $x, $y) = @_; 3516 my ($self, $x, $y) = @_;
2740 3517
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3518 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3546 glPopMatrix;
2770} 3547}
2771 3548
2772############################################################################# 3549#############################################################################
2773 3550
2774package CFClient::UI::Flopper; 3551package DC::UI::Flopper;
2775 3552
2776our @ISA = CFClient::UI::Button::; 3553our @ISA = DC::UI::Button::;
2777 3554
2778sub new { 3555sub new {
2779 my $class = shift; 3556 my $class = shift;
2780 3557
2781 my $self = $class->SUPER::new ( 3558 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3570 $self->{other}->toggle_visibility;
2794} 3571}
2795 3572
2796############################################################################# 3573#############################################################################
2797 3574
2798package CFClient::UI::Tooltip; 3575package DC::UI::Tooltip;
2799 3576
2800our @ISA = CFClient::UI::Bin::; 3577our @ISA = DC::UI::Bin::;
2801 3578
2802use CFClient::OpenGL; 3579use DC::OpenGL;
2803 3580
2804sub new { 3581sub new {
2805 my $class = shift; 3582 my $class = shift;
2806 3583
2807 $class->SUPER::new ( 3584 $class->SUPER::new (
… …
2811} 3588}
2812 3589
2813sub set_tooltip_from { 3590sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3591 my ($self, $widget) = @_;
2815 3592
2816 my $tooltip = $widget->{tooltip}; 3593 my $tip = $widget->{tooltip};
3594 $tip = $tip->($widget) if "CODE" eq ref $tip;
3595
3596 $tip = DC::Pod::section_label tooltip => $1
3597 if $tip =~ /^#(.*)$/;
2817 3598
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3599 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3600 $tip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3601 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n" 3602 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}"; 3603 . "visible $widget->{visible}";
2823 } 3604 }
2824 3605
2825 $tooltip =~ s/^\n+//; 3606 $tip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3607 $tip =~ s/\n+$//;
2827 3608
2828 $self->add (new CFClient::UI::Label 3609 $self->add (new DC::UI::Label
2829 markup => $tooltip, 3610 markup => $tip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3612 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3613 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3614 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3615 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3616 );
2836} 3617}
2837 3618
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3622 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3623
2843 ($w + 4, $h + 4) 3624 ($w + 4, $h + 4)
2844} 3625}
2845 3626
2846sub size_allocate { 3627sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3628 my ($self, $w, $h) = @_;
2848 3629
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3630 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3631}
2851 3632
2852sub visibility_change { 3633sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3634 my ($self, $visible) = @_;
2854 3635
2855 return unless $visible; 3636 return unless $visible;
2856 3637
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3638 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3639 my $widget = $self->{owner}
2859 or return; 3640 or return;
2860 3641
3642 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3643 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3644
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3645 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3646 if $x + $self->{w} > $self->{root}{w};
2865 3647
2866 $self->move_abs ($x, $y); 3648 $self->move_abs ($x, $y);
3649 } else {
3650 $self->hide;
3651 }
2867 }); 3652 });
2868} 3653}
2869 3654
2870sub _draw { 3655sub _draw {
2871 my ($self) = @_; 3656 my ($self) = @_;
2872 3657
2873 glTranslate 0.375, 0.375;
2874
2875 my ($w, $h) = @$self{qw(w h)}; 3658 my ($w, $h) = @$self{qw(w h)};
2876 3659
2877 glColor 1, 0.8, 0.4; 3660 glColor 1, 0.8, 0.4;
2878 glBegin GL_QUADS; 3661 glRect 0, 0, $w, $h;
2879 glVertex 0 , 0;
2880 glVertex 0 , $h;
2881 glVertex $w, $h;
2882 glVertex $w, 0;
2883 glEnd;
2884 3662
2885 glColor 0, 0, 0; 3663 glColor 0, 0, 0;
2886 glBegin GL_LINE_LOOP; 3664 glRect_lineloop .5, .5, $w + .5, $h + .5;
2887 glVertex 0 , 0;
2888 glVertex 0 , $h;
2889 glVertex $w, $h;
2890 glVertex $w, 0;
2891 glEnd;
2892 3665
2893 glTranslate 2 - 0.375, 2 - 0.375; 3666 glTranslate 2, 2;
2894 3667
2895 $self->SUPER::_draw; 3668 $self->SUPER::_draw;
2896} 3669}
2897 3670
2898############################################################################# 3671#############################################################################
2899 3672
2900package CFClient::UI::Face; 3673package DC::UI::Face;
2901 3674
2902our @ISA = CFClient::UI::Base::; 3675our @ISA = DC::UI::DrawBG::;
2903 3676
2904use CFClient::OpenGL; 3677use DC::OpenGL;
2905 3678
2906sub new { 3679sub new {
2907 my $class = shift; 3680 my $class = shift;
2908 3681
2909 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
3683 size_w => 32,
3684 size_h => 8,
2910 aspect => 1, 3685 aspect => 1,
2911 can_events => 0, 3686 can_events => 0,
2912 @_, 3687 @_,
2913 ); 3688 );
2914 3689
2915 if ($self->{anim} && $self->{animspeed}) { 3690 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3691 DC::weaken (my $widget = $self);
2917 3692
2918 $self->{timer} = Event->timer ( 3693 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3694 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2920 hard => 1, 3695 return unless $::CONN;
2921 interval => $self->{animspeed}, 3696
2922 cb => sub { 3697 my $w = $widget
3698 or return;
3699
2923 ++$widget->{frame}; 3700 ++$w->{frame};
3701 $w->update_face;
3702
3703 # somehow, $widget can go away
2924 $widget->update; 3704 $w->update;
2925 }, 3705 $w->update_timer;
2926 ); 3706 };
3707
3708 $self->update_face;
3709 $self->update_timer;
2927 } 3710 }
2928 3711
2929 $self 3712 $self
2930} 3713}
2931 3714
3715sub update_timer {
3716 my ($self) = @_;
3717
3718 return unless $self->{timer};
3719
3720 if ($self->{visible}) {
3721 $self->{timer}->start;
3722 } else {
3723 $self->{timer}->stop;
3724 }
3725}
3726
3727sub update_face {
3728 my ($self) = @_;
3729
3730 if ($::CONN) {
3731 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3732 if ($anim && @$anim) {
3733 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3734 delete $self->{face_change_cb};
3735
3736 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3737 unless ($tex->{name} || $tex->{loading}) {
3738 $tex->upload (sub { $self->reconfigure });
3739 }
3740 }
3741 }
3742 }
3743 }
3744}
3745
2932sub size_request { 3746sub size_request {
2933 (32, 8) 3747 my ($self) = @_;
3748
3749 if ($::CONN) {
3750 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3751 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3752 if ($tex->{name}) {
3753 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3754 } elsif (!$tex->{loading}) {
3755 $tex->upload (sub { $self->reconfigure });
3756 }
3757 }
3758
3759 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3760 }
3761 }
3762
3763 ($self->{size_w} || 8, $self->{size_h} || 8)
2934} 3764}
2935 3765
2936sub update { 3766sub update {
2937 my ($self) = @_; 3767 my ($self) = @_;
2938 3768
2939 return unless $self->{visible}; 3769 return unless $self->{visible};
2940 3770
2941 $self->SUPER::update; 3771 $self->SUPER::update;
2942} 3772}
2943 3773
3774sub invoke_visibility_change {
3775 my ($self) = @_;
3776
3777 $self->update_timer;
3778
3779 0
3780}
3781
2944sub _draw { 3782sub _draw {
2945 my ($self) = @_; 3783 my ($self) = @_;
2946 3784
2947 return unless $::CONN; 3785 $self->SUPER::_draw;
2948 3786
2949 my $face; 3787 if (my $tex = $self->{tex}) {
2950
2951 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}];
2953
2954 $face = $anim->[ $self->{frame} % @$anim ]
2955 if $anim && @$anim;
2956 }
2957
2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2959
2960 if ($tex) {
2961 glEnable GL_TEXTURE_2D; 3788 glEnable GL_TEXTURE_2D;
2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963 glColor 0, 0, 0, 1; 3790 glColor 0, 0, 0, 1;
2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2965 glDisable GL_TEXTURE_2D; 3792 glDisable GL_TEXTURE_2D;
… …
2967} 3794}
2968 3795
2969sub destroy { 3796sub destroy {
2970 my ($self) = @_; 3797 my ($self) = @_;
2971 3798
2972 $self->{timer}->cancel 3799 (delete $self->{timer})->cancel
2973 if $self->{timer}; 3800 if $self->{timer};
2974 3801
2975 $self->SUPER::destroy; 3802 $self->SUPER::destroy;
2976} 3803}
2977 3804
2978############################################################################# 3805#############################################################################
2979 3806
2980package CFClient::UI::Buttonbar; 3807package DC::UI::Buttonbar;
2981 3808
2982our @ISA = CFClient::UI::HBox::; 3809our @ISA = DC::UI::HBox::;
2983 3810
2984# TODO: should actualyl wrap buttons and other goodies. 3811# TODO: should actually wrap buttons and other goodies.
2985 3812
2986############################################################################# 3813#############################################################################
2987 3814
2988package CFClient::UI::Menu; 3815package DC::UI::Menu;
2989 3816
2990our @ISA = CFClient::UI::FancyFrame::; 3817our @ISA = DC::UI::Toplevel::;
2991 3818
2992use CFClient::OpenGL; 3819use DC::OpenGL;
2993 3820
2994sub new { 3821sub new {
2995 my $class = shift; 3822 my $class = shift;
2996 3823
2997 my $self = $class->SUPER::new ( 3824 my $self = $class->SUPER::new (
2998 items => [], 3825 items => [],
2999 z => 100, 3826 z => 100,
3000 @_, 3827 @_,
3001 ); 3828 );
3002 3829
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3830 $self->add ($self->{vbox} = new DC::UI::VBox);
3004 3831
3005 for my $item (@{ $self->{items} }) { 3832 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3833 my ($widget, $cb, $tooltip) = @$item;
3007 3834
3008 # handle various types of items, only text for now 3835 # handle various types of items, only text for now
3009 if (!ref $widget) { 3836 if (!ref $widget) {
3837 if ($widget =~ /\t/) {
3838 my ($left, $right) = split /\t/, $widget, 2;
3839
3010 $widget = new CFClient::UI::Label 3840 $widget = new DC::UI::HBox
3011 can_hover => 1, 3841 can_hover => 1,
3012 can_events => 1, 3842 can_events => 1,
3843 tooltip => $tooltip,
3844 children => [
3845 (new DC::UI::Label markup => $left, expand => 1),
3846 (new DC::UI::Label markup => $right, align => +1),
3847 ],
3848 ;
3849
3850 } else {
3851 $widget = new DC::UI::Label
3852 can_hover => 1,
3853 can_events => 1,
3013 markup => $widget, 3854 markup => $widget,
3014 tooltip => $tooltip 3855 tooltip => $tooltip;
3856 }
3015 } 3857 }
3016 3858
3017 $self->{item}{$widget} = $item; 3859 $self->{item}{$widget} = $item;
3018 3860
3019 $self->{vbox}->add ($widget); 3861 $self->{vbox}->add ($widget);
… …
3024 3866
3025# popup given the event (must be a mouse button down event currently) 3867# popup given the event (must be a mouse button down event currently)
3026sub popup { 3868sub popup {
3027 my ($self, $ev) = @_; 3869 my ($self, $ev) = @_;
3028 3870
3029 $self->_emit ("popdown"); 3871 $self->emit ("popdown");
3030 3872
3031 # maybe save $GRAB? must be careful about events... 3873 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3874 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3875 $self->{button} = $ev->{button};
3034 3876
3035 $self->show; 3877 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3878 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3879}
3038 3880
3039sub mouse_motion { 3881sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3882 my ($self, $ev, $x, $y) = @_;
3041 3883
3042 # TODO: should use vbox->find_widget or so 3884 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3885 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3886 $self->{hover} = $self->{item}{$HOVER};
3045 3887
3046 0 3888 0
3047} 3889}
3048 3890
3049sub button_up { 3891sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3892 my ($self, $ev, $x, $y) = @_;
3051 3893
3052 if ($ev->{button} == $self->{button}) { 3894 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3895 undef $GRAB;
3054 $self->hide; 3896 $self->hide;
3055 3897
3056 $self->_emit ("popdown"); 3898 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3899 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3900 } else {
3059 return 0 3901 return 0
3060 } 3902 }
3061 3903
3062 1 3904 1
3063} 3905}
3064 3906
3065############################################################################# 3907#############################################################################
3066 3908
3067package CFClient::UI::Multiplexer; 3909package DC::UI::Multiplexer;
3068 3910
3069our @ISA = CFClient::UI::Container::; 3911our @ISA = DC::UI::Container::;
3070 3912
3071sub new { 3913sub new {
3072 my $class = shift; 3914 my $class = shift;
3073 3915
3074 my $self = $class->SUPER::new ( 3916 my $self = $class->SUPER::new (
… …
3088 3930
3089 $self->{current} = $self->{children}[0] 3931 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3932 if @{ $self->{children} };
3091} 3933}
3092 3934
3935sub get_current_page {
3936 my ($self) = @_;
3937
3938 $self->{current}
3939}
3940
3093sub set_current_page { 3941sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3942 my ($self, $page_or_widget) = @_;
3095 3943
3096 my $widget = ref $page_or_widget 3944 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3945 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3946 : $self->{children}[$page_or_widget];
3099 3947
3100 $self->{current} = $widget; 3948 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3949 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3950
3103 $self->_emit (page_changed => $self->{current}); 3951 $self->emit (page_changed => $self->{current});
3104 3952
3105 $self->realloc; 3953 $self->realloc;
3106} 3954}
3107 3955
3108sub visible_children { 3956sub visible_children {
… …
3113 my ($self) = @_; 3961 my ($self) = @_;
3114 3962
3115 $self->{current}->size_request 3963 $self->{current}->size_request
3116} 3964}
3117 3965
3118sub size_allocate { 3966sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3967 my ($self, $w, $h) = @_;
3120 3968
3121 $self->{current}->configure (0, 0, $w, $h); 3969 $self->{current}->configure (0, 0, $w, $h);
3970
3971 1
3122} 3972}
3123 3973
3124sub _draw { 3974sub _draw {
3125 my ($self) = @_; 3975 my ($self) = @_;
3126 3976
3127 $self->{current}->draw; 3977 $self->{current}->draw;
3128} 3978}
3129 3979
3130############################################################################# 3980#############################################################################
3131 3981
3132package CFClient::UI::Notebook; 3982package DC::UI::Notebook;
3133 3983
3984use DC::OpenGL;
3985
3134our @ISA = CFClient::UI::VBox::; 3986our @ISA = DC::UI::VBox::;
3135 3987
3136sub new { 3988sub new {
3137 my $class = shift; 3989 my $class = shift;
3138 3990
3139 my $self = $class->SUPER::new ( 3991 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3992 buttonbar => (new DC::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3993 multiplexer => (new DC::UI::Multiplexer expand => 1),
3994 active_outline => [.7, .7, 0.2],
3142 # filter => # will be put between multiplexer and $self 3995 # filter => # will be put between multiplexer and $self
3143 @_, 3996 @_,
3144 ); 3997 );
3145 3998
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3999 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4000 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148 4001
4002 {
4003 Scalar::Util::weaken (my $wself = $self);
4004
4005 $self->{multiplexer}->connect (c_add => sub {
4006 my ($mplex, $widgets) = @_;
4007
4008 for my $child (@$widgets) {
4009 Scalar::Util::weaken $child;
4010 $child->{c_tab_} ||= do {
4011 my $tab =
4012 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4013 ? $child->{c_tab}
4014 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4015
4016 $tab->connect (activate => sub {
4017 $wself->set_current_page ($child);
4018 });
4019
4020 $tab
4021 };
4022
4023 $self->{buttonbar}->add ($child->{c_tab_});
4024 }
4025 });
4026
4027 $self->{multiplexer}->connect (c_remove => sub {
4028 my ($mplex, $widgets) = @_;
4029
4030 for my $child (@$widgets) {
4031 $wself->{buttonbar}->remove ($child->{c_tab_});
4032 }
4033 });
4034 }
4035
3149 $self 4036 $self
3150} 4037}
3151 4038
3152sub add { 4039sub add {
4040 my ($self, @widgets) = @_;
4041
4042 $self->{multiplexer}->add (@widgets)
4043}
4044
4045sub remove {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->remove (@widgets)
4049}
4050
4051sub pages {
4052 my ($self) = @_;
4053 $self->{multiplexer}->children
4054}
4055
4056sub add_tab {
3153 my ($self, $title, $widget, $tooltip) = @_; 4057 my ($self, $title, $widget, $tooltip) = @_;
3154 4058
3155 Scalar::Util::weaken $self; 4059 $title = [$title, $tooltip] unless ref $title;
4060 $widget->{c_tab} = $title;
3156 4061
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget); 4062 $self->add ($widget);
4063}
4064
4065sub get_current_page {
4066 my ($self) = @_;
4067
4068 $self->{multiplexer}->get_current_page
3164} 4069}
3165 4070
3166sub set_current_page { 4071sub set_current_page {
3167 my ($self, $page) = @_; 4072 my ($self, $page) = @_;
3168 4073
3169 $self->{multiplexer}->set_current_page ($page); 4074 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 4075 $self->emit (page_changed => $self->{multiplexer}{current});
4076}
4077
4078sub _draw {
4079 my ($self) = @_;
4080
4081 $self->SUPER::_draw ();
4082
4083 if (my $cur = $self->{multiplexer}{current}) {
4084 if ($cur = $cur->{c_tab_}) {
4085 glTranslate $self->{buttonbar}{x} + $cur->{x},
4086 $self->{buttonbar}{y} + $cur->{y};
4087 glLineWidth 3;
4088 #glEnable GL_BLEND;
4089 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4090 glColor @{$self->{active_outline}};
4091 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4092 glLineWidth 1;
4093 #glDisable GL_BLEND;
4094 }
4095 }
3171} 4096}
3172 4097
3173############################################################################# 4098#############################################################################
3174 4099
3175package CFClient::UI::Combobox; 4100package DC::UI::Selector;
3176 4101
3177use utf8; 4102use utf8;
3178 4103
3179our @ISA = CFClient::UI::Button::; 4104our @ISA = DC::UI::Button::;
3180 4105
3181sub new { 4106sub new {
3182 my $class = shift; 4107 my $class = shift;
3183 4108
3184 my $self = $class->SUPER::new ( 4109 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 4115 $self->_set_value ($self->{value});
3191 4116
3192 $self 4117 $self
3193} 4118}
3194 4119
3195sub button_down { 4120sub invoke_button_down {
3196 my ($self, $ev) = @_; 4121 my ($self, $ev) = @_;
3197 4122
3198 my @menu_items; 4123 my @menu_items;
3199 4124
3200 for (@{ $self->{options} }) { 4125 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 4126 my ($value, $title, $tooltip) = @$_;
3202 4127
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4128 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 4129 }
3205 4130
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4131 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 4132}
3208 4133
3209sub _set_value { 4134sub _set_value {
3210 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3211 4136
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4137 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4138 $item ||= $self->{options}[0]
3213 or return; 4139 or return;
3214 4140
3215 $self->{value} = $item->[0]; 4141 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓"); 4142 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]); 4143# $self->set_tooltip ($item->[2]);
3218} 4144}
3219 4145
3220sub set_value { 4146sub set_value {
3221 my ($self, $value) = @_; 4147 my ($self, $value) = @_;
3222 4148
3223 return unless $self->{value} ne $value; 4149 return unless $self->{value} ne $value;
3224 4150
3225 $self->_set_value ($value); 4151 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 4152 $self->emit (changed => $value);
4153}
4154
4155sub set_options {
4156 my ($self, $options) = @_;
4157
4158 $self->{options} = $options;
4159 $self->_set_value ($self->{value});
3227} 4160}
3228 4161
3229############################################################################# 4162#############################################################################
3230 4163
3231package CFClient::UI::Statusbox; 4164package DC::UI::Statusbox;
3232 4165
3233our @ISA = CFClient::UI::VBox::; 4166our @ISA = DC::UI::VBox::;
3234 4167
3235sub new { 4168sub new {
3236 my $class = shift; 4169 my $class = shift;
3237 4170
3238 my $self = $class->SUPER::new ( 4171 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 4172 fontsize => 0.8,
3240 @_, 4173 @_,
3241 ); 4174 );
3242 4175
3243 Scalar::Util::weaken (my $this = $self); 4176 DC::weaken (my $this = $self);
3244 4177
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4178 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3246 4179
3247 $self 4180 $self
3248} 4181}
3249 4182
3250sub reorder { 4183sub reorder {
3251 my ($self) = @_; 4184 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 4185 my $NOW = Time::HiRes::time;
3253 4186
3254 # freeze display when hovering over any label 4187 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 4188 return if $DC::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4189 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 4190 values %{ $self->{item} };
3258 4191
3259 while (my ($k, $v) = each %{ $self->{item} }) { 4192 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 4194 }
4195
4196 $self->{timer}->set (1, 1);
3262 4197
3263 my @widgets; 4198 my @widgets;
3264 4199
3265 my @items = sort { 4200 my @items = sort {
3266 $a->{pri} <=> $b->{pri} 4201 $a->{pri} <=> $b->{pri}
3267 or $b->{id} <=> $a->{id} 4202 or $b->{id} <=> $a->{id}
3268 } values %{ $self->{item} }; 4203 } values %{ $self->{item} };
3269
3270 $self->{timer}->interval (1);
3271 4204
3272 my $count = 10 + 1; 4205 my $count = 10 + 1;
3273 for my $item (@items) { 4206 for my $item (@items) {
3274 last unless --$count; 4207 last unless --$count;
3275 4208
… …
3282 for ($short) { 4215 for ($short) {
3283 s/^\s+//; 4216 s/^\s+//;
3284 s/\s+/ /g; 4217 s/\s+/ /g;
3285 } 4218 }
3286 4219
3287 new CFClient::UI::Label 4220 new DC::UI::Label
3288 markup => $short, 4221 markup => $short,
3289 tooltip => $item->{tooltip}, 4222 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 4223 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 4224 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 4225 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update; 4234 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff) 4235 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1; 4236 if $diff < 1;
3304 $self->{timer}->interval (1/30); 4237 $self->{timer}->set (1/30, 1/30);
3305 } else { 4238 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1; 4239 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 } 4240 }
3308 4241
3309 push @widgets, $label; 4242 push @widgets, $label;
… …
3346 count => 1, 4279 count => 1,
3347 %arg, 4280 %arg,
3348 }; 4281 };
3349 } 4282 }
3350 4283
4284 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 4285 $self->reorder;
4286 });
3352} 4287}
3353 4288
3354sub reconfigure { 4289sub reconfigure {
3355 my ($self) = @_; 4290 my ($self) = @_;
3356 4291
… …
3369 $self->SUPER::destroy; 4304 $self->SUPER::destroy;
3370} 4305}
3371 4306
3372############################################################################# 4307#############################################################################
3373 4308
3374package CFClient::UI::Inventory;
3375
3376our @ISA = CFClient::UI::ScrolledWindow::;
3377
3378sub new {
3379 my $class = shift;
3380
3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
3623 @_,
3624 )
3625}
3626
3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3713 my ($self, $spell) = @_;
3714
3715 $self->{spell}->{$spell->{name}} = $spell;
3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root; 4309package DC::UI::Root;
3736 4310
3737our @ISA = CFClient::UI::Container::; 4311our @ISA = DC::UI::Container::;
3738 4312
3739use List::Util qw(min max); 4313use List::Util qw(min max);
3740 4314
3741use CFClient::OpenGL; 4315use DC::OpenGL;
3742 4316
3743sub new { 4317sub new {
3744 my $class = shift; 4318 my $class = shift;
3745 4319
3746 my $self = $class->SUPER::new ( 4320 my $self = $class->SUPER::new (
3747 visible => 1, 4321 visible => 1,
3748 @_, 4322 @_,
3749 ); 4323 );
3750 4324
3751 Scalar::Util::weaken ($self->{root} = $self); 4325 DC::weaken ($self->{root} = $self);
3752 4326
3753 $self 4327 $self
3754} 4328}
3755 4329
3756sub size_request { 4330sub size_request {
… …
3771 $coord = $max - $size if $coord > $max - $size; 4345 $coord = $max - $size if $coord > $max - $size;
3772 4346
3773 int $coord + 0.5 4347 int $coord + 0.5
3774} 4348}
3775 4349
3776sub size_allocate { 4350sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 4351 my ($self, $w, $h) = @_;
3778 4352
3779 for my $child ($self->children) { 4353 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4354 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 4355
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 4359 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 4360 $Y = _to_pixel $Y, $H, $self->{h};
3787 4361
3788 $child->configure ($X, $Y, $W, $H); 4362 $child->configure ($X, $Y, $W, $H);
3789 } 4363 }
4364
4365 1
3790} 4366}
3791 4367
3792sub coord2local { 4368sub coord2local {
3793 my ($self, $x, $y) = @_; 4369 my ($self, $x, $y) = @_;
3794 4370
… …
3802} 4378}
3803 4379
3804sub update { 4380sub update {
3805 my ($self) = @_; 4381 my ($self) = @_;
3806 4382
3807 $::WANT_REFRESH++; 4383 $::WANT_REFRESH = 1;
3808} 4384}
3809 4385
3810sub add { 4386sub add {
3811 my ($self, @children) = @_; 4387 my ($self, @children) = @_;
3812 4388
… …
3849 while ($self->{refresh_hook}) { 4425 while ($self->{refresh_hook}) {
3850 $_->() 4426 $_->()
3851 for values %{delete $self->{refresh_hook}}; 4427 for values %{delete $self->{refresh_hook}};
3852 } 4428 }
3853 4429
3854 if ($self->{realloc}) { 4430 while ($self->{realloc}) {
3855 my %queue; 4431 my %queue;
3856 my @queue; 4432 my @queue;
3857 my $widget; 4433 my $widget;
3858 4434
3859 outer: 4435 outer:
… …
3906 } 4482 }
3907 } 4483 }
3908 4484
3909 delete $self->{realloc}{$widget+0}; 4485 delete $self->{realloc}{$widget+0};
3910 } 4486 }
3911 }
3912 4487
3913 while (my $size_alloc = delete $self->{size_alloc}) { 4488 while (my $size_alloc = delete $self->{size_alloc}) {
3914 my @queue = sort { $b->{visible} <=> $a->{visible} } 4489 my @queue = sort { $a->{visible} <=> $b->{visible} }
3915 values %$size_alloc; 4490 values %$size_alloc;
3916 4491
3917 while () { 4492 while () {
3918 my $widget = pop @queue || last; 4493 my $widget = pop @queue || last;
3919 4494
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4495 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 4496
3922 $w = 0 if $w < 0; 4497 $w = max $widget->{min_w}, $w;
3923 $h = 0 if $h < 0; 4498 $h = max $widget->{min_h}, $h;
3924 4499
4500# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4501# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4502
4503 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4504 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4505
3925 $w = int $w + 0.5; 4506 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 4507 $h = int $h + 0.5;
3927 4508
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4509 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 4510 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h}; 4511 $widget->{old_h} = $widget->{h};
3931 4512
3932 $widget->{w} = $w; 4513 $widget->{w} = $w;
3933 $widget->{h} = $h; 4514 $widget->{h} = $h;
3934 4515
3935 $widget->emit (size_allocate => $w, $h); 4516 $widget->emit (size_allocate => $w, $h);
4517 }
3936 } 4518 }
3937 } 4519 }
3938 } 4520 }
3939 4521
3940 while ($self->{post_alloc_hook}) { 4522 while ($self->{post_alloc_hook}) {
3941 $_->() 4523 $_->()
3942 for values %{delete $self->{post_alloc_hook}}; 4524 for values %{delete $self->{post_alloc_hook}};
3943 } 4525 }
3944
3945 4526
3946 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4527 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4528 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948 glClear GL_COLOR_BUFFER_BIT; 4529 glClear GL_COLOR_BUFFER_BIT;
3949 4530
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4533 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 4534 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 4535 glLoadIdentity;
3955 4536
3956 { 4537 {
3957 package CFClient::UI::Base; 4538 package DC::UI::Base;
3958 4539
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4540 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4541 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4542
3963 $self->_draw; 4543 $self->_draw;
4544 }
3964} 4545}
3965 4546
3966############################################################################# 4547#############################################################################
3967 4548
3968package CFClient::UI; 4549package DC::UI;
3969 4550
3970$ROOT = new CFClient::UI::Root; 4551$ROOT = new DC::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4552$TOOLTIP = new DC::UI::Tooltip z => 900;
3972 4553
39731 45541
3974 4555

Diff Legend

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