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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 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->emit ("focus_out"); 317 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
288} 319}
… …
290sub set_visibility { 321sub set_visibility {
291 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
292 323
293 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
294 325
295 $visible ? $self->hide 326 $visible ? $self->show
296 : $self->show; 327 : $self->hide;
297} 328}
298 329
299sub toggle_visibility { 330sub toggle_visibility {
300 my ($self) = @_; 331 my ($self) = @_;
301 332
… …
307sub hide { 338sub hide {
308 my ($self) = @_; 339 my ($self) = @_;
309 340
310 $self->set_invisible; 341 $self->set_invisible;
311 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
312 $self->{parent}->remove ($self) 346 $parent->remove ($self);
313 if $self->{parent}; 347 }
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
… …
330 $self->{force_h} = $h; 364 $self->{force_h} = $h;
331 365
332 $self->realloc; 366 $self->realloc;
333} 367}
334 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
335sub size_request { 387sub size_request {
336 require Carp; 388 require Carp;
337 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
338} 390}
339 391
… …
345 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
346 398
347 if ($self->{aspect}) { 399 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
349 401
350 $w = List::Util::min $w, int $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
352 404
353 # use alignment to adjust x, y 405 # use alignment to adjust x, y
354 406
355 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
397 449
398 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
399 451
400 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
401 453
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
405 } 457 }
406} 458}
407 459
408# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
409sub coord2local { 461sub coord2local {
410 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
411 463
464 return (undef, undef) unless $self->{parent};
465
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 467}
414 468
415# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
416sub coord2global { 470sub coord2global {
417 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
418 472
473 return (undef, undef) unless $self->{parent};
474
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 476}
421 477
422sub invoke_focus_in { 478sub invoke_focus_in {
423 my ($self) = @_; 479 my ($self) = @_;
… …
452 508
453 $FOCUS->emit ("focus_out") if $FOCUS; 509 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 510 $self->emit ("focus_in");
455} 511}
456 512
457sub invoke_mouse_motion { 1 } 513sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 514sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 515sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 516sub invoke_key_up { 0 }
517sub invoke_mouse_wheel { 0 }
461 518
462sub invoke_button_down { 519sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 520 my ($self, $ev, $x, $y) = @_;
464 521
465 $self->grab_focus; 522 $self->grab_focus;
466 523
467 1 524 0
468} 525}
469 526
470sub connect { 527sub connect {
471 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
472 529
473 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
531
532 defined wantarray and DC::guard {
533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
534 @{ $self->{signal_cb}{$signal} };
535 }
474} 536}
537
538sub disconnect_all {
539 my ($self, $signal) = @_;
540
541 delete $self->{signal_cb}{$signal};
542}
543
544my %has_coords = (
545 button_down => 1,
546 button_up => 1,
547 mouse_motion => 1,
548 mouse_wheel => 1,
549);
475 550
476sub emit { 551sub emit {
477 my ($self, $signal, @args) = @_; 552 my ($self, $signal, @args) = @_;
478 553
479 #d##TODO# stop propagating at first true, do not use sum 554 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 555 # and needlessly verbose code, either.
556 my @append
557 = $has_coords{$signal}
558 ? $args[0]->xy ($self)
559 : ();
560
561 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
562
563 for my $cb (
564 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 565 ($self->can ("invoke_$signal") || sub { 1 }), # closure
566 ) {
567 return $cb->($self, @args, @append) || next;
568 }
569
570 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 572}
484 573
485sub find_widget { 574#sub find_widget {
486 my ($self, $x, $y) = @_; 575# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 576
497sub set_parent { 577sub set_parent {
498 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
499 579
500 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
502} 582}
503 583
504sub realloc { 584sub realloc {
505 my ($self) = @_; 585 my ($self) = @_;
… …
531 611
532# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless. 613# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535 615
536sub draw { 616#sub draw {
537 my ($self) = @_; 617#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 618
583sub _draw { 619sub _draw {
584 my ($self) = @_; 620 my ($self) = @_;
585 621
586 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
587} 623}
588 624
589sub DESTROY { 625sub DESTROY {
590 my ($self) = @_; 626 my ($self) = @_;
591 627
592 delete $WIDGET{$self+0}; 628 return if DC::in_destruct;
593 629
630 local $@;
594 eval { $self->destroy }; 631 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
633
634 delete $WIDGET{$self+0};
596} 635}
597 636
598############################################################################# 637#############################################################################
599 638
600package CFClient::UI::DrawBG; 639package DC::UI::DrawBG;
601 640
602our @ISA = CFClient::UI::Base::; 641our @ISA = DC::UI::Base::;
603 642
604use strict; 643use strict;
605use CFClient::OpenGL; 644use DC::OpenGL;
606 645
607sub new { 646sub new {
608 my $class = shift; 647 my $class = shift;
609
610 # range [value, low, high, page]
611 648
612 $class->SUPER::new ( 649 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
615 @_ 652 @_
… …
627 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
628 665
629 glEnable GL_BLEND; 666 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 668 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 670 glDisable GL_BLEND;
641 } 671 }
642} 672}
643 673
644############################################################################# 674#############################################################################
645 675
646package CFClient::UI::Empty; 676package DC::UI::Empty;
647 677
648our @ISA = CFClient::UI::Base::; 678our @ISA = DC::UI::Base::;
649 679
650sub new { 680sub new {
651 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
653} 683}
… …
660 690
661sub draw { } 691sub draw { }
662 692
663############################################################################# 693#############################################################################
664 694
665package CFClient::UI::Container; 695package DC::UI::Container;
666 696
667our @ISA = CFClient::UI::Base::; 697our @ISA = DC::UI::Base::;
668 698
669sub new { 699sub new {
670 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
671 701
672 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
676 can_events => 0, 706 can_events => 0,
677 %arg, 707 %arg,
678 ); 708 );
679 709
680 $self->add (@$children) 710 $self->add (@$children)
681 if $children; 711 if $children && @$children;
682 712
683 $self 713 $self
714}
715
716sub realloc {
717 my ($self) = @_;
718
719 $self->{force_realloc} = 1;
720 $self->{force_size_alloc} = 1;
721 $self->SUPER::realloc;
684} 722}
685 723
686sub add { 724sub add {
687 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
688 726
689 $_->set_parent ($self) 727 $_->set_parent ($self)
690 for @widgets; 728 for @widgets;
691 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 731 use sort 'stable';
693 732
694 $self->{children} = [ 733 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
697 ]; 736 ];
698 737
699 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
700} 743}
701 744
702sub children { 745sub children {
703 @{ $_[0]{children} } 746 @{ $_[0]{children} }
704} 747}
705 748
706sub remove { 749sub remove {
707 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
708 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
709 delete $child->{parent}; 755 delete $child->{parent};
710 $child->hide; 756 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
713 759
714 $self->realloc; 760 $self->realloc;
715} 761}
716 762
717sub clear { 763sub clear {
718 my ($self) = @_; 764 my ($self) = @_;
719 765
720 my $children = delete $self->{children}; 766 my $children = $self->{children};
721 $self->{children} = []; 767 $self->{children} = [];
722 768
723 for (@$children) { 769 for (@$children) {
724 delete $_->{parent}; 770 delete $_->{parent};
725 $_->hide; 771 $_->hide;
… …
745} 791}
746 792
747sub _draw { 793sub _draw {
748 my ($self) = @_; 794 my ($self) = @_;
749 795
750 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
751} 797}
752 798
753############################################################################# 799#############################################################################
754 800
755package CFClient::UI::Bin; 801package DC::UI::Bin;
756 802
757our @ISA = CFClient::UI::Container::; 803our @ISA = DC::UI::Container::;
758 804
759sub new { 805sub new {
760 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
761 807
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
763 809
764 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
765} 811}
766 812
767sub add { 813sub add {
768 my ($self, $child) = @_; 814 my ($self, $child) = @_;
769 815
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
771 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
772} 818}
773 819
774sub remove { 820sub remove {
775 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
776 822
777 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
778 824
779 $self->{children} = [new CFClient::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
780 unless @{$self->{children}}; 826 unless @{$self->{children}};
781} 827}
782 828
783sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
784 830
… …
793 839
794 1 840 1
795} 841}
796 842
797############################################################################# 843#############################################################################
798
799# back-buffered drawing area 844# back-buffered drawing area
800 845
801package CFClient::UI::Window; 846package DC::UI::Window;
802 847
803our @ISA = CFClient::UI::Bin::; 848our @ISA = DC::UI::Bin::;
804 849
805use CFClient::OpenGL; 850use DC::OpenGL;
806 851
807sub new { 852sub new {
808 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
809 854
810 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
832} 877}
833 878
834sub render_child { 879sub render_child {
835 my ($self) = @_; 880 my ($self) = @_;
836 881
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
840 885
841 { 886 {
842 package CFClient::UI::Base; 887 package DC::UI::Base;
843 888
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
846 } 893 }
847
848 $self->_render;
849 }; 894 };
850} 895}
851 896
852sub _draw { 897sub _draw {
853 my ($self) = @_; 898 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 899
857 my $tex = $self->{texture} 900 my $tex = $self->{texture}
858 or return; 901 or return;
859 902
860 glEnable GL_TEXTURE_2D; 903 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 905 glColor 0, 0, 0, 1;
863 906
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 907 $tex->draw_quad_alpha_premultiplied (0, 0);
865 908
866 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
867} 910}
868 911
869############################################################################# 912#############################################################################
870 913
871package CFClient::UI::ViewPort; 914package DC::UI::ViewPort;
872 915
916use List::Util qw(min max);
917
873our @ISA = CFClient::UI::Window::; 918our @ISA = DC::UI::Window::;
874 919
875sub new { 920sub new {
876 my $class = shift; 921 my $class = shift;
877 922
878 $class->SUPER::new ( 923 $class->SUPER::new (
… …
885sub size_request { 930sub size_request {
886 my ($self) = @_; 931 my ($self) = @_;
887 932
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 934
890 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
892 937
893 ($w, $h) 938 ($w, $h)
894} 939}
895 940
896sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
908} 953}
909 954
910sub set_offset { 955sub set_offset {
911 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
912 957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
915 964
965 $self->emit (changed => $x, $y);
916 $self->update; 966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
917} 986}
918 987
919# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 989sub coord2local {
921 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
937 1006
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1009 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1011 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
944 } 1013 }
945} 1014}
946 1015
947sub _render { 1016sub _render {
948 my ($self) = @_; 1017 my ($self) = @_;
949 1018
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1019 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}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
952 1021
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1023
955 $self->SUPER::_render; 1024 $self->SUPER::_render;
956} 1025}
957 1026
958############################################################################# 1027#############################################################################
959 1028
960package CFClient::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
961 1030
962our @ISA = CFClient::UI::HBox::; 1031our @ISA = DC::UI::Table::;
963 1032
964sub new { 1033sub new {
965 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
966 1035
967 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
968 1037
969 my $self; 1038 my $self;
970 1039
971 my $slider = new CFClient::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1043 vertical => 0,
1044 range => [0, 0, 1, 0.01], # HACK fix
1045 on_changed => sub {
1046 $self->{hpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 },
1049 ;
1050
1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
972 vertical => 1, 1054 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1056 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1059 },
977 ; 1060 ;
978 1061
979 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1065 can_events => 1,
981 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
982 %arg, 1070 %arg,
983 ); 1071 );
984 1072
1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1092 ;
1093
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
986 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
987 1097
988 $self 1098 $self
989} 1099}
990
991#TODO# update range on size_allocate depending on child
992 1100
993sub add { 1101sub add {
994 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
995 1103
996 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
997} 1105}
998 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
999sub update_slider { 1111sub update_slider {
1000 my ($self) = @_; 1112 my ($self) = @_;
1001 1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1119
1005sub update { 1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1006 my ($self) = @_; 1142 my ($self, $ev) = @_;
1007 1143
1008 $self->SUPER::update; 1144 $self->grab_focus;
1009 1145
1010 $self->update_slider; 1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1159sub invoke_mouse_wheel {
1160 my ($self, $ev) = @_;
1161
1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1164
1165 1
1166}
1167
1168sub invoke_button_down {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($ev->{button} == 2) {
1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1175
1176 0
1177}
1178
1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1181
1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1011} 1198}
1012 1199
1013sub invoke_size_allocate { 1200sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1015 1202
1016 $self->update_slider; 1203 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1205}
1020 1206
1021############################################################################# 1207#############################################################################
1022 1208
1023package CFClient::UI::Frame; 1209package DC::UI::Frame;
1024 1210
1025our @ISA = CFClient::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1026 1212
1027use CFClient::OpenGL; 1213use DC::OpenGL;
1028 1214
1029sub new { 1215sub new {
1030 my $class = shift; 1216 my $class = shift;
1031 1217
1032 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1042 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1043 1229
1044 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1047
1048 glBegin GL_QUADS;
1049 glVertex 0 , 0;
1050 glVertex 0 , $h;
1051 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1052 glVertex $w, 0;
1053 glEnd;
1054
1055 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1056 } 1235 }
1057 1236
1058 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1059} 1238}
1060 1239
1061############################################################################# 1240#############################################################################
1062 1241
1063package CFClient::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1064 1243
1065our @ISA = CFClient::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1066 1245
1067use CFClient::OpenGL; 1246use DC::OpenGL;
1247
1248sub new {
1249 my ($class, %arg) = @_;
1250
1251 if ((exists $arg{label}) && !ref $arg{label}) {
1252 $arg{label} = new DC::UI::Label
1253 align => 1,
1254 valign => 0.5,
1255 text => $arg{label},
1256 fontsize => ($arg{border} || 0.8) * 0.75;
1257 }
1258
1259 my $self = $class->SUPER::new (
1260 # label => "",
1261 fg => [0.6, 0.3, 0.1],
1262 border => 0.8,
1263 style => 'single',
1264 %arg,
1265 );
1266
1267 $self
1268}
1269
1270sub add {
1271 my ($self, @widgets) = @_;
1272
1273 $self->SUPER::add (@widgets);
1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1275}
1276
1277sub border {
1278 int $_[0]{border} * $::FONTSIZE
1279}
1280
1281sub size_request {
1282 my ($self) = @_;
1283
1284 ($self->{label_w}, undef) = $self->{label}->size_request
1285 if $self->{label};
1286
1287 my ($w, $h) = $self->SUPER::size_request;
1288
1289 (
1290 $w + $self->border * 2,
1291 $h + $self->border * 2,
1292 )
1293}
1294
1295sub invoke_size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 my $border = $self->border;
1299
1300 $w -= List::Util::max 0, $border * 2;
1301 $h -= List::Util::max 0, $border * 2;
1302
1303 if (my $label = $self->{label}) {
1304 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1305 $label->{h} = List::Util::min $h, $border;
1306 $label->invoke_size_allocate ($label->{w}, $label->{h});
1307 }
1308
1309 $self->child->configure ($border, $border, $w, $h);
1310
1311 1
1312}
1313
1314sub _draw {
1315 my ($self) = @_;
1316
1317 my $child = $self->{children}[0];
1318
1319 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h});
1321
1322 $child->draw;
1323
1324 glColor @{$self->{fg}};
1325 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1331 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1332 glEnd;
1333
1334 if ($self->{label}) {
1335 glTranslate $border * 2, 0;
1336 $self->{label}->_draw;
1337 }
1338}
1339
1340#############################################################################
1341
1342package DC::UI::Toplevel;
1343
1344our @ISA = DC::UI::Bin::;
1345
1346use DC::OpenGL;
1068 1347
1069my $bg = 1348my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1072 1351
1073my @border = 1352my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1076 1359
1077sub new { 1360sub new {
1078 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1079 1362
1080 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1366 border => 1,
1084 can_events => 1, 1367 can_events => 1,
1085 min_w => 16, 1368 min_w => 64,
1086 min_h => 16, 1369 min_h => 32,
1087 %arg, 1370 %arg,
1088 ); 1371 );
1089 1372
1090 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1091 align => 0, 1374 align => 0.5,
1092 valign => 1, 1375 valign => 1,
1093 text => $self->{title}, 1376 text => $self->{title},
1094 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1095 if exists $self->{title}; 1378 if exists $self->{title};
1096 1379
1097 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1381 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1382 new DC::UI::ImageButton
1100 path => 'x1_close.png', 1383 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1102 1385
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1104 } 1387 }
1105 1388
1106 $self 1389 $self
1107} 1390}
1108 1391
1109sub add { 1392sub add {
1110 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1111 1394
1112 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1398}
1116 1399
1117sub border { 1400sub border {
1118 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1119} 1411}
1120 1412
1121sub size_request { 1413sub size_request {
1122 my ($self) = @_; 1414 my ($self) = @_;
1123 1415
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1519 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1520
1229 ! ! $self->{motion} 1521 ! ! $self->{motion}
1230} 1522}
1231 1523
1524sub invoke_visibility_change {
1525 my ($self, $visible) = @_;
1526
1527 delete $self->{motion} unless $visible;
1528
1529 0
1530}
1531
1232sub _draw { 1532sub _draw {
1233 my ($self) = @_; 1533 my ($self) = @_;
1234 1534
1235 my $child = $self->{children}[0]; 1535 my $child = $self->{children}[0];
1236 1536
… …
1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242 1542
1243 my $border = $self->border; 1543 my $border = $self->border;
1244 1544
1245 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1246 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250 1564
1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1253 1567
1254 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1273 if $self->{close_button}; 1587 if $self->{close_button};
1274} 1588}
1275 1589
1276############################################################################# 1590#############################################################################
1277 1591
1278package CFClient::UI::Table; 1592package DC::UI::Table;
1279 1593
1280our @ISA = CFClient::UI::Base::; 1594our @ISA = DC::UI::Container::;
1281 1595
1282use List::Util qw(max sum); 1596use List::Util qw(max sum);
1283 1597
1284use CFClient::OpenGL; 1598use DC::OpenGL;
1285 1599
1286sub new { 1600sub new {
1287 my $class = shift; 1601 my $class = shift;
1288 1602
1289 $class->SUPER::new ( 1603 $class->SUPER::new (
1290 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1291 @_, 1606 @_,
1292 ) 1607 )
1293} 1608}
1294 1609
1295sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297}
1298
1299sub add { 1610sub add {
1300 my ($self, $x, $y, $child) = @_; 1611 my ($self, @widgets) = @_;
1301 1612
1302 $child->set_parent ($self); 1613 for my $child (@widgets) {
1303 $self->{children}[$y][$x] = $child; 1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1304 1617
1305 $self->realloc; 1618 $self->SUPER::add (@widgets);
1306} 1619}
1307 1620
1308sub remove { 1621sub add_at {
1622 my $self = shift;
1623
1624 my @widgets;
1625
1626 while (@_) {
1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1628
1629 $child->{c_row} = $row;
1630 $child->{c_col} = $col;
1631
1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1309 my ($self, $child) = @_; 1639 my ($self) = @_;
1310 1640
1311 # TODO: not yet implemented 1641 my (@w, @h);
1312}
1313
1314# TODO: move to container class maybe? send children a signal on removal?
1315sub clear {
1316 my ($self) = @_;
1317 1642
1318 my @children = $self->children; 1643 my @children = $self->children;
1319 delete $self->{children}; 1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1653 }
1320 1654 }
1321 for (@children) {
1322 delete $_->{parent};
1323 $_->hide;
1324 }
1325 1655
1326 $self->realloc; 1656 # second pass, rows
1327} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1328
1329sub get_wh {
1330 my ($self) = @_;
1331
1332 my (@w, @h);
1333
1334 for my $y (0 .. $#{$self->{children}}) {
1335 my $row = $self->{children}[$y]
1336 or next;
1337
1338 for my $x (0 .. $#$row) {
1339 my $widget = $row->[$x]
1340 or next;
1341 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1342 1659
1343 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1344 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345 } 1664 }
1346 } 1665 }
1347 1666
1348 (\@w, \@h) 1667 (\@w, \@h)
1349} 1668}
… …
1365 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1366 1685
1367 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1369 1688
1370 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1371 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1374 1693
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1695
1379 CFClient::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1697
1698 my @row_expand = @{$self->{row_expand}};
1699 @row_expand = (1) x @$ws unless @row_expand;
1700 my $row_expand = (sum @row_expand) || 1;
1701
1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1703
1380 CFClient::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1381 1705
1382 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383 1708
1384 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1385 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1386 or next;
1387 1711
1388 my $x = 0; 1712 $widget->configure (
1389 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390 1715 );
1391 for my $c (0 .. $#$row) { 1716 }
1392 my $col_w = $ws->[$c];
1393 1717
1394 if (my $widget = $row->[$c]) { 1718 1
1395 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1396 }
1397 1720
1398 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1399 } 1748 }
1749 }
1400 1750
1401 $y += $row_h; 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1753
1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1772 my ($self, $W, $H) = @_;
1773
1774 for my $child ($self->visible_children) {
1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1777
1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1780
1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1402 } 1782 }
1403 1783
1404 1 1784 1
1405} 1785}
1406 1786
1407sub find_widget {
1408 my ($self, $x, $y) = @_;
1409
1410 $x -= $self->{x};
1411 $y -= $self->{y};
1412
1413 my $res;
1414
1415 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1416 $res = $_->find_widget ($x, $y)
1417 and return $res;
1418 }
1419
1420 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1421}
1422
1423sub _draw {
1424 my ($self) = @_;
1425
1426 for (grep $_, @{$self->{children}}) {
1427 $_->draw for grep $_, @$_;
1428 }
1429}
1430
1431############################################################################# 1787#############################################################################
1432 1788
1433package CFClient::UI::Box; 1789package DC::UI::Box;
1434 1790
1435our @ISA = CFClient::UI::Container::; 1791our @ISA = DC::UI::Container::;
1436 1792
1437sub size_request { 1793sub size_request {
1438 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1439 1797
1440 $self->{vertical} 1798 $self->{vertical}
1441 ? ( 1799 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1444 ) 1802 )
1445 : ( 1803 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1448 ) 1806 )
1449} 1807}
1450 1808
1451sub invoke_size_allocate { 1809sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1473 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1832 for 0 .. $#children;
1475 } 1833 }
1476 } 1834 }
1477 1835
1478 CFClient::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1479 1837
1480 my $pos = 0; 1838 my $pos = 0;
1481 for (0 .. $#children) { 1839 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1846 1
1489} 1847}
1490 1848
1491############################################################################# 1849#############################################################################
1492 1850
1493package CFClient::UI::HBox; 1851package DC::UI::HBox;
1494 1852
1495our @ISA = CFClient::UI::Box::; 1853our @ISA = DC::UI::Box::;
1496 1854
1497sub new { 1855sub new {
1498 my $class = shift; 1856 my $class = shift;
1499 1857
1500 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1503 ) 1861 )
1504} 1862}
1505 1863
1506############################################################################# 1864#############################################################################
1507 1865
1508package CFClient::UI::VBox; 1866package DC::UI::VBox;
1509 1867
1510our @ISA = CFClient::UI::Box::; 1868our @ISA = DC::UI::Box::;
1511 1869
1512sub new { 1870sub new {
1513 my $class = shift; 1871 my $class = shift;
1514 1872
1515 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1518 ) 1876 )
1519} 1877}
1520 1878
1521############################################################################# 1879#############################################################################
1522 1880
1523package CFClient::UI::Label; 1881package DC::UI::Label;
1524 1882
1525our @ISA = CFClient::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1526 1884
1527use CFClient::OpenGL; 1885use DC::OpenGL;
1528 1886
1529sub new { 1887sub new {
1530 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1531 1889
1532 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1893 #active_bg => none
1536 #font => default_font 1894 #font => default_font
1537 #text => initial text 1895 #text => initial text
1538 #markup => initial narkup 1896 #markup => initial narkup
1539 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1898 #style => 0, # render flags
1540 ellipsise => 3, # end 1899 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1900 layout => (new DC::Layout),
1542 fontsize => 1, 1901 fontsize => 1,
1543 align => -1, 1902 align => 0.5,
1544 valign => -1, 1903 valign => 0.5,
1545 padding_x => 2, 1904 padding_x => 4,
1546 padding_y => 2, 1905 padding_y => 2,
1547 can_events => 0, 1906 can_events => 0,
1548 %arg 1907 %arg
1549 ); 1908 );
1550 1909
1551 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1911 my $layout = new DC::Layout;
1553 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1913 $self->{template} = $layout;
1555 } 1914 }
1556 1915
1557 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1561 } 1920 }
1562 1921
1563 $self 1922 $self
1564} 1923}
1565 1924
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1925sub update {
1577 my ($self) = @_; 1926 my ($self) = @_;
1578 1927
1579 delete $self->{texture}; 1928 delete $self->{texture};
1580 $self->SUPER::update; 1929 $self->SUPER::update;
… …
1583sub realloc { 1932sub realloc {
1584 my ($self) = @_; 1933 my ($self) = @_;
1585 1934
1586 delete $self->{ox}; 1935 delete $self->{ox};
1587 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1937}
1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1588} 1943}
1589 1944
1590sub set_text { 1945sub set_text {
1591 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1592 1947
… …
1617 1972
1618sub size_request { 1973sub size_request {
1619 my ($self) = @_; 1974 my ($self) = @_;
1620 1975
1621 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1622 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1623 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1624 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1984
1628 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1629 1986
1630 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1631 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1634 1991
1635 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1636 1993
1637 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1693 2050
1694 [$self->{layout}->size] 2051 [$self->{layout}->size]
1695 }; 2052 };
1696 2053
1697 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1700 : ($self->{w} - $size->[0]) * 0.5);
1701 2057
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 2059 };
1706 2060
1707 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1708 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1709 2063# DC::OpenGL::glNewList $self->{list};
1710 $self->{layout}->render ($self->{ox}, $self->{oy}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
1711} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1712 2080
1713############################################################################# 2081#############################################################################
1714 2082
1715package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1716 2084
1717our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1718 2086
1719use CFClient::OpenGL; 2087use DC::OpenGL;
1720 2088
1721sub new { 2089sub new {
1722 my $class = shift; 2090 my $class = shift;
1723 2091
1724 $class->SUPER::new ( 2092 $class->SUPER::new (
1725 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1726 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1727 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1728 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1729 can_hover => 1, 2099 can_hover => 1,
1730 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1731 valign => 0, 2102 valign => 0.5,
1732 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1733 #text => ... 2107 #text => ...
1734 #hidden => "*", 2108 #hidden => "*",
1735 @_ 2109 @_
1736 ) 2110 )
1737} 2111}
… …
1782 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1784 2158
1785 my $text = $self->get_text; 2159 my $text = $self->get_text;
1786 2160
1787 if ($uni == 8) { 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
2163 if ($sym == DC::SDLK_BACKSPACE) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
1790 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
2177 } elsif ($sym == DC::SDLK_END) {
2178 # uh, again
2179 $self->{cursor} =
2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
2183 } elsif ($uni == 21) { # ctrl-u
2184 $text = "";
1796 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2187 $self->emit ('escape');
1801 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2192 } else {
1804 return 0; 2193 return 0;
1805 } 2194 }
1806 2195
1807 $self->_set_text ($text); 2196 $self->_set_text ($text);
1808 2197
1809 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1810 2200
1811 1 2201 1
1812} 2202}
1813 2203
1814sub invoke_focus_in { 2204sub invoke_focus_in {
… …
1826 2216
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2217 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2218
1829 # byte-index to char-index 2219 # byte-index to char-index
1830 my $text = $self->{text}; 2220 my $text = $self->{text};
1831 utf8::encode $text; 2221 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2222 $self->{cursor} = length $text;
1833 2223
1834 $self->_set_text ($self->{text}); 2224 $self->_set_text ($self->{text});
1835 $self->update; 2225 $self->update;
1836 2226
1837 1 2227 1
… …
1856 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1857 } 2247 }
1858 2248
1859 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1861 glBegin GL_QUADS;
1862 glVertex 0 , 0;
1863 glVertex 0 , $self->{h};
1864 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1865 glVertex $self->{w}, 0;
1866 glEnd;
1867 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1868 2253
1869 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1870 2255
1871 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1873 2258
1874 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1875 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1876 utf8::encode $text; 2261 utf8::encode $text;
1877 2262
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1879 } 2264 }
1880 2265
1881 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1882 glBegin GL_LINES; 2267 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2270 glEnd;
1886 }
1887}
1888 2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1889package CFClient::UI::Entry; 2290package DC::UI::Entry;
1890 2291
1891our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1892 2293
1893use CFClient::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
1894 2305
1895sub invoke_key_down { 2306sub invoke_key_down {
1896 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
1897 2308
1898 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
1899 2310
1900 if ($sym == 13) { 2311 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2312 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2313 my $txt = $self->get_text;
1903 2314
1904 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
1907 $self->update; 2318 $self->update;
1908 2319
1909 } elsif ($sym == CFClient::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
1912 } 2323 }
1913 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2328 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2330 }
1920 2331
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2335
1925 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1927 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
1928 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
1929 } 2343 }
1930 2344
1931 } else { 2345 } else {
1932 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
1933 } 2347 }
… …
1935 1 2349 1
1936} 2350}
1937 2351
1938############################################################################# 2352#############################################################################
1939 2353
1940package CFClient::UI::Button; 2354package DC::UI::TextEdit;
1941 2355
1942our @ISA = CFClient::UI::Label::; 2356our @ISA = DC::UI::EntryBase::;
1943 2357
1944use CFClient::OpenGL; 2358use DC::OpenGL;
1945
1946my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png);
1949 2359
1950sub new { 2360sub new {
1951 my $class = shift; 2361 my $class = shift;
1952 2362
1953 $class->SUPER::new ( 2363 $class->SUPER::new (
1954 padding_x => 4,
1955 padding_y => 4, 2364 padding_y => 4,
1956 fg => [1, 1, 1], 2365
1957 active_fg => [0, 0, 1], 2366 @_
2367 )
2368}
2369
2370sub move_cursor_ver {
2371 my ($self, $dy) = @_;
2372
2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2374
2375 $line += $dy;
2376
2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2378 $self->{cursor} = $index;
2379 delete $self->{cur_h};
2380 $self->update;
2381 return;
2382 }
2383}
2384
2385sub invoke_key_down {
2386 my ($self, $ev) = @_;
2387
2388 my $sym = $ev->{sym};
2389
2390 if ($sym == DC::SDLK_UP) {
2391 $self->move_cursor_ver (-1);
2392 } elsif ($sym == DC::SDLK_DOWN) {
2393 $self->move_cursor_ver (+1);
2394 } else {
2395 return $self->SUPER::invoke_key_down ($ev)
2396 }
2397
2398 1
2399}
2400
2401#############################################################################
2402
2403package DC::UI::ButtonBin;
2404
2405our @ISA = DC::UI::Bin::;
2406
2407use DC::OpenGL;
2408
2409my @tex =
2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png);
2412
2413sub new {
2414 my $class = shift;
2415
2416 $class->SUPER::new (
1958 can_hover => 1, 2417 can_hover => 1,
1959 align => 0, 2418 align => 0.5,
1960 valign => 0, 2419 valign => 0.5,
1961 can_events => 1, 2420 can_events => 1,
1962 @_ 2421 @_
1963 ) 2422 )
1964} 2423}
1965 2424
… …
1974} 2433}
1975 2434
1976sub _draw { 2435sub _draw {
1977 my ($self) = @_; 2436 my ($self) = @_;
1978 2437
1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1980
1981 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
1984 2441
2442 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2444
1987 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
1988 2446
1989 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
1990} 2448}
1991 2449
1992############################################################################# 2450#############################################################################
1993 2451
1994package CFClient::UI::ImageButton; 2452package DC::UI::Button;
1995 2453
1996our @ISA = CFClient::UI::Image::; 2454our @ISA = DC::UI::Label::;
1997 2455
1998use CFClient::OpenGL; 2456use DC::OpenGL;
1999 2457
2000my %textures; 2458my @tex =
2459 map { new_from_resource DC::Texture $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2001 2461
2002sub new { 2462sub new {
2003 my $class = shift; 2463 my $class = shift;
2004 2464
2005 my $self = $class->SUPER::new ( 2465 $class->SUPER::new (
2006 padding_x => 4, 2466 padding_x => 8,
2007 padding_y => 4, 2467 padding_y => 4,
2008 fg => [1, 1, 1], 2468 fg => [1.0, 1.0, 1.0],
2009 active_fg => [0, 0, 1], 2469 active_fg => [0.8, 0.8, 0.8],
2010 can_hover => 1, 2470 can_hover => 1,
2011 align => 0, 2471 align => 0.5,
2012 valign => 0, 2472 valign => 0.5,
2013 can_events => 1, 2473 can_events => 1,
2014 @_ 2474 @_
2015 ); 2475 )
2016} 2476}
2017 2477
2018sub invoke_button_up { 2478sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2020 2480
… …
2023 && $y >= 0 && $y < $self->{h}; 2483 && $y >= 0 && $y < $self->{h};
2024 2484
2025 1 2485 1
2026} 2486}
2027 2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2028############################################################################# 2505#############################################################################
2029 2506
2030package CFClient::UI::CheckBox; 2507package DC::UI::CheckBox;
2031 2508
2032our @ISA = CFClient::UI::DrawBG::; 2509our @ISA = DC::UI::DrawBG::;
2033 2510
2034my @tex = 2511my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2512 map { new_from_resource DC::Texture $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037 2514
2038use CFClient::OpenGL; 2515use DC::OpenGL;
2039 2516
2040sub new { 2517sub new {
2041 my $class = shift; 2518 my $class = shift;
2042 2519
2043 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
2083sub _draw { 2560sub _draw {
2084 my ($self) = @_; 2561 my ($self) = @_;
2085 2562
2086 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2087 2564
2088 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2089 2566
2090 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2091 2568
2092 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2093 2570
… …
2100 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2101} 2578}
2102 2579
2103############################################################################# 2580#############################################################################
2104 2581
2105package CFClient::UI::Image; 2582package DC::UI::Image;
2106 2583
2107our @ISA = CFClient::UI::Base::; 2584our @ISA = DC::UI::Base::;
2108 2585
2109use CFClient::OpenGL; 2586use DC::OpenGL;
2110 2587
2111our %texture_cache; 2588our %texture_cache;
2112 2589
2113sub new { 2590sub new {
2114 my $class = shift; 2591 my $class = shift;
2115 2592
2116 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2117 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2118 @_, 2596 @_,
2119 ); 2597 );
2120 2598
2599 $self->{path} || $self->{tex}
2600 or Carp::croak "'path' or 'tex' attributes required";
2601
2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2604
2605 DC::weaken $texture_cache{$self->{path}};
2606
2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2608
2609 $self
2610}
2611
2612sub STORABLE_freeze {
2613 my ($self, $cloning) = @_;
2614
2121 $self->{path} 2615 $self->{path}
2122 or Carp::croak "required attribute 'path' not set"; 2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2123 2617
2124 $self->{tex} = $texture_cache{$self->{path}} ||= 2618 $self->{path}
2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2619}
2126 2620
2127 Scalar::Util::weaken $texture_cache{$self->{path}}; 2621sub STORABLE_attach {
2622 my ($self, $cloning, $path) = @_;
2128 2623
2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2624 $self->new (path => $path)
2130
2131 $self
2132} 2625}
2133 2626
2134sub size_request { 2627sub size_request {
2135 my ($self) = @_; 2628 my ($self) = @_;
2136 2629
2137 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2138} 2631}
2139 2632
2140sub _draw { 2633sub _draw {
2141 my ($self) = @_; 2634 my ($self) = @_;
2142 2635
… …
2159 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2160} 2653}
2161 2654
2162############################################################################# 2655#############################################################################
2163 2656
2657package DC::UI::ImageButton;
2658
2659our @ISA = DC::UI::Image::;
2660
2661use DC::OpenGL;
2662
2663my %textures;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 padding_x => 4,
2670 padding_y => 4,
2671 fg => [1, 1, 1],
2672 active_fg => [0, 0, 1],
2673 can_hover => 1,
2674 align => 0.5,
2675 valign => 0.5,
2676 can_events => 1,
2677 @_
2678 );
2679}
2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2687sub invoke_button_up {
2688 my ($self, $ev, $x, $y) = @_;
2689
2690 $self->emit ("activate")
2691 if $x >= 0 && $x < $self->{w}
2692 && $y >= 0 && $y < $self->{h};
2693
2694 1
2695}
2696
2697#############################################################################
2698
2164package CFClient::UI::VGauge; 2699package DC::UI::VGauge;
2165 2700
2166our @ISA = CFClient::UI::Base::; 2701our @ISA = DC::UI::Base::;
2167 2702
2168use List::Util qw(min max); 2703use List::Util qw(min max);
2169 2704
2170use CFClient::OpenGL; 2705use DC::OpenGL;
2171 2706
2172my %tex = ( 2707my %tex = (
2173 food => [ 2708 food => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2175 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176 ], 2711 ],
2177 grace => [ 2712 grace => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2179 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180 ], 2715 ],
2181 hp => [ 2716 hp => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2183 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184 ], 2719 ],
2185 mana => [ 2720 mana => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2187 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188 ], 2723 ],
2189); 2724);
2190 2725
2191# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2294 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2295} 2830}
2296 2831
2297############################################################################# 2832#############################################################################
2298 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2299package CFClient::UI::Gauge; 2972package DC::UI::Gauge;
2300 2973
2301our @ISA = CFClient::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2302 2975
2303sub new { 2976sub new {
2304 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2305 2978
2306 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2308 can_hover => 1, 2981 can_hover => 1,
2309 can_events => 1, 2982 can_events => 1,
2310 %arg, 2983 %arg,
2311 ); 2984 );
2312 2985
2313 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2314 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2315 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2316 2989
2317 $self 2990 $self
2318} 2991}
2319 2992
2320sub set_fontsize { 2993sub set_fontsize {
… …
2341 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2342} 3015}
2343 3016
2344############################################################################# 3017#############################################################################
2345 3018
2346package CFClient::UI::Slider; 3019package DC::UI::Slider;
2347 3020
2348use strict; 3021use strict;
2349 3022
2350use CFClient::OpenGL; 3023use DC::OpenGL;
2351 3024
2352our @ISA = CFClient::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2353 3026
2354my @tex = 3027my @tex =
2355 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2356 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2357 3030
2358sub new { 3031sub new {
2359 my $class = shift; 3032 my $class = shift;
2360 3033
… …
2397sub set_value { 3070sub set_value {
2398 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2399 3072
2400 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2401 3074
2402 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2403 3076
2404 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2405
2406 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2407 $value = $hi - $page if $value > $hi - $page;
2408 3079
2409 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2410 if $unit; 3081 if $unit;
2411 3082
2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2428 3099
2429 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2430 3101
2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2432 3103
2433 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2434} 3107}
2435 3108
2436sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2437 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2438 3111
… …
2449 } 3122 }
2450 3123
2451 1 3124 1
2452} 3125}
2453 3126
3127sub invoke_mouse_wheel {
3128 my ($self, $ev) = @_;
3129
3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3131
3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3133
3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3135
3136 1
3137}
3138
2454sub update { 3139sub update {
2455 my ($self) = @_; 3140 my ($self) = @_;
2456 3141
2457 delete $self->{knob_w}; 3142 delete $self->{knob_w};
2458 $self->SUPER::update; 3143 $self->SUPER::update;
… …
2462 my ($self) = @_; 3147 my ($self) = @_;
2463 3148
2464 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2465 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2466 3151
2467 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2468 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2469 3154
2470 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2471 3156
2472 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2473 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2474 3159
2475 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
… …
2505 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2506} 3191}
2507 3192
2508############################################################################# 3193#############################################################################
2509 3194
2510package CFClient::UI::ValSlider; 3195package DC::UI::ValSlider;
2511 3196
2512our @ISA = CFClient::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2513 3198
2514sub new { 3199sub new {
2515 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2516 3201
2517 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2518 3203
2519 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2520 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2521 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2522 to_value => sub { shift }, 3207 to_value => sub { shift },
2523 from_value => sub { shift }, 3208 from_value => sub { shift },
2524 %arg, 3209 %arg,
2525 ); 3210 );
2526 3211
… …
2546sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2547sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2548 3233
2549############################################################################# 3234#############################################################################
2550 3235
2551package CFClient::UI::TextScroller; 3236package DC::UI::TextScroller;
2552 3237
2553our @ISA = CFClient::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2554 3239
2555use CFClient::OpenGL; 3240use DC::OpenGL;
2556 3241
2557sub new { 3242sub new {
2558 my $class = shift; 3243 my $class = shift;
2559 3244
2560 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2561 fontsize => 1, 3246 fontsize => 1,
2562 can_events => 0, 3247 can_events => 1,
2563 indent => 0, 3248 indent => 0,
2564 #font => default_font 3249 #font => default_font
2565 @_, 3250 @_,
2566 3251
2567 layout => (new CFClient::Layout), 3252 layout => (new DC::Layout),
2568 par => [], 3253 par => [],
3254 max_par => 0,
2569 height => 0, 3255 height => 0,
2570 children => [ 3256 children => [
2571 (new CFClient::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2572 (new CFClient::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2573 ], 3259 ],
2574 ); 3260 );
2575 3261
2576 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2577 3263
… …
2586} 3272}
2587 3273
2588sub size_request { 3274sub size_request {
2589 my ($self) = @_; 3275 my ($self) = @_;
2590 3276
2591 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
2592 3278
2593 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request 3280 $self->SUPER::size_request
2595} 3281}
2596 3282
… …
2607 3293
2608 $self->reflow; 3294 $self->reflow;
2609 3295
2610 local $self->{children} = [$empty, $slider]; 3296 local $self->{children} = [$empty, $slider];
2611 $self->SUPER::invoke_size_allocate ($w, $h) 3297 $self->SUPER::invoke_size_allocate ($w, $h)
3298}
3299
3300sub invoke_mouse_wheel {
3301 my ($self, $ev) = @_;
3302
3303 return 0 unless $ev->{dy}; # only vertical movements
3304
3305 $self->{children}[1]->emit (mouse_wheel => $ev);
3306
3307 1
2612} 3308}
2613 3309
2614sub get_layout { 3310sub get_layout {
2615 my ($self, $para) = @_; 3311 my ($self, $para) = @_;
2616 3312
… …
2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2624 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
2625 3321
2626 $layout->set_shapes ( 3322 $layout->set_shapes (
2627 map 3323 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}} 3325 @{$para->{widget}}
2630 ); 3326 );
2631 3327
2632 $layout 3328 $layout
2633} 3329}
… …
2642sub set_offset { 3338sub set_offset {
2643 my ($self, $offset) = @_; 3339 my ($self, $offset) = @_;
2644 3340
2645 # todo: base offset on lines or so, not on pixels 3341 # todo: base offset on lines or so, not on pixels
2646 $self->{children}[1]->set_value ($offset); 3342 $self->{children}[1]->set_value ($offset);
3343}
3344
3345sub current_paragraph {
3346 my ($self) = @_;
3347
3348 $self->{top_paragraph} - 1
3349}
3350
3351sub scroll_to {
3352 my ($self, $para) = @_;
3353
3354 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3355
3356 $self->{scroll_to} = $para;
3357 $self->update;
2647} 3358}
2648 3359
2649sub clear { 3360sub clear {
2650 my ($self) = @_; 3361 my ($self) = @_;
2651 3362
… …
2656 $self->{height} = 0; 3367 $self->{height} = 0;
2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3368 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658} 3369}
2659 3370
2660sub add_paragraph { 3371sub add_paragraph {
2661 my ($self, $color, $para, $indent) = @_; 3372 my $self = shift;
2662 3373
2663 my ($text, @w) = ref $para ? @$para : $para; 3374 for my $para (@_) {
2664
2665 $para = { 3375 $para = {
3376 fg => [1, 1, 1, 1],
3377 indent => 0,
3378 markup => "",
3379 widget => [],
3380 ref $para ? %$para : (markup => $para),
2666 w => 1e10, 3381 w => 1e10,
2667 wrapped => 1, 3382 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2672 }; 3383 };
2673 3384
2674 $self->add (@w) if @w; 3385 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675 push @{$self->{par}}, $para; 3386 push @{$self->{par}}, $para;
3387 }
3388
3389 if (my $max = $self->{max_par}) {
3390 shift @{$self->{par}} while @{$self->{par}} > $max;
3391 }
2676 3392
2677 $self->{need_reflow}++; 3393 $self->{need_reflow}++;
2678 $self->update; 3394 $self->update;
2679} 3395}
2680 3396
2681sub scroll_to_bottom { 3397sub scroll_to_bottom {
2682 my ($self) = @_; 3398 my ($self) = @_;
2683 3399
2684 $self->{scroll_to_bottom} = 1; 3400 $self->{scroll_to} = $#{$self->{par}};
2685 $self->update; 3401 $self->update;
2686} 3402}
2687 3403
3404sub force_uptodate {
3405 my ($self) = @_;
3406
3407 if (delete $self->{need_reflow}) {
3408 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3409
3410 my $height = 0;
3411
3412 for my $para (@{$self->{par}}) {
3413 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3414 my $layout = $self->get_layout ($para);
3415 my ($w, $h) = $layout->size;
3416
3417 $para->{w} = $w + $para->{indent};
3418 $para->{h} = $h;
3419 $para->{wrapped} = $layout->has_wrapped;
3420 }
3421
3422 $para->{y} = $height;
3423 $height += $para->{h};
3424 }
3425
3426 $self->{height} = $height;
3427 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3428
3429 delete $self->{texture};
3430 }
3431
3432 if (my $paridx = delete $self->{scroll_to}) {
3433 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3434 }
3435}
3436
2688sub update { 3437sub update {
2689 my ($self) = @_; 3438 my ($self) = @_;
2690 3439
2691 $self->SUPER::update; 3440 $self->SUPER::update;
2692 3441
2693 return unless $self->{h} > 0; 3442 return unless $self->{h} > 0;
2694 3443
2695 delete $self->{texture}; 3444 delete $self->{texture};
2696 3445
2697 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3447 $self->force_uptodate;
3448
2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699 3450
2700 if (delete $self->{need_reflow}) {
2701 my $height = 0;
2702
2703 for my $para (@{$self->{par}}) {
2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2705 my $layout = $self->get_layout ($para);
2706 my ($w, $h) = $layout->size;
2707
2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2711 }
2712
2713 $height += $para->{h};
2714 }
2715
2716 $self->{height} = $height;
2717
2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2719
2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2725 }
2726
2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2728 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
2729 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
2730 3454
3455 package DC::UI::Base;
3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3457 (0, 0, $self->{w}, $self->{h});
3458
3459 my $top = int $self->{children}[1]{range}[0];
3460
3461 my $paridx = 0;
3462 my $top_paragraph;
2731 my $top = int $self->{children}[1]{range}[0]; 3463 my $top = int $self->{children}[1]{range}[0];
2732 3464
2733 my $y0 = $top; 3465 my $y0 = $top;
2734 my $y1 = $top + $H; 3466 my $y1 = $top + $H;
2735 3467
2736 my $y = 0;
2737
2738 for my $para (@{$self->{par}}) { 3468 for my $para (@{$self->{par}}) {
2739 my $h = $para->{h}; 3469 my $h = $para->{h};
3470 my $y = $para->{y};
2740 3471
2741 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
2742
2743 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
2744 3474
2745 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
2746 3477
2747 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
2749 3480
2750 for (@w) { 3481 for (@w) {
… …
2756 $_->draw; 3487 $_->draw;
2757 } 3488 }
2758 } 3489 }
2759 } 3490 }
2760 3491
2761 $y += $h; 3492 $paridx++;
3493 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3494 }
3495
3496 $self->{top_paragraph} = $top_paragraph;
2763 }; 3497 };
2764 }); 3498 });
2765} 3499}
2766 3500
2767sub reconfigure { 3501sub reconfigure {
… …
2785 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
2786} 3520}
2787 3521
2788############################################################################# 3522#############################################################################
2789 3523
2790package CFClient::UI::Animator; 3524package DC::UI::Animator;
2791 3525
2792use CFClient::OpenGL; 3526use DC::OpenGL;
2793 3527
2794our @ISA = CFClient::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
2795 3529
2796sub moveto { 3530sub moveto {
2797 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2798 3532
2799 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2827 glPopMatrix; 3561 glPopMatrix;
2828} 3562}
2829 3563
2830############################################################################# 3564#############################################################################
2831 3565
2832package CFClient::UI::Flopper; 3566package DC::UI::Flopper;
2833 3567
2834our @ISA = CFClient::UI::Button::; 3568our @ISA = DC::UI::Button::;
2835 3569
2836sub new { 3570sub new {
2837 my $class = shift; 3571 my $class = shift;
2838 3572
2839 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
2851 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
2852} 3586}
2853 3587
2854############################################################################# 3588#############################################################################
2855 3589
2856package CFClient::UI::Tooltip; 3590package DC::UI::Tooltip;
2857 3591
2858our @ISA = CFClient::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
2859 3593
2860use CFClient::OpenGL; 3594use DC::OpenGL;
2861 3595
2862sub new { 3596sub new {
2863 my $class = shift; 3597 my $class = shift;
2864 3598
2865 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
2869} 3603}
2870 3604
2871sub set_tooltip_from { 3605sub set_tooltip_from {
2872 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
2873 3607
2874 my $tooltip = $widget->{tooltip}; 3608 my $tip = $widget->{tooltip};
3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
2875 3613
2876 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
2877 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
2878 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2879 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
2880 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
2881 } 3619 }
2882 3620
2883 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
2885 3623
2886 $self->add (new CFClient::UI::Label 3624 $self->add (new DC::UI::Label
2887 markup => $tooltip, 3625 markup => $tip,
2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
2889 fontsize => 0.8, 3628 fontsize => 0.8,
2890 fg => [0, 0, 0, 1], 3629 style => 1, # FLAG_INVERSE
2891 ellipsise => 0, 3630 ellipsise => 0,
2892 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
2893 ); 3632 );
2894} 3633}
2895 3634
… …
2914 3653
2915 $self->{root}->on_post_alloc ("move_$self" => sub { 3654 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner} 3655 my $widget = $self->{owner}
2917 or return; 3656 or return;
2918 3657
3658 if ($widget->{visible}) {
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920 3660
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w}; 3662 if $x + $self->{w} > $self->{root}{w};
2923 3663
2924 $self->move_abs ($x, $y); 3664 $self->move_abs ($x, $y);
3665 } else {
3666 $self->hide;
3667 }
2925 }); 3668 });
2926} 3669}
2927 3670
2928sub _draw { 3671sub _draw {
2929 my ($self) = @_; 3672 my ($self) = @_;
2930 3673
2931 glTranslate 0.375, 0.375;
2932
2933 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
2934 3675
2935 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
2936 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
2937 glVertex 0 , 0;
2938 glVertex 0 , $h;
2939 glVertex $w, $h;
2940 glVertex $w, 0;
2941 glEnd;
2942 3678
2943 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
2944 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
2945 glVertex 0 , 0;
2946 glVertex 0 , $h;
2947 glVertex $w, $h;
2948 glVertex $w, 0;
2949 glEnd;
2950 3681
2951 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
2952 3683
2953 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
2954} 3685}
2955 3686
2956############################################################################# 3687#############################################################################
2957 3688
2958package CFClient::UI::Face; 3689package DC::UI::Face;
2959 3690
2960our @ISA = CFClient::UI::Base::; 3691our @ISA = DC::UI::DrawBG::;
2961 3692
2962use CFClient::OpenGL; 3693use DC::OpenGL;
2963 3694
2964sub new { 3695sub new {
2965 my $class = shift; 3696 my $class = shift;
2966 3697
2967 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
2968 aspect => 1, 3701 aspect => 1,
2969 can_events => 0, 3702 can_events => 0,
2970 @_, 3703 @_,
2971 ); 3704 );
2972 3705
2973 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
2974 Scalar::Util::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
2975 3708
2976 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2977 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2978 hard => 1, 3711 return unless $::CONN;
2979 interval => $self->{animspeed}, 3712
2980 cb => sub { 3713 my $w = $widget
3714 or return;
3715
2981 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
2982 $widget->update; 3720 $w->update;
2983 }, 3721 $w->update_timer;
2984 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
2985 } 3726 }
2986 3727
2987 $self 3728 $self
2988} 3729}
2989 3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3756 }
3757 }
3758 }
3759 }
3760}
3761
2990sub size_request { 3762sub size_request {
2991 (32, 8) 3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
2992} 3780}
2993 3781
2994sub update { 3782sub update {
2995 my ($self) = @_; 3783 my ($self) = @_;
2996 3784
2997 return unless $self->{visible}; 3785 return unless $self->{visible};
2998 3786
2999 $self->SUPER::update; 3787 $self->SUPER::update;
3000} 3788}
3001 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
3002sub _draw { 3798sub _draw {
3003 my ($self) = @_; 3799 my ($self) = @_;
3004 3800
3005 return unless $::CONN; 3801 $self->SUPER::_draw;
3006 3802
3007 my $face; 3803 if (my $tex = $self->{tex}) {
3008
3009 if ($self->{frame}) {
3010 my $anim = $::CONN->{anim}[$self->{anim}];
3011
3012 $face = $anim->[ $self->{frame} % @$anim ]
3013 if $anim && @$anim;
3014 }
3015
3016 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3017
3018 if ($tex) {
3019 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3021 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3022 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3023 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
… …
3025} 3810}
3026 3811
3027sub destroy { 3812sub destroy {
3028 my ($self) = @_; 3813 my ($self) = @_;
3029 3814
3030 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
3031 if $self->{timer}; 3816 if $self->{timer};
3032 3817
3033 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3034} 3819}
3035 3820
3036############################################################################# 3821#############################################################################
3037 3822
3038package CFClient::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3039 3824
3040our @ISA = CFClient::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3041 3826
3042# TODO: should actualyl wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3043 3828
3044############################################################################# 3829#############################################################################
3045 3830
3046package CFClient::UI::Menu; 3831package DC::UI::Menu;
3047 3832
3048our @ISA = CFClient::UI::FancyFrame::; 3833our @ISA = DC::UI::Toplevel::;
3049 3834
3050use CFClient::OpenGL; 3835use DC::OpenGL;
3051 3836
3052sub new { 3837sub new {
3053 my $class = shift; 3838 my $class = shift;
3054 3839
3055 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3056 items => [], 3841 items => [],
3057 z => 100, 3842 z => 100,
3058 @_, 3843 @_,
3059 ); 3844 );
3060 3845
3061 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3062 3847
3063 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3064 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3065 3850
3066 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3067 if (!ref $widget) { 3852 if (!ref $widget) {
3068 if ($widget =~ /\t/) { 3853 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2; 3854 my ($left, $right) = split /\t/, $widget, 2;
3070 3855
3071 $widget = new CFClient::UI::HBox 3856 $widget = new DC::UI::HBox
3072 can_hover => 1, 3857 can_hover => 1,
3073 can_events => 1, 3858 can_events => 1,
3074 tooltip => $tooltip, 3859 tooltip => $tooltip,
3075 children => [ 3860 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1), 3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1), 3862 (new DC::UI::Label markup => $right, align => 1),
3078 ], 3863 ],
3079 ; 3864 ;
3080 3865
3081 } else { 3866 } else {
3082 $widget = new CFClient::UI::Label 3867 $widget = new DC::UI::Label
3083 can_hover => 1, 3868 can_hover => 1,
3084 can_events => 1, 3869 can_events => 1,
3870 align => 0,
3085 markup => $widget, 3871 markup => $widget,
3086 tooltip => $tooltip; 3872 tooltip => $tooltip;
3087 } 3873 }
3088 } 3874 }
3089 3875
… …
3135 1 3921 1
3136} 3922}
3137 3923
3138############################################################################# 3924#############################################################################
3139 3925
3140package CFClient::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3141 3927
3142our @ISA = CFClient::UI::Container::; 3928our @ISA = DC::UI::Container::;
3143 3929
3144sub new { 3930sub new {
3145 my $class = shift; 3931 my $class = shift;
3146 3932
3147 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
3208 $self->{current}->draw; 3994 $self->{current}->draw;
3209} 3995}
3210 3996
3211############################################################################# 3997#############################################################################
3212 3998
3213package CFClient::UI::Notebook; 3999package DC::UI::Notebook;
3214 4000
4001use DC::OpenGL;
4002
3215our @ISA = CFClient::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3216 4004
3217sub new { 4005sub new {
3218 my $class = shift; 4006 my $class = shift;
3219 4007
3220 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3223 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3224 @_, 4013 @_,
3225 ); 4014 );
3226 4015
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3228 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3229 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3230 $self 4053 $self
3231} 4054}
3232 4055
3233sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3234 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3235 4087
3236 Scalar::Util::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3237 4090
3238 $self->{buttonbar}->add (new CFClient::UI::Button
3239 markup => $title,
3240 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) },
3242 );
3243
3244 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
3245} 4092}
3246 4093
3247sub get_current_page { 4094sub get_current_page {
3248 my ($self) = @_; 4095 my ($self) = @_;
3249 4096
… …
3255 4102
3256 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3257 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3258} 4105}
3259 4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
3260############################################################################# 4127#############################################################################
3261 4128
3262package CFClient::UI::Combobox; 4129package DC::UI::Selector;
3263 4130
3264use utf8; 4131use utf8;
3265 4132
3266our @ISA = CFClient::UI::Button::; 4133our @ISA = DC::UI::Button::;
3267 4134
3268sub new { 4135sub new {
3269 my $class = shift; 4136 my $class = shift;
3270 4137
3271 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
… …
3288 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3289 4156
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 } 4158 }
3292 4159
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294} 4161}
3295 4162
3296sub _set_value { 4163sub _set_value {
3297 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3298 4165
3299 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3300 or return; 4168 or return;
3301 4169
3302 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3303 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3304 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3305} 4173}
3306 4174
3307sub set_value { 4175sub set_value {
3308 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3309 4177
… …
3311 4179
3312 $self->_set_value ($value); 4180 $self->_set_value ($value);
3313 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3314} 4182}
3315 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3316############################################################################# 4191#############################################################################
3317 4192
3318package CFClient::UI::Statusbox; 4193package DC::UI::Statusbox;
3319 4194
3320our @ISA = CFClient::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3321 4196
3322sub new { 4197sub new {
3323 my $class = shift; 4198 my $class = shift;
3324 4199
3325 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3326 fontsize => 0.8, 4201 fontsize => 0.8,
3327 @_, 4202 @_,
3328 ); 4203 );
3329 4204
3330 Scalar::Util::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3331 4206
3332 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3333 4208
3334 $self 4209 $self
3335} 4210}
3336 4211
3337sub reorder { 4212sub reorder {
3338 my ($self) = @_; 4213 my ($self) = @_;
3339 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3340 4215
3341 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3345 4220
3346 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3347 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3349 4226
3350 my @widgets; 4227 my @widgets;
3351 4228
3352 my @items = sort { 4229 my @items = sort {
3353 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3354 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3355 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3356
3357 $self->{timer}->interval (1);
3358 4233
3359 my $count = 10 + 1; 4234 my $count = 10 + 1;
3360 for my $item (@items) { 4235 for my $item (@items) {
3361 last unless --$count; 4236 last unless --$count;
3362 4237
… …
3369 for ($short) { 4244 for ($short) {
3370 s/^\s+//; 4245 s/^\s+//;
3371 s/\s+/ /g; 4246 s/\s+/ /g;
3372 } 4247 }
3373 4248
3374 new CFClient::UI::Label 4249 new DC::UI::Label
3375 markup => $short, 4250 markup => $short,
3376 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3377 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3378 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3379 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3380 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3381 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3382 can_events => 1, 4258 can_events => 1,
3383 can_hover => 1 4259 can_hover => 1
3384 }; 4260 };
3385 4261
3386 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3387 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3388 $label->update; 4264 $label->update;
3389 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3390 if $diff < 1; 4266 if $diff < 1;
3391 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3392 } else { 4268 } else {
3393 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3394 } 4270 }
3395 4271
3396 push @widgets, $label; 4272 push @widgets, $label;
… …
3458 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
3459} 4335}
3460 4336
3461############################################################################# 4337#############################################################################
3462 4338
3463package CFClient::UI::Inventory;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 col_expand => [0, 1, 0],
3472 @_,
3473 );
3474
3475 $self
3476}
3477
3478sub set_items {
3479 my ($self, $items) = @_;
3480
3481 $self->clear;
3482 return unless $items;
3483
3484 my @items = sort {
3485 ($a->{type} <=> $b->{type})
3486 or ($a->{name} cmp $b->{name})
3487 } values %$items;
3488
3489 $self->{real_items} = \@items;
3490
3491 my $row = 0;
3492 for my $item (@items) {
3493 CFClient::Item::update_widgets $item;
3494
3495 $self->add (0, $row, $item->{face_widget});
3496 $self->add (1, $row, $item->{desc_widget});
3497 $self->add (2, $row, $item->{weight_widget});
3498
3499 $row++;
3500 }
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::SpellList;
3506
3507our @ISA = CFClient::UI::Table::;
3508
3509sub new {
3510 my $class = shift;
3511
3512 my $self = $class->SUPER::new (
3513 binding => [],
3514 commands => [],
3515 @_,
3516 )
3517}
3518
3519my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3520
3521my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531
3532sub rebuild_spell_list {
3533 my ($self) = @_;
3534
3535 $CFClient::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear;
3537
3538 return unless $::CONN;
3539
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546 my $row = 0;
3547
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_};
3550
3551 $row++;
3552
3553 my $spell_cb = sub {
3554 my ($widget, $ev) = @_;
3555
3556 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu
3562 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ],
3566 )->popup ($ev);
3567 } else {
3568 return 0;
3569 }
3570
3571 1
3572 };
3573
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579 $self->add (0, $row, new CFClient::UI::Face
3580 face => $spell->{face},
3581 can_hover => 1,
3582 can_events => 1,
3583 tooltip => $tooltip,
3584 on_button_down => $spell_cb,
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $tooltip,
3593 on_button_down => $spell_cb,
3594 );
3595
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 }
3601 });
3602}
3603
3604sub add_spell {
3605 my ($self, $spell) = @_;
3606
3607 $self->{spell}->{$spell->{name}} = $spell;
3608 $self->rebuild_spell_list;
3609}
3610
3611sub remove_spell {
3612 my ($self, $spell) = @_;
3613
3614 delete $self->{spell}->{$spell->{name}};
3615 $self->rebuild_spell_list;
3616}
3617
3618sub clear_spells {
3619 my ($self) = @_;
3620
3621 $self->{spell} = {};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root; 4339package DC::UI::Root;
3628 4340
3629our @ISA = CFClient::UI::Container::; 4341our @ISA = DC::UI::Container::;
3630 4342
3631use List::Util qw(min max); 4343use List::Util qw(min max);
3632 4344
3633use CFClient::OpenGL; 4345use DC::OpenGL;
3634 4346
3635sub new { 4347sub new {
3636 my $class = shift; 4348 my $class = shift;
3637 4349
3638 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3639 visible => 1, 4351 visible => 1,
3640 @_, 4352 @_,
3641 ); 4353 );
3642 4354
3643 Scalar::Util::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3644 4356
3645 $self 4357 $self
3646} 4358}
3647 4359
3648sub size_request { 4360sub size_request {
… …
3696} 4408}
3697 4409
3698sub update { 4410sub update {
3699 my ($self) = @_; 4411 my ($self) = @_;
3700 4412
3701 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3702} 4414}
3703 4415
3704sub add { 4416sub add {
3705 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3706 4418
… …
3743 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3744 $_->() 4456 $_->()
3745 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3746 } 4458 }
3747 4459
3748 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3749 my %queue; 4461 my %queue;
3750 my @queue; 4462 my @queue;
3751 my $widget; 4463 my $widget;
3752 4464
3753 outer: 4465 outer:
… …
3773 4485
3774 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3775 4487
3776 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3777 4489
3778 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3779 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
3780 4495
3781 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3782 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3783 4498
3784 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3800 } 4515 }
3801 } 4516 }
3802 4517
3803 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
3804 } 4519 }
3805 }
3806 4520
3807 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
3808 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
3809 values %$size_alloc; 4523 values %$size_alloc;
3810 4524
3811 while () { 4525 while () {
3812 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
3813 4527
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815 4529
3816 $w = 0 if $w < 0; 4530 $w = max $widget->{min_w}, $w;
3817 $h = 0 if $h < 0; 4531 $h = max $widget->{min_h}, $h;
3818 4532
4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4535
4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4538
3819 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
3820 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
3821 4541
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
3824 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
3825 4545
3826 $widget->{w} = $w; 4546 $widget->{w} = $w;
3827 $widget->{h} = $h; 4547 $widget->{h} = $h;
3828 4548
3829 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
3830 } 4551 }
3831 } 4552 }
3832 } 4553 }
3833 4554
3834 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
3835 $_->() 4556 $_->()
3836 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
3837 } 4558 }
3838
3839 4559
3840 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3841 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3842 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
3843 4563
… …
3846 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
3848 glLoadIdentity; 4568 glLoadIdentity;
3849 4569
3850 { 4570 {
3851 package CFClient::UI::Base; 4571 package DC::UI::Base;
3852 4572
3853 ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
3855 }
3856 4575
3857 $self->_draw; 4576 $self->_draw;
4577 }
3858} 4578}
3859 4579
3860############################################################################# 4580#############################################################################
3861 4581
3862package CFClient::UI; 4582package DC::UI;
3863 4583
3864$ROOT = new CFClient::UI::Root; 4584$ROOT = new DC::UI::Root;
3865$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
3866 4586
38671 45871
3868 4588

Diff Legend

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