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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.460 by elmex, Sun Jan 6 16:28:49 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_file DC::Texture DC::find_rcfile "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_file DC::Texture DC::find_rcfile $_, 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_file DC::Texture DC::find_rcfile $_, 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 => 0.6,
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;
… …
1585 1934
1586 delete $self->{ox}; 1935 delete $self->{ox};
1587 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1588} 1937}
1589 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1590sub set_text { 1945sub set_text {
1591 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1592 1947
1593 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1595 1950
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1598 1952
1599 delete $self->{size_req}; 1953 delete $self->{size_req};
1600 $self->realloc; 1954 $self->realloc;
1601 $self->update; 1955 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1609 1963
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1965
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1614 1967
1615 delete $self->{size_req}; 1968 delete $self->{size_req};
1616 $self->realloc; 1969 $self->realloc;
1617 $self->update; 1970 $self->update;
… …
1619 1972
1620sub size_request { 1973sub size_request {
1621 my ($self) = @_; 1974 my ($self) = @_;
1622 1975
1623 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1624 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1625 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1626 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1629 1984
1630 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1631 1986
1632 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1989 $self->{template}->set_width ($max_w);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1991
1636 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1637 1993
1638 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1672 2028
1673sub reconfigure { 2029sub reconfigure {
1674 my ($self) = @_; 2030 my ($self) = @_;
1675 2031
1676 delete $self->{size_req}; 2032 delete $self->{size_req};
2033 delete $self->{texture};
1677 2034
1678 $self->SUPER::reconfigure; 2035 $self->SUPER::reconfigure;
1679} 2036}
1680 2037
1681sub _draw { 2038sub _draw {
1682 my ($self) = @_; 2039 my ($self) = @_;
1683 2040
1684 $self->SUPER::_draw; # draw background, if applicable 2041 $self->SUPER::_draw; # draw background, if applicable
1685 2042
1686 my $tex = $self->{texture} ||= do { 2043 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 2044 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2045 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 2046 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2047 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2048 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 2050
1694 new_from_layout CFClient::Texture $self->{layout} 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} - $tex->{w} - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1700 : ($self->{w} - $tex->{w}) * 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} - $tex->{h} - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5);
1705 }; 2059 };
1706 2060
1707 glEnable GL_TEXTURE_2D; 2061# unless ($self->{list}) {
1708 2062# $self->{list} = DC::OpenGL::glGenList;
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2063# DC::OpenGL::glNewList $self->{list};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711 2065# DC::OpenGL::glEndList;
1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 } 2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
1720 2069
1721 glDisable GL_TEXTURE_2D; 2070 $self->{layout}->draw;
1722} 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#}
1723 2080
1724############################################################################# 2081#############################################################################
1725 2082
1726package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1727 2084
1728our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1729 2086
1730use CFClient::OpenGL; 2087use DC::OpenGL;
1731 2088
1732sub new { 2089sub new {
1733 my $class = shift; 2090 my $class = shift;
1734 2091
1735 $class->SUPER::new ( 2092 $class->SUPER::new (
1736 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1737 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1738 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1739 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1740 can_hover => 1, 2099 can_hover => 1,
1741 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1742 valign => 0, 2102 valign => 0.5,
1743 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1744 #text => ... 2107 #text => ...
1745 #hidden => "*", 2108 #hidden => "*",
1746 @_ 2109 @_
1747 ) 2110 )
1748} 2111}
… …
1793 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1794 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1795 2158
1796 my $text = $self->get_text; 2159 my $text = $self->get_text;
1797 2160
2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
1798 if ($uni == 8) { 2163 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } 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 = "";
1807 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) {
1809 $self->{cursor} = length $text;
1810 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 2187 $self->emit ('escape');
1812 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 2192 } else {
1815 return 0; 2193 return 0;
1816 } 2194 }
1817 2195
1818 $self->_set_text ($text); 2196 $self->_set_text ($text);
1819 2197
1820 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1821 2200
1822 1 2201 1
1823} 2202}
1824 2203
1825sub invoke_focus_in { 2204sub invoke_focus_in {
… …
1837 2216
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2217 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2218
1840 # byte-index to char-index 2219 # byte-index to char-index
1841 my $text = $self->{text}; 2220 my $text = $self->{text};
1842 utf8::encode $text; 2221 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2222 $self->{cursor} = length $text;
1844 2223
1845 $self->_set_text ($self->{text}); 2224 $self->_set_text ($self->{text});
1846 $self->update; 2225 $self->update;
1847 2226
1848 1 2227 1
… …
1867 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1868 } 2247 }
1869 2248
1870 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1872 glBegin GL_QUADS;
1873 glVertex 0 , 0;
1874 glVertex 0 , $self->{h};
1875 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1876 glVertex $self->{w}, 0;
1877 glEnd;
1878 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1879 2253
1880 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1881 2255
1882 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1884 2258
1885 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1886 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1887 utf8::encode $text; 2261 utf8::encode $text;
1888 2262
1889 @$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);
1890 } 2264 }
1891 2265
1892 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1893 glBegin GL_LINES; 2267 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1895 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};
1896 glEnd; 2270 glEnd;
1897 }
1898}
1899 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
1900package CFClient::UI::Entry; 2290package DC::UI::Entry;
1901 2291
1902our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1903 2293
1904use CFClient::OpenGL; 2294use DC::OpenGL;
1905 2295
1906sub invoke_key_down { 2296sub invoke_key_down {
1907 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
1908 2298
1909 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
1910 2300
1911 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
1914 2304
1915 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2307 $self->emit (activate => $txt);
1918 $self->update; 2308 $self->update;
1919 2309
1920 } elsif ($sym == CFClient::SDLK_UP) { 2310 } elsif ($sym == DC::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
1923 } 2313 }
1924 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2318 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2320 }
1931 2321
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2322 } elsif ($sym == DC::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2325
1936 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2336 1
1947} 2337}
1948 2338
1949############################################################################# 2339#############################################################################
1950 2340
1951package CFClient::UI::Button; 2341package DC::UI::TextEdit;
1952 2342
1953our @ISA = CFClient::UI::Label::; 2343our @ISA = DC::UI::EntryBase::;
1954 2344
1955use CFClient::OpenGL; 2345use DC::OpenGL;
1956
1957my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png);
1960 2346
1961sub new { 2347sub new {
1962 my $class = shift; 2348 my $class = shift;
1963 2349
1964 $class->SUPER::new ( 2350 $class->SUPER::new (
1965 padding_x => 4,
1966 padding_y => 4, 2351 padding_y => 4,
1967 fg => [1, 1, 1], 2352
1968 active_fg => [0, 0, 1], 2353 @_
2354 )
2355}
2356
2357sub move_cursor_ver {
2358 my ($self, $dy) = @_;
2359
2360 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2361
2362 $line += $dy;
2363
2364 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2365 $self->{cursor} = $index;
2366 delete $self->{cur_h};
2367 $self->update;
2368 return;
2369 }
2370}
2371
2372sub invoke_key_down {
2373 my ($self, $ev) = @_;
2374
2375 my $sym = $ev->{sym};
2376
2377 if ($sym == DC::SDLK_UP) {
2378 $self->move_cursor_ver (-1);
2379 } elsif ($sym == DC::SDLK_DOWN) {
2380 $self->move_cursor_ver (+1);
2381 } else {
2382 return $self->SUPER::invoke_key_down ($ev)
2383 }
2384
2385 1
2386}
2387
2388#############################################################################
2389
2390package DC::UI::ButtonBin;
2391
2392our @ISA = DC::UI::Bin::;
2393
2394use DC::OpenGL;
2395
2396my @tex =
2397 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2398 qw(b1_button_inactive.png b1_button_active.png);
2399
2400sub new {
2401 my $class = shift;
2402
2403 $class->SUPER::new (
1969 can_hover => 1, 2404 can_hover => 1,
1970 align => 0, 2405 align => 0.5,
1971 valign => 0, 2406 valign => 0.5,
1972 can_events => 1, 2407 can_events => 1,
1973 @_ 2408 @_
1974 ) 2409 )
1975} 2410}
1976 2411
… …
1985} 2420}
1986 2421
1987sub _draw { 2422sub _draw {
1988 my ($self) = @_; 2423 my ($self) = @_;
1989 2424
1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1991
1992 glEnable GL_TEXTURE_2D; 2425 glEnable GL_TEXTURE_2D;
1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994 glColor 0, 0, 0, 1; 2427 glColor 0, 0, 0, 1;
1995 2428
2429 my $tex = $tex[$GRAB == $self];
1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2430 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997 2431
1998 glDisable GL_TEXTURE_2D; 2432 glDisable GL_TEXTURE_2D;
1999 2433
2000 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
2001} 2435}
2002 2436
2003############################################################################# 2437#############################################################################
2004 2438
2005package CFClient::UI::ImageButton; 2439package DC::UI::Button;
2006 2440
2007our @ISA = CFClient::UI::Image::; 2441our @ISA = DC::UI::Label::;
2008 2442
2009use CFClient::OpenGL; 2443use DC::OpenGL;
2010 2444
2011my %textures; 2445my @tex =
2446 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2447 qw(b1_button_inactive.png b1_button_active.png);
2012 2448
2013sub new { 2449sub new {
2014 my $class = shift; 2450 my $class = shift;
2015 2451
2016 my $self = $class->SUPER::new ( 2452 $class->SUPER::new (
2017 padding_x => 4, 2453 padding_x => 8,
2018 padding_y => 4, 2454 padding_y => 4,
2019 fg => [1, 1, 1], 2455 fg => [1.0, 1.0, 1.0],
2020 active_fg => [0, 0, 1], 2456 active_fg => [0.8, 0.8, 0.8],
2021 can_hover => 1, 2457 can_hover => 1,
2022 align => 0, 2458 align => 0.5,
2023 valign => 0, 2459 valign => 0.5,
2024 can_events => 1, 2460 can_events => 1,
2025 @_ 2461 @_
2026 ); 2462 )
2027} 2463}
2028 2464
2029sub invoke_button_up { 2465sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_; 2466 my ($self, $ev, $x, $y) = @_;
2031 2467
… …
2034 && $y >= 0 && $y < $self->{h}; 2470 && $y >= 0 && $y < $self->{h};
2035 2471
2036 1 2472 1
2037} 2473}
2038 2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2479
2480 glEnable GL_TEXTURE_2D;
2481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2482 glColor 0, 0, 0, 1;
2483
2484 my $tex = $tex[$GRAB == $self];
2485 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2486
2487 glDisable GL_TEXTURE_2D;
2488
2489 $self->SUPER::_draw;
2490}
2491
2039############################################################################# 2492#############################################################################
2040 2493
2041package CFClient::UI::CheckBox; 2494package DC::UI::CheckBox;
2042 2495
2043our @ISA = CFClient::UI::DrawBG::; 2496our @ISA = DC::UI::DrawBG::;
2044 2497
2045my @tex = 2498my @tex =
2046 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2499 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2047 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2500 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048 2501
2049use CFClient::OpenGL; 2502use DC::OpenGL;
2050 2503
2051sub new { 2504sub new {
2052 my $class = shift; 2505 my $class = shift;
2053 2506
2054 $class->SUPER::new ( 2507 $class->SUPER::new (
… …
2094sub _draw { 2547sub _draw {
2095 my ($self) = @_; 2548 my ($self) = @_;
2096 2549
2097 $self->SUPER::_draw; 2550 $self->SUPER::_draw;
2098 2551
2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2552 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2100 2553
2101 my ($w, $h) = @$self{qw(w h)}; 2554 my ($w, $h) = @$self{qw(w h)};
2102 2555
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2556 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104 2557
… …
2111 glDisable GL_TEXTURE_2D; 2564 glDisable GL_TEXTURE_2D;
2112} 2565}
2113 2566
2114############################################################################# 2567#############################################################################
2115 2568
2116package CFClient::UI::Image; 2569package DC::UI::Image;
2117 2570
2118our @ISA = CFClient::UI::Base::; 2571our @ISA = DC::UI::Base::;
2119 2572
2120use CFClient::OpenGL; 2573use DC::OpenGL;
2121 2574
2122our %texture_cache; 2575our %texture_cache;
2123 2576
2124sub new { 2577sub new {
2125 my $class = shift; 2578 my $class = shift;
2126 2579
2127 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2128 can_events => 0, 2581 can_events => 0,
2582 scale => 1,
2129 @_, 2583 @_,
2130 ); 2584 );
2131 2585
2586 $self->{path} || $self->{tex}
2587 or Carp::croak "'path' or 'tex' attributes required";
2588
2589 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2590 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2591
2592 DC::weaken $texture_cache{$self->{path}};
2593
2594 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2595
2596 $self
2597}
2598
2599sub STORABLE_freeze {
2600 my ($self, $cloning) = @_;
2601
2132 $self->{path} 2602 $self->{path}
2133 or Carp::croak "required attribute 'path' not set"; 2603 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2134 2604
2135 $self->{tex} = $texture_cache{$self->{path}} ||= 2605 $self->{path}
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2606}
2137 2607
2138 Scalar::Util::weaken $texture_cache{$self->{path}}; 2608sub STORABLE_attach {
2609 my ($self, $cloning, $path) = @_;
2139 2610
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2611 $self->new (path => $path)
2141
2142 $self
2143} 2612}
2144 2613
2145sub size_request { 2614sub size_request {
2146 my ($self) = @_; 2615 my ($self) = @_;
2147 2616
2148 ($self->{tex}{w}, $self->{tex}{h}) 2617 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2149} 2618}
2150 2619
2151sub _draw { 2620sub _draw {
2152 my ($self) = @_; 2621 my ($self) = @_;
2153 2622
… …
2170 glDisable GL_TEXTURE_2D; 2639 glDisable GL_TEXTURE_2D;
2171} 2640}
2172 2641
2173############################################################################# 2642#############################################################################
2174 2643
2644package DC::UI::ImageButton;
2645
2646our @ISA = DC::UI::Image::;
2647
2648use DC::OpenGL;
2649
2650my %textures;
2651
2652sub new {
2653 my $class = shift;
2654
2655 my $self = $class->SUPER::new (
2656 padding_x => 4,
2657 padding_y => 4,
2658 fg => [1, 1, 1],
2659 active_fg => [0, 0, 1],
2660 can_hover => 1,
2661 align => 0.5,
2662 valign => 0.5,
2663 can_events => 1,
2664 @_
2665 );
2666}
2667
2668sub invoke_button_down {
2669 my ($self, $ev, $x, $y) = @_;
2670
2671 1
2672}
2673
2674sub invoke_button_up {
2675 my ($self, $ev, $x, $y) = @_;
2676
2677 $self->emit ("activate")
2678 if $x >= 0 && $x < $self->{w}
2679 && $y >= 0 && $y < $self->{h};
2680
2681 1
2682}
2683
2684#############################################################################
2685
2175package CFClient::UI::VGauge; 2686package DC::UI::VGauge;
2176 2687
2177our @ISA = CFClient::UI::Base::; 2688our @ISA = DC::UI::Base::;
2178 2689
2179use List::Util qw(min max); 2690use List::Util qw(min max);
2180 2691
2181use CFClient::OpenGL; 2692use DC::OpenGL;
2182 2693
2183my %tex = ( 2694my %tex = (
2184 food => [ 2695 food => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2186 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2697 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187 ], 2698 ],
2188 grace => [ 2699 grace => [
2189 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2190 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2701 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191 ], 2702 ],
2192 hp => [ 2703 hp => [
2193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2194 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2705 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195 ], 2706 ],
2196 mana => [ 2707 mana => [
2197 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2708 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2198 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2709 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199 ], 2710 ],
2200); 2711);
2201 2712
2202# eg. VGauge->new (gauge => 'food'), default gauge: food 2713# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2305 glDisable GL_TEXTURE_2D; 2816 glDisable GL_TEXTURE_2D;
2306} 2817}
2307 2818
2308############################################################################# 2819#############################################################################
2309 2820
2821package DC::UI::Progress;
2822
2823our @ISA = DC::UI::Label::;
2824
2825use DC::OpenGL;
2826
2827sub new {
2828 my ($class, %arg) = @_;
2829
2830 my $self = $class->SUPER::new (
2831 fg => [1, 1, 1],
2832 bg => [0, 0, 1, 0.2],
2833 bar => [0.7, 0.5, 0.1, 0.8],
2834 outline => [0.4, 0.3, 0],
2835 fontsize => 0.9,
2836 valign => 0.5,
2837 align => 0.5,
2838 can_events => 1,
2839 ellipsise => 1,
2840 label => "%d%%",
2841 %arg,
2842 );
2843
2844 $self->set_value ($arg{value} || -1);
2845
2846 $self
2847}
2848
2849sub set_label {
2850 my ($self, $label) = @_;
2851
2852 return if $self->{label} eq $label;
2853 $self->{label} = $label;
2854
2855 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2856}
2857
2858sub set_value {
2859 my ($self, $value) = @_;
2860
2861 if ($self->{value} ne $value) {
2862 $self->{value} = $value;
2863
2864 if ($value < 0) {
2865 $self->set_text ("-");
2866 } else {
2867 $self->set_text (sprintf $self->{label}, $value * 100);
2868 }
2869
2870 $self->update;
2871 }
2872}
2873
2874sub _draw {
2875 my ($self) = @_;
2876
2877 glEnable GL_BLEND;
2878 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2879
2880 if ($self->{value} >= 0) {
2881 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2882
2883 glColor_premultiply @{$self->{bar}};
2884 glRect 2, 2, $s, $self->{h} - 2;
2885 glColor_premultiply @{$self->{bg}};
2886 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2887 }
2888
2889 glColor_premultiply @{$self->{outline}};
2890 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2891
2892 glDisable GL_BLEND;
2893
2894 {
2895 local $self->{bg}; # do not draw background
2896 $self->SUPER::_draw;
2897 }
2898}
2899
2900#############################################################################
2901
2902package DC::UI::ExperienceProgress;
2903
2904our @ISA = DC::UI::Progress::;
2905
2906sub new {
2907 my ($class, %arg) = @_;
2908
2909 my $self = $class->SUPER::new (
2910 tooltip => sub {
2911 my ($self) = @_;
2912
2913 sprintf "level %d\n%s points\n%s next level\n%s to go",
2914 $self->{lvl},
2915 ::formsep ($self->{exp}),
2916 ::formsep ($self->{nxt}),
2917 ::formsep ($self->{nxt} - $self->{exp}),
2918 },
2919 %arg
2920 );
2921
2922 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2923 if $::CONN;
2924
2925 $self
2926}
2927
2928sub DESTROY {
2929 my ($self) = @_;
2930
2931 delete $::CONN->{on_exp_update}{$self+0}
2932 if $::CONN;
2933
2934 $self->SUPER::DESTROY;
2935}
2936
2937sub set_value {
2938 my ($self, $lvl, $exp) = @_;
2939
2940 $self->{lvl} = $lvl;
2941 $self->{exp} = $exp;
2942
2943 my $v = -1;
2944
2945 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2946 my $l0 = $table->[$lvl - 1];
2947 my $l1 = $table->[$lvl];
2948
2949 $self->{nxt} = $l1;
2950
2951 $v = ($exp - $l0) / ($l1 - $l0);
2952 }
2953
2954 $self->SUPER::set_value ($v);
2955}
2956
2957#############################################################################
2958
2310package CFClient::UI::Gauge; 2959package DC::UI::Gauge;
2311 2960
2312our @ISA = CFClient::UI::VBox::; 2961our @ISA = DC::UI::VBox::;
2313 2962
2314sub new { 2963sub new {
2315 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2316 2965
2317 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
… …
2319 can_hover => 1, 2968 can_hover => 1,
2320 can_events => 1, 2969 can_events => 1,
2321 %arg, 2970 %arg,
2322 ); 2971 );
2323 2972
2324 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2973 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2325 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2974 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2975 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2327 2976
2328 $self 2977 $self
2329} 2978}
2330 2979
2331sub set_fontsize { 2980sub set_fontsize {
… …
2352 $self->{value}->set_text ($val); 3001 $self->{value}->set_text ($val);
2353} 3002}
2354 3003
2355############################################################################# 3004#############################################################################
2356 3005
2357package CFClient::UI::Slider; 3006package DC::UI::Slider;
2358 3007
2359use strict; 3008use strict;
2360 3009
2361use CFClient::OpenGL; 3010use DC::OpenGL;
2362 3011
2363our @ISA = CFClient::UI::DrawBG::; 3012our @ISA = DC::UI::DrawBG::;
2364 3013
2365my @tex = 3014my @tex =
2366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3015 map { new_from_file DC::Texture DC::find_rcfile $_ }
2367 qw(s1_slider.png s1_slider_bg.png); 3016 qw(s1_slider.png s1_slider_bg.png);
2368 3017
2369sub new { 3018sub new {
2370 my $class = shift; 3019 my $class = shift;
2371 3020
… …
2439 3088
2440 $self->SUPER::invoke_button_down ($ev, $x, $y); 3089 $self->SUPER::invoke_button_down ($ev, $x, $y);
2441 3090
2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3091 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2443 3092
2444 $self->invoke_mouse_motion ($ev, $x, $y) 3093 $self->invoke_mouse_motion ($ev, $x, $y);
3094
3095 1
2445} 3096}
2446 3097
2447sub invoke_mouse_motion { 3098sub invoke_mouse_motion {
2448 my ($self, $ev, $x, $y) = @_; 3099 my ($self, $ev, $x, $y) = @_;
2449 3100
… …
2456 3107
2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3108 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else { 3109 } else {
2459 return 0; 3110 return 0;
2460 } 3111 }
3112
3113 1
3114}
3115
3116sub invoke_mouse_wheel {
3117 my ($self, $ev) = @_;
3118
3119 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3120
3121 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3122
3123 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2461 3124
2462 1 3125 1
2463} 3126}
2464 3127
2465sub update { 3128sub update {
… …
2516 glDisable GL_TEXTURE_2D; 3179 glDisable GL_TEXTURE_2D;
2517} 3180}
2518 3181
2519############################################################################# 3182#############################################################################
2520 3183
2521package CFClient::UI::ValSlider; 3184package DC::UI::ValSlider;
2522 3185
2523our @ISA = CFClient::UI::HBox::; 3186our @ISA = DC::UI::HBox::;
2524 3187
2525sub new { 3188sub new {
2526 my ($class, %arg) = @_; 3189 my ($class, %arg) = @_;
2527 3190
2528 my $range = delete $arg{range}; 3191 my $range = delete $arg{range};
2529 3192
2530 my $self = $class->SUPER::new ( 3193 my $self = $class->SUPER::new (
2531 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3194 slider => (new DC::UI::Slider expand => 1, range => $range),
2532 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3195 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2533 to_value => sub { shift }, 3196 to_value => sub { shift },
2534 from_value => sub { shift }, 3197 from_value => sub { shift },
2535 %arg, 3198 %arg,
2536 ); 3199 );
2537 3200
… …
2557sub set_range { shift->{slider}->set_range (@_) } 3220sub set_range { shift->{slider}->set_range (@_) }
2558sub set_value { shift->{slider}->set_value (@_) } 3221sub set_value { shift->{slider}->set_value (@_) }
2559 3222
2560############################################################################# 3223#############################################################################
2561 3224
2562package CFClient::UI::TextScroller; 3225package DC::UI::TextScroller;
2563 3226
2564our @ISA = CFClient::UI::HBox::; 3227our @ISA = DC::UI::HBox::;
2565 3228
2566use CFClient::OpenGL; 3229use DC::OpenGL;
2567 3230
2568sub new { 3231sub new {
2569 my $class = shift; 3232 my $class = shift;
2570 3233
2571 my $self = $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
2572 fontsize => 1, 3235 fontsize => 1,
2573 can_events => 0, 3236 can_events => 1,
2574 indent => 0, 3237 indent => 0,
2575 #font => default_font 3238 #font => default_font
2576 @_, 3239 @_,
2577 3240
2578 layout => (new CFClient::Layout 1), 3241 layout => (new DC::Layout),
2579 par => [], 3242 par => [],
3243 max_par => 0,
2580 height => 0, 3244 height => 0,
2581 children => [ 3245 children => [
2582 (new CFClient::UI::Empty expand => 1), 3246 (new DC::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 3247 (new DC::UI::Slider vertical => 1),
2584 ], 3248 ],
2585 ); 3249 );
2586 3250
2587 $self->{children}[1]->connect (changed => sub { $self->update }); 3251 $self->{children}[1]->connect (changed => sub { $self->update });
2588 3252
… …
2597} 3261}
2598 3262
2599sub size_request { 3263sub size_request {
2600 my ($self) = @_; 3264 my ($self) = @_;
2601 3265
2602 my ($empty, $slider) = @{ $self->{children} }; 3266 my ($empty, $slider) = $self->visible_children;
2603 3267
2604 local $self->{children} = [$empty, $slider]; 3268 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request 3269 $self->SUPER::size_request
2606} 3270}
2607 3271
… …
2618 3282
2619 $self->reflow; 3283 $self->reflow;
2620 3284
2621 local $self->{children} = [$empty, $slider]; 3285 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 3286 $self->SUPER::invoke_size_allocate ($w, $h)
3287}
3288
3289sub invoke_mouse_wheel {
3290 my ($self, $ev) = @_;
3291
3292 return 0 unless $ev->{dy}; # only vertical movements
3293
3294 $self->{children}[1]->emit (mouse_wheel => $ev);
3295
3296 1
2623} 3297}
2624 3298
2625sub get_layout { 3299sub get_layout {
2626 my ($self, $para) = @_; 3300 my ($self, $para) = @_;
2627 3301
… …
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3308 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2635 $layout->set_markup ($para->{markup}); 3309 $layout->set_markup ($para->{markup});
2636 3310
2637 $layout->set_shapes ( 3311 $layout->set_shapes (
2638 map 3312 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3313 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}} 3314 @{$para->{widget}}
2641 ); 3315 );
2642 3316
2643 $layout 3317 $layout
2644} 3318}
… …
2653sub set_offset { 3327sub set_offset {
2654 my ($self, $offset) = @_; 3328 my ($self, $offset) = @_;
2655 3329
2656 # todo: base offset on lines or so, not on pixels 3330 # todo: base offset on lines or so, not on pixels
2657 $self->{children}[1]->set_value ($offset); 3331 $self->{children}[1]->set_value ($offset);
3332}
3333
3334sub current_paragraph {
3335 my ($self) = @_;
3336
3337 $self->{top_paragraph} - 1
3338}
3339
3340sub scroll_to {
3341 my ($self, $para) = @_;
3342
3343 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3344
3345 $self->{scroll_to} = $para;
3346 $self->update;
2658} 3347}
2659 3348
2660sub clear { 3349sub clear {
2661 my ($self) = @_; 3350 my ($self) = @_;
2662 3351
… …
2667 $self->{height} = 0; 3356 $self->{height} = 0;
2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669} 3358}
2670 3359
2671sub add_paragraph { 3360sub add_paragraph {
2672 my ($self, $color, $para, $indent) = @_; 3361 my $self = shift;
2673 3362
2674 my ($text, @w) = ref $para ? @$para : $para; 3363 for my $para (@_) {
2675
2676 $para = { 3364 $para = {
3365 fg => [1, 1, 1, 1],
3366 indent => 0,
3367 markup => "",
3368 widget => [],
3369 ref $para ? %$para : (markup => $para),
2677 w => 1e10, 3370 w => 1e10,
2678 wrapped => 1, 3371 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2683 }; 3372 };
2684 3373
2685 $self->add (@w) if @w; 3374 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686 push @{$self->{par}}, $para; 3375 push @{$self->{par}}, $para;
3376 }
3377
3378 if (my $max = $self->{max_par}) {
3379 shift @{$self->{par}} while @{$self->{par}} > $max;
3380 }
2687 3381
2688 $self->{need_reflow}++; 3382 $self->{need_reflow}++;
2689 $self->update; 3383 $self->update;
2690} 3384}
2691 3385
2692sub scroll_to_bottom { 3386sub scroll_to_bottom {
2693 my ($self) = @_; 3387 my ($self) = @_;
2694 3388
2695 $self->{scroll_to_bottom} = 1; 3389 $self->{scroll_to} = $#{$self->{par}};
2696 $self->update; 3390 $self->update;
2697} 3391}
2698 3392
3393sub force_uptodate {
3394 my ($self) = @_;
3395
3396 if (delete $self->{need_reflow}) {
3397 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3398
3399 my $height = 0;
3400
3401 for my $para (@{$self->{par}}) {
3402 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3403 my $layout = $self->get_layout ($para);
3404 my ($w, $h) = $layout->size;
3405
3406 $para->{w} = $w + $para->{indent};
3407 $para->{h} = $h;
3408 $para->{wrapped} = $layout->has_wrapped;
3409 }
3410
3411 $para->{y} = $height;
3412 $height += $para->{h};
3413 }
3414
3415 $self->{height} = $height;
3416 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3417
3418 delete $self->{texture};
3419 }
3420
3421 if (my $paridx = delete $self->{scroll_to}) {
3422 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3423 }
3424}
3425
2699sub update { 3426sub update {
2700 my ($self) = @_; 3427 my ($self) = @_;
2701 3428
2702 $self->SUPER::update; 3429 $self->SUPER::update;
2703 3430
2704 return unless $self->{h} > 0; 3431 return unless $self->{h} > 0;
2705 3432
2706 delete $self->{texture}; 3433 delete $self->{texture};
2707 3434
2708 $ROOT->on_post_alloc ($self => sub { 3435 $ROOT->on_post_alloc ($self => sub {
3436 $self->force_uptodate;
3437
2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3438 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710 3439
2711 if (delete $self->{need_reflow}) {
2712 my $height = 0;
2713
2714 for my $para (@{$self->{par}}) {
2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716 my $layout = $self->get_layout ($para);
2717 my ($w, $h) = $layout->size;
2718
2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2722 }
2723
2724 $height += $para->{h};
2725 }
2726
2727 $self->{height} = $height;
2728
2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3440 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2739 glClearColor 0, 0, 0, 0; 3441 glClearColor 0, 0, 0, 0;
2740 glClear GL_COLOR_BUFFER_BIT; 3442 glClear GL_COLOR_BUFFER_BIT;
2741 3443
3444 package DC::UI::Base;
3445 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3446 (0, 0, $self->{w}, $self->{h});
3447
3448 my $top = int $self->{children}[1]{range}[0];
3449
3450 my $paridx = 0;
3451 my $top_paragraph;
2742 my $top = int $self->{children}[1]{range}[0]; 3452 my $top = int $self->{children}[1]{range}[0];
2743 3453
2744 my $y0 = $top; 3454 my $y0 = $top;
2745 my $y1 = $top + $H; 3455 my $y1 = $top + $H;
2746 3456
2747 my $y = 0;
2748
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 3457 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 3458 my $h = $para->{h};
3459 my $y = $para->{y};
2755 3460
2756 if ($y0 < $y + $h && $y < $y1) { 3461 if ($y0 < $y + $h && $y < $y1) {
2757
2758 my $layout = $self->get_layout ($para); 3462 my $layout = $self->get_layout ($para);
2759 3463
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 3464 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3465 $layout->draw;
2764 3466
2765 if (my @w = @{ $para->{widget} }) { 3467 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 3468 my @s = $layout->get_shapes;
2767 3469
2768 glDisable GL_BLEND;
2769 for (@w) { 3470 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 3471 my ($dx, $dy) = splice @s, 0, 2, ();
2771 3472
2772 $_->{x} = $dx + $para->{indent}; 3473 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 3474 $_->{y} = $dy + $y - $y0;
2774 3475
2775 $_->draw; 3476 $_->draw;
2776 } 3477 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 3478 }
2780 } 3479 }
2781 3480
2782 $y += $h; 3481 $paridx++;
3482 $top_paragraph ||= $paridx if $y >= $top;
2783 } 3483 }
2784 3484
2785 glDisable GL_BLEND; 3485 $self->{top_paragraph} = $top_paragraph;
2786 }; 3486 };
2787 }); 3487 });
2788} 3488}
2789 3489
2790sub reconfigure { 3490sub reconfigure {
… …
2808 $self->{children}[1]->draw; 3508 $self->{children}[1]->draw;
2809} 3509}
2810 3510
2811############################################################################# 3511#############################################################################
2812 3512
2813package CFClient::UI::Animator; 3513package DC::UI::Animator;
2814 3514
2815use CFClient::OpenGL; 3515use DC::OpenGL;
2816 3516
2817our @ISA = CFClient::UI::Bin::; 3517our @ISA = DC::UI::Bin::;
2818 3518
2819sub moveto { 3519sub moveto {
2820 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
2821 3521
2822 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3522 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2850 glPopMatrix; 3550 glPopMatrix;
2851} 3551}
2852 3552
2853############################################################################# 3553#############################################################################
2854 3554
2855package CFClient::UI::Flopper; 3555package DC::UI::Flopper;
2856 3556
2857our @ISA = CFClient::UI::Button::; 3557our @ISA = DC::UI::Button::;
2858 3558
2859sub new { 3559sub new {
2860 my $class = shift; 3560 my $class = shift;
2861 3561
2862 my $self = $class->SUPER::new ( 3562 my $self = $class->SUPER::new (
… …
2874 $self->{other}->toggle_visibility; 3574 $self->{other}->toggle_visibility;
2875} 3575}
2876 3576
2877############################################################################# 3577#############################################################################
2878 3578
2879package CFClient::UI::Tooltip; 3579package DC::UI::Tooltip;
2880 3580
2881our @ISA = CFClient::UI::Bin::; 3581our @ISA = DC::UI::Bin::;
2882 3582
2883use CFClient::OpenGL; 3583use DC::OpenGL;
2884 3584
2885sub new { 3585sub new {
2886 my $class = shift; 3586 my $class = shift;
2887 3587
2888 $class->SUPER::new ( 3588 $class->SUPER::new (
… …
2892} 3592}
2893 3593
2894sub set_tooltip_from { 3594sub set_tooltip_from {
2895 my ($self, $widget) = @_; 3595 my ($self, $widget) = @_;
2896 3596
2897 my $tooltip = $widget->{tooltip}; 3597 my $tip = $widget->{tooltip};
3598 $tip = $tip->($widget) if "CODE" eq ref $tip;
3599
3600 $tip = DC::Pod::section_label tooltip => $1
3601 if $tip =~ /^#(.*)$/;
2898 3602
2899 if ($ENV{CFPLUS_DEBUG} & 2) { 3603 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n" 3604 $tip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3605 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n" 3606 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}"; 3607 . "visible $widget->{visible}";
2904 } 3608 }
2905 3609
2906 $tooltip =~ s/^\n+//; 3610 $tip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//; 3611 $tip =~ s/\n+$//;
2908 3612
2909 $self->add (new CFClient::UI::Label 3613 $self->add (new DC::UI::Label
2910 markup => $tooltip, 3614 markup => $tip,
2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3615 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3616 align => 0,
2912 fontsize => 0.8, 3617 fontsize => 0.8,
2913 fg => [0, 0, 0, 1], 3618 style => 1, # FLAG_INVERSE
2914 ellipsise => 0, 3619 ellipsise => 0,
2915 font => ($widget->{tooltip_font} || $::FONT_PROP), 3620 font => ($widget->{tooltip_font} || $::FONT_PROP),
2916 ); 3621 );
2917} 3622}
2918 3623
… …
2937 3642
2938 $self->{root}->on_post_alloc ("move_$self" => sub { 3643 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner} 3644 my $widget = $self->{owner}
2940 or return; 3645 or return;
2941 3646
3647 if ($widget->{visible}) {
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3648 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943 3649
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3650 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w}; 3651 if $x + $self->{w} > $self->{root}{w};
2946 3652
2947 $self->move_abs ($x, $y); 3653 $self->move_abs ($x, $y);
3654 } else {
3655 $self->hide;
3656 }
2948 }); 3657 });
2949} 3658}
2950 3659
2951sub _draw { 3660sub _draw {
2952 my ($self) = @_; 3661 my ($self) = @_;
2953 3662
2954 glTranslate 0.375, 0.375;
2955
2956 my ($w, $h) = @$self{qw(w h)}; 3663 my ($w, $h) = @$self{qw(w h)};
2957 3664
2958 glColor 1, 0.8, 0.4; 3665 glColor 1, 0.8, 0.4;
2959 glBegin GL_QUADS; 3666 glRect 0, 0, $w, $h;
2960 glVertex 0 , 0;
2961 glVertex 0 , $h;
2962 glVertex $w, $h;
2963 glVertex $w, 0;
2964 glEnd;
2965 3667
2966 glColor 0, 0, 0; 3668 glColor 0, 0, 0;
2967 glBegin GL_LINE_LOOP; 3669 glRect_lineloop .5, .5, $w + .5, $h + .5;
2968 glVertex 0 , 0;
2969 glVertex 0 , $h;
2970 glVertex $w, $h;
2971 glVertex $w, 0;
2972 glEnd;
2973 3670
2974 glTranslate 2 - 0.375, 2 - 0.375; 3671 glTranslate 2, 2;
2975 3672
2976 $self->SUPER::_draw; 3673 $self->SUPER::_draw;
2977} 3674}
2978 3675
2979############################################################################# 3676#############################################################################
2980 3677
2981package CFClient::UI::Face; 3678package DC::UI::Face;
2982 3679
2983our @ISA = CFClient::UI::Base::; 3680our @ISA = DC::UI::DrawBG::;
2984 3681
2985use CFClient::OpenGL; 3682use DC::OpenGL;
2986 3683
2987sub new { 3684sub new {
2988 my $class = shift; 3685 my $class = shift;
2989 3686
2990 my $self = $class->SUPER::new ( 3687 my $self = $class->SUPER::new (
3688 size_w => 32,
3689 size_h => 8,
2991 aspect => 1, 3690 aspect => 1,
2992 can_events => 0, 3691 can_events => 0,
2993 @_, 3692 @_,
2994 ); 3693 );
2995 3694
2996 if ($self->{anim} && $self->{animspeed}) { 3695 if ($self->{anim} && $self->{animspeed}) {
2997 Scalar::Util::weaken (my $widget = $self); 3696 DC::weaken (my $widget = $self);
2998 3697
2999 $self->{timer} = Event->timer ( 3698 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3000 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3699 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3001 hard => 1, 3700 return unless $::CONN;
3002 interval => $self->{animspeed}, 3701
3003 cb => sub { 3702 my $w = $widget
3703 or return;
3704
3004 ++$widget->{frame}; 3705 ++$w->{frame};
3706 $w->update_face;
3707
3708 # somehow, $widget can go away
3005 $widget->update; 3709 $w->update;
3006 }, 3710 $w->update_timer;
3007 ); 3711 };
3712
3713 $self->update_face;
3714 $self->update_timer;
3008 } 3715 }
3009 3716
3010 $self 3717 $self
3011} 3718}
3012 3719
3720sub update_timer {
3721 my ($self) = @_;
3722
3723 return unless $self->{timer};
3724
3725 if ($self->{visible}) {
3726 $self->{timer}->start;
3727 } else {
3728 $self->{timer}->stop;
3729 }
3730}
3731
3732sub update_face {
3733 my ($self) = @_;
3734
3735 if ($::CONN) {
3736 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3737 if ($anim && @$anim) {
3738 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3739 delete $self->{face_change_cb};
3740
3741 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3742 unless ($tex->{name} || $tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746 }
3747 }
3748 }
3749}
3750
3013sub size_request { 3751sub size_request {
3014 (32, 8) 3752 my ($self) = @_;
3753
3754 if ($::CONN) {
3755 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3756 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3757 if ($tex->{name}) {
3758 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3759 } elsif (!$tex->{loading}) {
3760 $tex->upload (sub { $self->reconfigure });
3761 }
3762 }
3763
3764 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3765 }
3766 }
3767
3768 ($self->{size_w} || 8, $self->{size_h} || 8)
3015} 3769}
3016 3770
3017sub update { 3771sub update {
3018 my ($self) = @_; 3772 my ($self) = @_;
3019 3773
3020 return unless $self->{visible}; 3774 return unless $self->{visible};
3021 3775
3022 $self->SUPER::update; 3776 $self->SUPER::update;
3023} 3777}
3024 3778
3779sub invoke_visibility_change {
3780 my ($self) = @_;
3781
3782 $self->update_timer;
3783
3784 0
3785}
3786
3025sub _draw { 3787sub _draw {
3026 my ($self) = @_; 3788 my ($self) = @_;
3027 3789
3028 return unless $::CONN; 3790 $self->SUPER::_draw;
3029 3791
3030 my $face; 3792 if (my $tex = $self->{tex}) {
3031
3032 if ($self->{frame}) {
3033 my $anim = $::CONN->{anim}[$self->{anim}];
3034
3035 $face = $anim->[ $self->{frame} % @$anim ]
3036 if $anim && @$anim;
3037 }
3038
3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3040
3041 if ($tex) {
3042 glEnable GL_TEXTURE_2D; 3793 glEnable GL_TEXTURE_2D;
3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3044 glColor 0, 0, 0, 1; 3795 glColor 0, 0, 0, 1;
3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3796 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3046 glDisable GL_TEXTURE_2D; 3797 glDisable GL_TEXTURE_2D;
… …
3048} 3799}
3049 3800
3050sub destroy { 3801sub destroy {
3051 my ($self) = @_; 3802 my ($self) = @_;
3052 3803
3053 $self->{timer}->cancel 3804 (delete $self->{timer})->cancel
3054 if $self->{timer}; 3805 if $self->{timer};
3055 3806
3056 $self->SUPER::destroy; 3807 $self->SUPER::destroy;
3057} 3808}
3058 3809
3059############################################################################# 3810#############################################################################
3060 3811
3061package CFClient::UI::Buttonbar; 3812package DC::UI::Buttonbar;
3062 3813
3063our @ISA = CFClient::UI::HBox::; 3814our @ISA = DC::UI::HBox::;
3064 3815
3065# TODO: should actualyl wrap buttons and other goodies. 3816# TODO: should actually wrap buttons and other goodies.
3066 3817
3067############################################################################# 3818#############################################################################
3068 3819
3069package CFClient::UI::Menu; 3820package DC::UI::Menu;
3070 3821
3071our @ISA = CFClient::UI::FancyFrame::; 3822our @ISA = DC::UI::Toplevel::;
3072 3823
3073use CFClient::OpenGL; 3824use DC::OpenGL;
3074 3825
3075sub new { 3826sub new {
3076 my $class = shift; 3827 my $class = shift;
3077 3828
3078 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
3079 items => [], 3830 items => [],
3080 z => 100, 3831 z => 100,
3081 @_, 3832 @_,
3082 ); 3833 );
3083 3834
3084 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3835 $self->add ($self->{vbox} = new DC::UI::VBox);
3085 3836
3086 for my $item (@{ $self->{items} }) { 3837 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3838 my ($widget, $cb, $tooltip) = @$item;
3088 3839
3089 # handle various types of items, only text for now 3840 # handle various types of items, only text for now
3090 if (!ref $widget) { 3841 if (!ref $widget) {
3842 if ($widget =~ /\t/) {
3843 my ($left, $right) = split /\t/, $widget, 2;
3844
3091 $widget = new CFClient::UI::Label 3845 $widget = new DC::UI::HBox
3092 can_hover => 1, 3846 can_hover => 1,
3093 can_events => 1, 3847 can_events => 1,
3848 tooltip => $tooltip,
3849 children => [
3850 (new DC::UI::Label markup => $left, expand => 1),
3851 (new DC::UI::Label markup => $right, align => 1),
3852 ],
3853 ;
3854
3855 } else {
3856 $widget = new DC::UI::Label
3857 can_hover => 1,
3858 can_events => 1,
3859 align => 0,
3094 markup => $widget, 3860 markup => $widget,
3095 tooltip => $tooltip 3861 tooltip => $tooltip;
3862 }
3096 } 3863 }
3097 3864
3098 $self->{item}{$widget} = $item; 3865 $self->{item}{$widget} = $item;
3099 3866
3100 $self->{vbox}->add ($widget); 3867 $self->{vbox}->add ($widget);
… …
3143 1 3910 1
3144} 3911}
3145 3912
3146############################################################################# 3913#############################################################################
3147 3914
3148package CFClient::UI::Multiplexer; 3915package DC::UI::Multiplexer;
3149 3916
3150our @ISA = CFClient::UI::Container::; 3917our @ISA = DC::UI::Container::;
3151 3918
3152sub new { 3919sub new {
3153 my $class = shift; 3920 my $class = shift;
3154 3921
3155 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3216 $self->{current}->draw; 3983 $self->{current}->draw;
3217} 3984}
3218 3985
3219############################################################################# 3986#############################################################################
3220 3987
3221package CFClient::UI::Notebook; 3988package DC::UI::Notebook;
3222 3989
3990use DC::OpenGL;
3991
3223our @ISA = CFClient::UI::VBox::; 3992our @ISA = DC::UI::VBox::;
3224 3993
3225sub new { 3994sub new {
3226 my $class = shift; 3995 my $class = shift;
3227 3996
3228 my $self = $class->SUPER::new ( 3997 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar), 3998 buttonbar => (new DC::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3999 multiplexer => (new DC::UI::Multiplexer expand => 1),
4000 active_outline => [.7, .7, 0.2],
3231 # filter => # will be put between multiplexer and $self 4001 # filter => # will be put between multiplexer and $self
3232 @_, 4002 @_,
3233 ); 4003 );
3234 4004
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4005 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4006 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237 4007
4008 {
4009 Scalar::Util::weaken (my $wself = $self);
4010
4011 $self->{multiplexer}->connect (c_add => sub {
4012 my ($mplex, $widgets) = @_;
4013
4014 for my $child (@$widgets) {
4015 Scalar::Util::weaken $child;
4016 $child->{c_tab_} ||= do {
4017 my $tab =
4018 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4019 ? $child->{c_tab}
4020 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4021
4022 $tab->connect (activate => sub {
4023 $wself->set_current_page ($child);
4024 });
4025
4026 $tab
4027 };
4028
4029 $self->{buttonbar}->add ($child->{c_tab_});
4030 }
4031 });
4032
4033 $self->{multiplexer}->connect (c_remove => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 $wself->{buttonbar}->remove ($child->{c_tab_});
4038 }
4039 });
4040 }
4041
3238 $self 4042 $self
3239} 4043}
3240 4044
3241sub add { 4045sub add {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->add (@widgets)
4049}
4050
4051sub remove {
4052 my ($self, @widgets) = @_;
4053
4054 $self->{multiplexer}->remove (@widgets)
4055}
4056
4057sub pages {
4058 my ($self) = @_;
4059 $self->{multiplexer}->children
4060}
4061
4062sub page_index {
4063 my ($self, $widget) = @_;
4064
4065 my $i = 0;
4066 for ($self->pages) {
4067 if ($_ eq $widget) { return $i };
4068 $i++;
4069 }
4070
4071 undef
4072}
4073
4074sub add_tab {
3242 my ($self, $title, $widget, $tooltip) = @_; 4075 my ($self, $title, $widget, $tooltip) = @_;
3243 4076
3244 Scalar::Util::weaken $self; 4077 $title = [$title, $tooltip] unless ref $title;
4078 $widget->{c_tab} = $title;
3245 4079
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget); 4080 $self->add ($widget);
3253} 4081}
3254 4082
3255sub get_current_page { 4083sub get_current_page {
3256 my ($self) = @_; 4084 my ($self) = @_;
3257 4085
… …
3263 4091
3264 $self->{multiplexer}->set_current_page ($page); 4092 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current}); 4093 $self->emit (page_changed => $self->{multiplexer}{current});
3266} 4094}
3267 4095
4096sub _draw {
4097 my ($self) = @_;
4098
4099 $self->SUPER::_draw ();
4100
4101 if (my $cur = $self->{multiplexer}{current}) {
4102 if ($cur = $cur->{c_tab_}) {
4103 glTranslate $self->{buttonbar}{x} + $cur->{x},
4104 $self->{buttonbar}{y} + $cur->{y};
4105 glLineWidth 3;
4106 #glEnable GL_BLEND;
4107 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4108 glColor @{$self->{active_outline}};
4109 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4110 glLineWidth 1;
4111 #glDisable GL_BLEND;
4112 }
4113 }
4114}
4115
3268############################################################################# 4116#############################################################################
3269 4117
3270package CFClient::UI::Combobox; 4118package DC::UI::Selector;
3271 4119
3272use utf8; 4120use utf8;
3273 4121
3274our @ISA = CFClient::UI::Button::; 4122our @ISA = DC::UI::Button::;
3275 4123
3276sub new { 4124sub new {
3277 my $class = shift; 4125 my $class = shift;
3278 4126
3279 my $self = $class->SUPER::new ( 4127 my $self = $class->SUPER::new (
… …
3296 my ($value, $title, $tooltip) = @$_; 4144 my ($value, $title, $tooltip) = @$_;
3297 4145
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4146 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 } 4147 }
3300 4148
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4149 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302} 4150}
3303 4151
3304sub _set_value { 4152sub _set_value {
3305 my ($self, $value) = @_; 4153 my ($self, $value) = @_;
3306 4154
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4155 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4156 $item ||= $self->{options}[0]
3308 or return; 4157 or return;
3309 4158
3310 $self->{value} = $item->[0]; 4159 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓"); 4160 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]); 4161# $self->set_tooltip ($item->[2]);
3313} 4162}
3314 4163
3315sub set_value { 4164sub set_value {
3316 my ($self, $value) = @_; 4165 my ($self, $value) = @_;
3317 4166
… …
3319 4168
3320 $self->_set_value ($value); 4169 $self->_set_value ($value);
3321 $self->emit (changed => $value); 4170 $self->emit (changed => $value);
3322} 4171}
3323 4172
4173sub set_options {
4174 my ($self, $options) = @_;
4175
4176 $self->{options} = $options;
4177 $self->_set_value ($self->{value});
4178}
4179
3324############################################################################# 4180#############################################################################
3325 4181
3326package CFClient::UI::Statusbox; 4182package DC::UI::Statusbox;
3327 4183
3328our @ISA = CFClient::UI::VBox::; 4184our @ISA = DC::UI::VBox::;
3329 4185
3330sub new { 4186sub new {
3331 my $class = shift; 4187 my $class = shift;
3332 4188
3333 my $self = $class->SUPER::new ( 4189 my $self = $class->SUPER::new (
3334 fontsize => 0.8, 4190 fontsize => 0.8,
3335 @_, 4191 @_,
3336 ); 4192 );
3337 4193
3338 Scalar::Util::weaken (my $this = $self); 4194 DC::weaken (my $this = $self);
3339 4195
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4196 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3341 4197
3342 $self 4198 $self
3343} 4199}
3344 4200
3345sub reorder { 4201sub reorder {
3346 my ($self) = @_; 4202 my ($self) = @_;
3347 my $NOW = Time::HiRes::time; 4203 my $NOW = Time::HiRes::time;
3348 4204
3349 # freeze display when hovering over any label 4205 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner} 4206 return if $DC::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4207 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} }; 4208 values %{ $self->{item} };
3353 4209
3354 while (my ($k, $v) = each %{ $self->{item} }) { 4210 while (my ($k, $v) = each %{ $self->{item} }) {
3355 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4211 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356 } 4212 }
4213
4214 $self->{timer}->set (1, 1);
3357 4215
3358 my @widgets; 4216 my @widgets;
3359 4217
3360 my @items = sort { 4218 my @items = sort {
3361 $a->{pri} <=> $b->{pri} 4219 $a->{pri} <=> $b->{pri}
3362 or $b->{id} <=> $a->{id} 4220 or $b->{id} <=> $a->{id}
3363 } values %{ $self->{item} }; 4221 } values %{ $self->{item} };
3364
3365 $self->{timer}->interval (1);
3366 4222
3367 my $count = 10 + 1; 4223 my $count = 10 + 1;
3368 for my $item (@items) { 4224 for my $item (@items) {
3369 last unless --$count; 4225 last unless --$count;
3370 4226
… …
3377 for ($short) { 4233 for ($short) {
3378 s/^\s+//; 4234 s/^\s+//;
3379 s/\s+/ /g; 4235 s/\s+/ /g;
3380 } 4236 }
3381 4237
3382 new CFClient::UI::Label 4238 new DC::UI::Label
3383 markup => $short, 4239 markup => $short,
3384 tooltip => $item->{tooltip}, 4240 tooltip => $item->{tooltip},
3385 tooltip_font => $::FONT_PROP, 4241 tooltip_font => $::FONT_PROP,
3386 tooltip_width => 0.67, 4242 tooltip_width => 0.67,
3387 fontsize => $item->{fontsize} || $self->{fontsize}, 4243 fontsize => $item->{fontsize} || $self->{fontsize},
3388 max_w => $::WIDTH * 0.44, 4244 max_w => $::WIDTH * 0.44,
4245 align => 0,
3389 fg => [@{ $item->{fg} }], 4246 fg => [@{ $item->{fg} }],
3390 can_events => 1, 4247 can_events => 1,
3391 can_hover => 1 4248 can_hover => 1
3392 }; 4249 };
3393 4250
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4251 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4252 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update; 4253 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff) 4254 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1; 4255 if $diff < 1;
3399 $self->{timer}->interval (1/30); 4256 $self->{timer}->set (1/30, 1/30);
3400 } else { 4257 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1; 4258 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 } 4259 }
3403 4260
3404 push @widgets, $label; 4261 push @widgets, $label;
… …
3466 $self->SUPER::destroy; 4323 $self->SUPER::destroy;
3467} 4324}
3468 4325
3469############################################################################# 4326#############################################################################
3470 4327
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root; 4328package DC::UI::Root;
3636 4329
3637our @ISA = CFClient::UI::Container::; 4330our @ISA = DC::UI::Container::;
3638 4331
3639use List::Util qw(min max); 4332use List::Util qw(min max);
3640 4333
3641use CFClient::OpenGL; 4334use DC::OpenGL;
3642 4335
3643sub new { 4336sub new {
3644 my $class = shift; 4337 my $class = shift;
3645 4338
3646 my $self = $class->SUPER::new ( 4339 my $self = $class->SUPER::new (
3647 visible => 1, 4340 visible => 1,
3648 @_, 4341 @_,
3649 ); 4342 );
3650 4343
3651 Scalar::Util::weaken ($self->{root} = $self); 4344 DC::weaken ($self->{root} = $self);
3652 4345
3653 $self 4346 $self
3654} 4347}
3655 4348
3656sub size_request { 4349sub size_request {
… …
3704} 4397}
3705 4398
3706sub update { 4399sub update {
3707 my ($self) = @_; 4400 my ($self) = @_;
3708 4401
3709 $::WANT_REFRESH++; 4402 $::WANT_REFRESH = 1;
3710} 4403}
3711 4404
3712sub add { 4405sub add {
3713 my ($self, @children) = @_; 4406 my ($self, @children) = @_;
3714 4407
… …
3751 while ($self->{refresh_hook}) { 4444 while ($self->{refresh_hook}) {
3752 $_->() 4445 $_->()
3753 for values %{delete $self->{refresh_hook}}; 4446 for values %{delete $self->{refresh_hook}};
3754 } 4447 }
3755 4448
3756 if ($self->{realloc}) { 4449 while ($self->{realloc}) {
3757 my %queue; 4450 my %queue;
3758 my @queue; 4451 my @queue;
3759 my $widget; 4452 my $widget;
3760 4453
3761 outer: 4454 outer:
… …
3781 4474
3782 delete $queue{$widget+0}; 4475 delete $queue{$widget+0};
3783 4476
3784 my ($w, $h) = $widget->size_request; 4477 my ($w, $h) = $widget->size_request;
3785 4478
3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4479 $w += $widget->{padding_x} * 2;
3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4480 $h += $widget->{padding_y} * 2;
4481
4482 $w = max $widget->{min_w}, $w;
4483 $h = max $widget->{min_h}, $h;
3788 4484
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4485 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4486 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3791 4487
3792 $w = $widget->{force_w} if exists $widget->{force_w}; 4488 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3808 } 4504 }
3809 } 4505 }
3810 4506
3811 delete $self->{realloc}{$widget+0}; 4507 delete $self->{realloc}{$widget+0};
3812 } 4508 }
3813 }
3814 4509
3815 while (my $size_alloc = delete $self->{size_alloc}) { 4510 while (my $size_alloc = delete $self->{size_alloc}) {
3816 my @queue = sort { $b->{visible} <=> $a->{visible} } 4511 my @queue = sort { $a->{visible} <=> $b->{visible} }
3817 values %$size_alloc; 4512 values %$size_alloc;
3818 4513
3819 while () { 4514 while () {
3820 my $widget = pop @queue || last; 4515 my $widget = pop @queue || last;
3821 4516
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4517 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 4518
3824 $w = 0 if $w < 0; 4519 $w = max $widget->{min_w}, $w;
3825 $h = 0 if $h < 0; 4520 $h = max $widget->{min_h}, $h;
3826 4521
4522# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4523# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4524
4525 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4526 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4527
3827 $w = int $w + 0.5; 4528 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4529 $h = int $h + 0.5;
3829 4530
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 4532 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h}; 4533 $widget->{old_h} = $widget->{h};
3833 4534
3834 $widget->{w} = $w; 4535 $widget->{w} = $w;
3835 $widget->{h} = $h; 4536 $widget->{h} = $h;
3836 4537
3837 $widget->emit (size_allocate => $w, $h); 4538 $widget->emit (size_allocate => $w, $h);
4539 }
3838 } 4540 }
3839 } 4541 }
3840 } 4542 }
3841 4543
3842 while ($self->{post_alloc_hook}) { 4544 while ($self->{post_alloc_hook}) {
3843 $_->() 4545 $_->()
3844 for values %{delete $self->{post_alloc_hook}}; 4546 for values %{delete $self->{post_alloc_hook}};
3845 } 4547 }
3846
3847 4548
3848 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850 glClear GL_COLOR_BUFFER_BIT; 4551 glClear GL_COLOR_BUFFER_BIT;
3851 4552
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4556 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4557 glLoadIdentity;
3857 4558
3858 { 4559 {
3859 package CFClient::UI::Base; 4560 package DC::UI::Base;
3860 4561
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4562 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4563 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4564
3865 $self->_draw; 4565 $self->_draw;
4566 }
3866} 4567}
3867 4568
3868############################################################################# 4569#############################################################################
3869 4570
3870package CFClient::UI; 4571package DC::UI;
3871 4572
3872$ROOT = new CFClient::UI::Root; 4573$ROOT = new DC::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4574$TOOLTIP = new DC::UI::Tooltip z => 900;
3874 4575
38751 45761
3876 4577

Diff Legend

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