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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use DC;
9use DC::Pod;
11use CFClient::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
98 117
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
101} 126}
102 127
103sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
104 my ($ev) = @_; 129 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 130
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 132
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 134
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
112 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 137
114 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 140 $grab->update if $grab;
117 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
118 142
143 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
120 } 145 }
121} 146}
122 147
123sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
124 my ($ev) = @_; 149 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
126 151
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 153
129 if ($widget != $HOVER) { 154 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 155
132 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 157 if $HOVER;
140} 158}
141 159
142# convert position array to integers 160# convert position array to integers
143sub harmonize { 161sub harmonize {
… …
193 reconfigure_widgets; 211 reconfigure_widgets;
194} 212}
195 213
196############################################################################# 214#############################################################################
197 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
198package CFClient::UI::Base; 224package DC::UI::Base;
199 225
200use strict; 226use strict;
201 227
202use CFClient::OpenGL; 228use DC::OpenGL;
203 229
204sub new { 230sub new {
205 my $class = shift; 231 my $class = shift;
206 232
207 my $self = bless { 233 my $self = bless {
… …
212 h => undef, 238 h => undef,
213 can_events => 1, 239 can_events => 1,
214 @_ 240 @_
215 }, $class; 241 }, $class;
216 242
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
218 244
219 for (keys %$self) { 245 for (keys %$self) {
220 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
222 } 248 }
223 } 249 }
224 250
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
230 256
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 259
234 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
239 265
240sub destroy { 266sub destroy {
241 my ($self) = @_; 267 my ($self) = @_;
242 268
243 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
244 %$self = (); 271 %$self = ();
245} 272}
246 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
247sub show { 278sub show {
248 my ($self) = @_; 279 my ($self) = @_;
249 280
250 return if $self->{parent}; 281 return if $self->{parent};
251 282
252 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
253} 284}
254 285
255sub set_visible { 286sub set_visible {
256 my ($self) = @_; 287 my ($self) = @_;
257 288
… …
278 delete $self->{root}; 309 delete $self->{root};
279 310
280 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
282 313
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
284 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
285 316
286 $self->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) = @_;
424 480
425 return if $FOCUS == $self; 481 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 482 return unless $self->{can_focus};
427 483
428 my $focus = $FOCUS; $FOCUS = $self; 484 $FOCUS = $self;
429 485
430 $focus->update if $focus; 486 $self->update;
431 $FOCUS->update;
432 487
433 0 488 0
434} 489}
435 490
436sub invoke_focus_out { 491sub invoke_focus_out {
437 my ($self) = @_; 492 my ($self) = @_;
438 493
439 return unless $FOCUS == $self; 494 return unless $FOCUS == $self;
440 495
441 my $focus = $FOCUS; undef $FOCUS; 496 undef $FOCUS;
442 497
443 $focus->update if $focus; #? 498 $self->update;
444 499
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 500 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 501 unless $FOCUS;
447 502
448 0 503 0
449} 504}
450 505
451sub grab_focus { 506sub grab_focus {
452 my ($self) = @_; 507 my ($self) = @_;
453 508
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 1100
… …
992 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
993 1103
994 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
995} 1105}
996 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
997sub update { 1111sub update_slider {
1112 my ($self) = @_;
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});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
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 {
998 my ($self) = @_; 1142 my ($self, $ev) = @_;
999 1143
1000 $self->SUPER::update; 1144 $self->grab_focus;
1001 1145
1002 # todo: overwrite size_allocate of child 1146 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1147 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 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
1005} 1198}
1006 1199
1007sub invoke_size_allocate { 1200sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1009 1202
1010 my $child = $self->{vp}->child; 1203 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1205}
1015 1206
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1207#############################################################################
1020 1208
1021package CFClient::UI::Frame; 1209package DC::UI::Frame;
1022 1210
1023our @ISA = CFClient::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1024 1212
1025use CFClient::OpenGL; 1213use DC::OpenGL;
1026 1214
1027sub new { 1215sub new {
1028 my $class = shift; 1216 my $class = shift;
1029 1217
1030 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1040 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1041 1229
1042 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1045
1046 glBegin GL_QUADS;
1047 glVertex 0 , 0;
1048 glVertex 0 , $h;
1049 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1050 glVertex $w, 0;
1051 glEnd;
1052
1053 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1054 } 1235 }
1055 1236
1056 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1057} 1238}
1058 1239
1059############################################################################# 1240#############################################################################
1060 1241
1061package CFClient::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1062 1243
1063our @ISA = CFClient::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1064 1245
1065use 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;
1066 1347
1067my $bg = 1348my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1070 1351
1071my @border = 1352my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 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);
1074 1359
1075sub new { 1360sub new {
1076 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1077 1362
1078 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1366 border => 0.6,
1082 can_events => 1, 1367 can_events => 1,
1083 min_w => 16, 1368 min_w => 64,
1084 min_h => 16, 1369 min_h => 32,
1085 %arg, 1370 %arg,
1086 ); 1371 );
1087 1372
1088 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1089 align => 0, 1374 align => 0.5,
1090 valign => 1, 1375 valign => 1,
1091 text => $self->{title}, 1376 text => $self->{title},
1092 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1093 if exists $self->{title}; 1378 if exists $self->{title};
1094 1379
1095 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1381 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1382 new DC::UI::ImageButton
1098 path => 'x1_close.png', 1383 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1384 on_activate => sub { $self->emit ("delete") };
1100 1385
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1102 } 1387 }
1103 1388
1104 $self 1389 $self
1105} 1390}
1106 1391
1107sub add { 1392sub add {
1108 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1109 1394
1110 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1111 $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};
1112 $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};
1113} 1398}
1114 1399
1115sub border { 1400sub border {
1116 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
1117} 1411}
1118 1412
1119sub size_request { 1413sub size_request {
1120 my ($self) = @_; 1414 my ($self) = @_;
1121 1415
… …
1150 $self->child->configure ($border, $border, $w, $h); 1444 $self->child->configure ($border, $border, $w, $h);
1151 1445
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1446 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1447 if $self->{close_button};
1154 1448
1449 1
1450}
1451
1452sub invoke_delete {
1453 my ($self) = @_;
1454
1455 $self->hide;
1456
1155 1 1457 1
1156} 1458}
1157 1459
1158sub invoke_button_down { 1460sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1461 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1519 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1520
1219 ! ! $self->{motion} 1521 ! ! $self->{motion}
1220} 1522}
1221 1523
1524sub invoke_visibility_change {
1525 my ($self, $visible) = @_;
1526
1527 delete $self->{motion} unless $visible;
1528
1529 0
1530}
1531
1222sub _draw { 1532sub _draw {
1223 my ($self) = @_; 1533 my ($self) = @_;
1224 1534
1225 my $child = $self->{children}[0]; 1535 my $child = $self->{children}[0];
1226 1536
… …
1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232 1542
1233 my $border = $self->border; 1543 my $border = $self->border;
1234 1544
1235 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1236 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239 $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);
1240 1564
1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1243 1567
1244 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1263 if $self->{close_button}; 1587 if $self->{close_button};
1264} 1588}
1265 1589
1266############################################################################# 1590#############################################################################
1267 1591
1268package CFClient::UI::Table; 1592package DC::UI::Table;
1269 1593
1270our @ISA = CFClient::UI::Base::; 1594our @ISA = DC::UI::Container::;
1271 1595
1272use List::Util qw(max sum); 1596use List::Util qw(max sum);
1273 1597
1274use CFClient::OpenGL; 1598use DC::OpenGL;
1275 1599
1276sub new { 1600sub new {
1277 my $class = shift; 1601 my $class = shift;
1278 1602
1279 $class->SUPER::new ( 1603 $class->SUPER::new (
1280 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1281 @_, 1606 @_,
1282 ) 1607 )
1283} 1608}
1284 1609
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287}
1288
1289sub add { 1610sub add {
1290 my ($self, $x, $y, $child) = @_; 1611 my ($self, @widgets) = @_;
1291 1612
1292 $child->set_parent ($self); 1613 for my $child (@widgets) {
1293 $self->{children}[$y][$x] = $child; 1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1294 1617
1295 $self->realloc; 1618 $self->SUPER::add (@widgets);
1296} 1619}
1297 1620
1298sub 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 {
1299 my ($self, $child) = @_; 1639 my ($self) = @_;
1300 1640
1301 # TODO: not yet implemented 1641 my (@w, @h);
1302}
1303
1304# TODO: move to container class maybe? send children a signal on removal?
1305sub clear {
1306 my ($self) = @_;
1307 1642
1308 my @children = $self->children; 1643 my @children = $self->children;
1309 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 }
1310 1654 }
1311 for (@children) {
1312 delete $_->{parent};
1313 $_->hide;
1314 }
1315 1655
1316 $self->realloc; 1656 # second pass, rows
1317} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1318
1319sub get_wh {
1320 my ($self) = @_;
1321
1322 my (@w, @h);
1323
1324 for my $y (0 .. $#{$self->{children}}) {
1325 my $row = $self->{children}[$y]
1326 or next;
1327
1328 for my $x (0 .. $#$row) {
1329 my $widget = $row->[$x]
1330 or next;
1331 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1332 1659
1333 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1334 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335 } 1664 }
1336 } 1665 }
1337 1666
1338 (\@w, \@h) 1667 (\@w, \@h)
1339} 1668}
… …
1355 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1356 1685
1357 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1359 1688
1360 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1361 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1364 1693
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1695
1369 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
1370 CFClient::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1371 1705
1372 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373 1708
1374 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1375 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)};
1376 or next;
1377 1711
1378 my $x = 0; 1712 $widget->configure (
1379 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380 1715 );
1381 for my $c (0 .. $#$row) { 1716 }
1382 my $col_w = $ws->[$c];
1383 1717
1384 if (my $widget = $row->[$c]) { 1718 1
1385 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1386 }
1387 1720
1388 $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};
1389 } 1748 }
1749 }
1390 1750
1391 $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});
1392 } 1782 }
1393 1783
1394 1 1784 1
1395} 1785}
1396 1786
1397sub find_widget {
1398 my ($self, $x, $y) = @_;
1399
1400 $x -= $self->{x};
1401 $y -= $self->{y};
1402
1403 my $res;
1404
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406 $res = $_->find_widget ($x, $y)
1407 and return $res;
1408 }
1409
1410 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411}
1412
1413sub _draw {
1414 my ($self) = @_;
1415
1416 for (grep $_, @{$self->{children}}) {
1417 $_->draw for grep $_, @$_;
1418 }
1419}
1420
1421############################################################################# 1787#############################################################################
1422 1788
1423package CFClient::UI::Box; 1789package DC::UI::Box;
1424 1790
1425our @ISA = CFClient::UI::Container::; 1791our @ISA = DC::UI::Container::;
1426 1792
1427sub size_request { 1793sub size_request {
1428 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1429 1797
1430 $self->{vertical} 1798 $self->{vertical}
1431 ? ( 1799 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1434 ) 1802 )
1435 : ( 1803 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1438 ) 1806 )
1439} 1807}
1440 1808
1441sub invoke_size_allocate { 1809sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1463 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1832 for 0 .. $#children;
1465 } 1833 }
1466 } 1834 }
1467 1835
1468 CFClient::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1469 1837
1470 my $pos = 0; 1838 my $pos = 0;
1471 for (0 .. $#children) { 1839 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1473 $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));
… …
1478 1 1846 1
1479} 1847}
1480 1848
1481############################################################################# 1849#############################################################################
1482 1850
1483package CFClient::UI::HBox; 1851package DC::UI::HBox;
1484 1852
1485our @ISA = CFClient::UI::Box::; 1853our @ISA = DC::UI::Box::;
1486 1854
1487sub new { 1855sub new {
1488 my $class = shift; 1856 my $class = shift;
1489 1857
1490 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1493 ) 1861 )
1494} 1862}
1495 1863
1496############################################################################# 1864#############################################################################
1497 1865
1498package CFClient::UI::VBox; 1866package DC::UI::VBox;
1499 1867
1500our @ISA = CFClient::UI::Box::; 1868our @ISA = DC::UI::Box::;
1501 1869
1502sub new { 1870sub new {
1503 my $class = shift; 1871 my $class = shift;
1504 1872
1505 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1508 ) 1876 )
1509} 1877}
1510 1878
1511############################################################################# 1879#############################################################################
1512 1880
1513package CFClient::UI::Label; 1881package DC::UI::Label;
1514 1882
1515our @ISA = CFClient::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1516 1884
1517use CFClient::OpenGL; 1885use DC::OpenGL;
1518 1886
1519sub new { 1887sub new {
1520 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1521 1889
1522 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1893 #active_bg => none
1526 #font => default_font 1894 #font => default_font
1527 #text => initial text 1895 #text => initial text
1528 #markup => initial narkup 1896 #markup => initial narkup
1529 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1898 #style => 0, # render flags
1530 ellipsise => 3, # end 1899 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1900 layout => (new DC::Layout),
1532 fontsize => 1, 1901 fontsize => 1,
1533 align => -1, 1902 align => 0.5,
1534 valign => -1, 1903 valign => 0.5,
1535 padding_x => 2, 1904 padding_x => 4,
1536 padding_y => 2, 1905 padding_y => 2,
1537 can_events => 0, 1906 can_events => 0,
1538 %arg 1907 %arg
1539 ); 1908 );
1540 1909
1541 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1911 my $layout = new DC::Layout;
1543 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1913 $self->{template} = $layout;
1545 } 1914 }
1546 1915
1547 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1551 } 1920 }
1552 1921
1553 $self 1922 $self
1554} 1923}
1555 1924
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1925sub update {
1567 my ($self) = @_; 1926 my ($self) = @_;
1568 1927
1569 delete $self->{texture}; 1928 delete $self->{texture};
1570 $self->SUPER::update; 1929 $self->SUPER::update;
… …
1575 1934
1576 delete $self->{ox}; 1935 delete $self->{ox};
1577 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1578} 1937}
1579 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1580sub set_text { 1945sub set_text {
1581 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1582 1947
1583 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1585 1950
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1588 1952
1589 delete $self->{size_req}; 1953 delete $self->{size_req};
1590 $self->realloc; 1954 $self->realloc;
1591 $self->update; 1955 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1599 1963
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1965
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1604 1967
1605 delete $self->{size_req}; 1968 delete $self->{size_req};
1606 $self->realloc; 1969 $self->realloc;
1607 $self->update; 1970 $self->update;
… …
1609 1972
1610sub size_request { 1973sub size_request {
1611 my ($self) = @_; 1974 my ($self) = @_;
1612 1975
1613 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1614 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1615 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1616 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1619 1984
1620 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1621 1986
1622 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1991
1626 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1627 1993
1628 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1652 2018
1653sub set_fontsize { 2019sub set_fontsize {
1654 my ($self, $fontsize) = @_; 2020 my ($self, $fontsize) = @_;
1655 2021
1656 $self->{fontsize} = $fontsize; 2022 $self->{fontsize} = $fontsize;
2023 delete $self->{size_req};
1657 delete $self->{texture}; 2024 delete $self->{texture};
1658 2025
1659 $self->realloc; 2026 $self->realloc;
1660} 2027}
1661 2028
1662sub reconfigure { 2029sub reconfigure {
1663 my ($self) = @_; 2030 my ($self) = @_;
1664 2031
1665 delete $self->{size_req}; 2032 delete $self->{size_req};
2033 delete $self->{texture};
1666 2034
1667 $self->SUPER::reconfigure; 2035 $self->SUPER::reconfigure;
1668} 2036}
1669 2037
1670sub _draw { 2038sub _draw {
1671 my ($self) = @_; 2039 my ($self) = @_;
1672 2040
1673 $self->SUPER::_draw; # draw background, if applicable 2041 $self->SUPER::_draw; # draw background, if applicable
1674 2042
1675 my $tex = $self->{texture} ||= do { 2043 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2044 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2045 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2046 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2047 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2048 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2050
1683 new_from_layout CFClient::Texture $self->{layout} 2051 [$self->{layout}->size]
1684 }; 2052 };
1685 2053
1686 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1687 $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);
1688 : $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);
1689 : ($self->{w} - $tex->{w}) * 0.5);
1690 2057
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5);
1694 }; 2059 };
1695 2060
1696 glEnable GL_TEXTURE_2D; 2061# unless ($self->{list}) {
1697 2062# $self->{list} = DC::OpenGL::glGenList;
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2063# DC::OpenGL::glNewList $self->{list};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1700 2065# DC::OpenGL::glEndList;
1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 } 2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
1709 2069
1710 glDisable GL_TEXTURE_2D; 2070 $self->{layout}->draw;
1711} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1712 2080
1713############################################################################# 2081#############################################################################
1714 2082
1715package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1716 2084
1717our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1718 2086
1719use CFClient::OpenGL; 2087use DC::OpenGL;
1720 2088
1721sub new { 2089sub new {
1722 my $class = shift; 2090 my $class = shift;
1723 2091
1724 $class->SUPER::new ( 2092 $class->SUPER::new (
1725 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1726 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1727 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1728 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1729 can_hover => 1, 2099 can_hover => 1,
1730 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1731 valign => 0, 2102 valign => 0.5,
1732 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1733 #text => ... 2107 #text => ...
1734 #hidden => "*", 2108 #hidden => "*",
1735 @_ 2109 @_
1736 ) 2110 )
1737} 2111}
… …
1782 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1784 2158
1785 my $text = $self->get_text; 2159 my $text = $self->get_text;
1786 2160
2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
1787 if ($uni == 8) { 2163 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
2177 } elsif ($sym == DC::SDLK_END) {
2178 # uh, again
2179 $self->{cursor} =
2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
2183 } elsif ($uni == 21) { # ctrl-u
2184 $text = "";
1796 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2187 $self->emit ('escape');
1801 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2192 } else {
1804 return 0; 2193 return 0;
1805 } 2194 }
1806 2195
1807 $self->_set_text ($text); 2196 $self->_set_text ($text);
1808 2197
1809 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1810 2200
1811 1 2201 1
1812} 2202}
1813 2203
1814sub invoke_focus_in { 2204sub invoke_focus_in {
… …
1826 2216
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2217 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2218
1829 # byte-index to char-index 2219 # byte-index to char-index
1830 my $text = $self->{text}; 2220 my $text = $self->{text};
1831 utf8::encode $text; 2221 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2222 $self->{cursor} = length $text;
1833 2223
1834 $self->_set_text ($self->{text}); 2224 $self->_set_text ($self->{text});
1835 $self->update; 2225 $self->update;
1836 2226
1837 1 2227 1
… …
1856 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1857 } 2247 }
1858 2248
1859 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1861 glBegin GL_QUADS;
1862 glVertex 0 , 0;
1863 glVertex 0 , $self->{h};
1864 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1865 glVertex $self->{w}, 0;
1866 glEnd;
1867 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1868 2253
1869 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1870 2255
1871 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1873 2258
1874 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1875 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1876 utf8::encode $text; 2261 utf8::encode $text;
1877 2262
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1879 } 2264 }
1880 2265
1881 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1882 glBegin GL_LINES; 2267 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2270 glEnd;
1886 }
1887}
1888 2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1889package CFClient::UI::Entry; 2290package DC::UI::Entry;
1890 2291
1891our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1892 2293
1893use CFClient::OpenGL; 2294use DC::OpenGL;
1894 2295
1895sub invoke_key_down { 2296sub invoke_key_down {
1896 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
1897 2298
1898 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
1899 2300
1900 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
1903 2304
1904 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2307 $self->emit (activate => $txt);
1907 $self->update; 2308 $self->update;
1908 2309
1909 } elsif ($sym == CFClient::SDLK_UP) { 2310 } elsif ($sym == DC::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
1912 } 2313 }
1913 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2318 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2320 }
1920 2321
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2322 } elsif ($sym == DC::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2325
1925 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2336 1
1936} 2337}
1937 2338
1938############################################################################# 2339#############################################################################
1939 2340
1940package CFClient::UI::Button; 2341package DC::UI::TextEdit;
1941 2342
1942our @ISA = CFClient::UI::Label::; 2343our @ISA = DC::UI::EntryBase::;
1943 2344
1944use CFClient::OpenGL; 2345use DC::OpenGL;
1945
1946my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png);
1949 2346
1950sub new { 2347sub new {
1951 my $class = shift; 2348 my $class = shift;
1952 2349
1953 $class->SUPER::new ( 2350 $class->SUPER::new (
1954 padding_x => 4,
1955 padding_y => 4, 2351 padding_y => 4,
1956 fg => [1, 1, 1], 2352
1957 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 (
1958 can_hover => 1, 2404 can_hover => 1,
1959 align => 0, 2405 align => 0.5,
1960 valign => 0, 2406 valign => 0.5,
1961 can_events => 1, 2407 can_events => 1,
1962 @_ 2408 @_
1963 ) 2409 )
1964} 2410}
1965 2411
… …
1974} 2420}
1975 2421
1976sub _draw { 2422sub _draw {
1977 my ($self) = @_; 2423 my ($self) = @_;
1978 2424
1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1980
1981 glEnable GL_TEXTURE_2D; 2425 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2427 glColor 0, 0, 0, 1;
1984 2428
2429 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2430 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2431
1987 glDisable GL_TEXTURE_2D; 2432 glDisable GL_TEXTURE_2D;
1988 2433
1989 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
1990} 2435}
1991 2436
1992############################################################################# 2437#############################################################################
1993 2438
1994package CFClient::UI::ImageButton; 2439package DC::UI::Button;
1995 2440
1996our @ISA = CFClient::UI::Image::; 2441our @ISA = DC::UI::Label::;
1997 2442
1998use CFClient::OpenGL; 2443use DC::OpenGL;
1999 2444
2000my %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);
2001 2448
2002sub new { 2449sub new {
2003 my $class = shift; 2450 my $class = shift;
2004 2451
2005 my $self = $class->SUPER::new ( 2452 $class->SUPER::new (
2006 padding_x => 4, 2453 padding_x => 8,
2007 padding_y => 4, 2454 padding_y => 4,
2008 fg => [1, 1, 1], 2455 fg => [1.0, 1.0, 1.0],
2009 active_fg => [0, 0, 1], 2456 active_fg => [0.8, 0.8, 0.8],
2010 can_hover => 1, 2457 can_hover => 1,
2011 align => 0, 2458 align => 0.5,
2012 valign => 0, 2459 valign => 0.5,
2013 can_events => 1, 2460 can_events => 1,
2014 @_ 2461 @_
2015 ); 2462 )
2016} 2463}
2017 2464
2018sub invoke_button_up { 2465sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_; 2466 my ($self, $ev, $x, $y) = @_;
2020 2467
… …
2023 && $y >= 0 && $y < $self->{h}; 2470 && $y >= 0 && $y < $self->{h};
2024 2471
2025 1 2472 1
2026} 2473}
2027 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
2028############################################################################# 2492#############################################################################
2029 2493
2030package CFClient::UI::CheckBox; 2494package DC::UI::CheckBox;
2031 2495
2032our @ISA = CFClient::UI::DrawBG::; 2496our @ISA = DC::UI::DrawBG::;
2033 2497
2034my @tex = 2498my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2499 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2500 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037 2501
2038use CFClient::OpenGL; 2502use DC::OpenGL;
2039 2503
2040sub new { 2504sub new {
2041 my $class = shift; 2505 my $class = shift;
2042 2506
2043 $class->SUPER::new ( 2507 $class->SUPER::new (
… …
2057 my ($self) = @_; 2521 my ($self) = @_;
2058 2522
2059 (6) x 2 2523 (6) x 2
2060} 2524}
2061 2525
2526sub toggle {
2527 my ($self) = @_;
2528
2529 $self->{state} = !$self->{state};
2530 $self->emit (changed => $self->{state});
2531 $self->update;
2532}
2533
2062sub invoke_button_down { 2534sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_; 2535 my ($self, $ev, $x, $y) = @_;
2064 2536
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2537 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2538 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state}; 2539 $self->toggle;
2068 $self->emit (changed => $self->{state});
2069 } else { 2540 } else {
2070 return 0 2541 return 0
2071 } 2542 }
2072 2543
2073 1 2544 1
… …
2076sub _draw { 2547sub _draw {
2077 my ($self) = @_; 2548 my ($self) = @_;
2078 2549
2079 $self->SUPER::_draw; 2550 $self->SUPER::_draw;
2080 2551
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2552 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2082 2553
2083 my ($w, $h) = @$self{qw(w h)}; 2554 my ($w, $h) = @$self{qw(w h)};
2084 2555
2085 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;
2086 2557
… …
2093 glDisable GL_TEXTURE_2D; 2564 glDisable GL_TEXTURE_2D;
2094} 2565}
2095 2566
2096############################################################################# 2567#############################################################################
2097 2568
2098package CFClient::UI::Image; 2569package DC::UI::Image;
2099 2570
2100our @ISA = CFClient::UI::Base::; 2571our @ISA = DC::UI::Base::;
2101 2572
2102use CFClient::OpenGL; 2573use DC::OpenGL;
2103 2574
2104our %texture_cache; 2575our %texture_cache;
2105 2576
2106sub new { 2577sub new {
2107 my $class = shift; 2578 my $class = shift;
2108 2579
2109 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2110 can_events => 0, 2581 can_events => 0,
2582 scale => 1,
2111 @_, 2583 @_,
2112 ); 2584 );
2113 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
2114 $self->{path} 2602 $self->{path}
2115 or Carp::croak "required attribute 'path' not set"; 2603 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2116 2604
2117 $self->{tex} = $texture_cache{$self->{path}} ||= 2605 $self->{path}
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2606}
2119 2607
2120 Scalar::Util::weaken $texture_cache{$self->{path}}; 2608sub STORABLE_attach {
2609 my ($self, $cloning, $path) = @_;
2121 2610
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2611 $self->new (path => $path)
2123
2124 $self
2125} 2612}
2126 2613
2127sub size_request { 2614sub size_request {
2128 my ($self) = @_; 2615 my ($self) = @_;
2129 2616
2130 ($self->{tex}{w}, $self->{tex}{h}) 2617 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2131} 2618}
2132 2619
2133sub _draw { 2620sub _draw {
2134 my ($self) = @_; 2621 my ($self) = @_;
2135 2622
… …
2152 glDisable GL_TEXTURE_2D; 2639 glDisable GL_TEXTURE_2D;
2153} 2640}
2154 2641
2155############################################################################# 2642#############################################################################
2156 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
2157package CFClient::UI::VGauge; 2686package DC::UI::VGauge;
2158 2687
2159our @ISA = CFClient::UI::Base::; 2688our @ISA = DC::UI::Base::;
2160 2689
2161use List::Util qw(min max); 2690use List::Util qw(min max);
2162 2691
2163use CFClient::OpenGL; 2692use DC::OpenGL;
2164 2693
2165my %tex = ( 2694my %tex = (
2166 food => [ 2695 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2697 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2698 ],
2170 grace => [ 2699 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2172 qw/g1_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/
2173 ], 2702 ],
2174 hp => [ 2703 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2705 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2706 ],
2178 mana => [ 2707 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2708 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2180 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/
2181 ], 2710 ],
2182); 2711);
2183 2712
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2713# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2773 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2774 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2775
2247 my $h1 = $self->{h} * (1 - $ycut1); 2776 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2777 my $h2 = $self->{h} * (1 - $ycut2);
2778 my $h3 = $self->{h};
2779
2780 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2781
2250 glEnable GL_BLEND; 2782 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2783 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2784 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2785 glEnable GL_TEXTURE_2D;
… …
2272 2804
2273 if ($t3) { 2805 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2806 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2807 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2808 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2809 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2810 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2811 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2812 glEnd;
2281 } 2813 }
2282 2814
2283 glDisable GL_BLEND; 2815 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2816 glDisable GL_TEXTURE_2D;
2285} 2817}
2286 2818
2287############################################################################# 2819#############################################################################
2288 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
2289package CFClient::UI::Gauge; 2959package DC::UI::Gauge;
2290 2960
2291our @ISA = CFClient::UI::VBox::; 2961our @ISA = DC::UI::VBox::;
2292 2962
2293sub new { 2963sub new {
2294 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2295 2965
2296 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2968 can_hover => 1,
2299 can_events => 1, 2969 can_events => 1,
2300 %arg, 2970 %arg,
2301 ); 2971 );
2302 2972
2303 $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");
2304 $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);
2305 $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");
2306 2976
2307 $self 2977 $self
2308} 2978}
2309 2979
2310sub set_fontsize { 2980sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 3001 $self->{value}->set_text ($val);
2332} 3002}
2333 3003
2334############################################################################# 3004#############################################################################
2335 3005
2336package CFClient::UI::Slider; 3006package DC::UI::Slider;
2337 3007
2338use strict; 3008use strict;
2339 3009
2340use CFClient::OpenGL; 3010use DC::OpenGL;
2341 3011
2342our @ISA = CFClient::UI::DrawBG::; 3012our @ISA = DC::UI::DrawBG::;
2343 3013
2344my @tex = 3014my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3015 map { new_from_file DC::Texture DC::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 3016 qw(s1_slider.png s1_slider_bg.png);
2347 3017
2348sub new { 3018sub new {
2349 my $class = shift; 3019 my $class = shift;
2350 3020
… …
2418 3088
2419 $self->SUPER::invoke_button_down ($ev, $x, $y); 3089 $self->SUPER::invoke_button_down ($ev, $x, $y);
2420 3090
2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3091 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422 3092
2423 $self->invoke_mouse_motion ($ev, $x, $y) 3093 $self->invoke_mouse_motion ($ev, $x, $y);
3094
3095 1
2424} 3096}
2425 3097
2426sub invoke_mouse_motion { 3098sub invoke_mouse_motion {
2427 my ($self, $ev, $x, $y) = @_; 3099 my ($self, $ev, $x, $y) = @_;
2428 3100
… …
2435 3107
2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3108 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else { 3109 } else {
2438 return 0; 3110 return 0;
2439 } 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);
2440 3124
2441 1 3125 1
2442} 3126}
2443 3127
2444sub update { 3128sub update {
… …
2495 glDisable GL_TEXTURE_2D; 3179 glDisable GL_TEXTURE_2D;
2496} 3180}
2497 3181
2498############################################################################# 3182#############################################################################
2499 3183
2500package CFClient::UI::ValSlider; 3184package DC::UI::ValSlider;
2501 3185
2502our @ISA = CFClient::UI::HBox::; 3186our @ISA = DC::UI::HBox::;
2503 3187
2504sub new { 3188sub new {
2505 my ($class, %arg) = @_; 3189 my ($class, %arg) = @_;
2506 3190
2507 my $range = delete $arg{range}; 3191 my $range = delete $arg{range};
2508 3192
2509 my $self = $class->SUPER::new ( 3193 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3194 slider => (new DC::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3195 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 3196 to_value => sub { shift },
2513 from_value => sub { shift }, 3197 from_value => sub { shift },
2514 %arg, 3198 %arg,
2515 ); 3199 );
2516 3200
… …
2536sub set_range { shift->{slider}->set_range (@_) } 3220sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 3221sub set_value { shift->{slider}->set_value (@_) }
2538 3222
2539############################################################################# 3223#############################################################################
2540 3224
2541package CFClient::UI::TextScroller; 3225package DC::UI::TextScroller;
2542 3226
2543our @ISA = CFClient::UI::HBox::; 3227our @ISA = DC::UI::HBox::;
2544 3228
2545use CFClient::OpenGL; 3229use DC::OpenGL;
2546 3230
2547sub new { 3231sub new {
2548 my $class = shift; 3232 my $class = shift;
2549 3233
2550 my $self = $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
2551 fontsize => 1, 3235 fontsize => 1,
2552 can_events => 0, 3236 can_events => 1,
2553 indent => 0, 3237 indent => 0,
2554 #font => default_font 3238 #font => default_font
2555 @_, 3239 @_,
2556 3240
2557 layout => (new CFClient::Layout 1), 3241 layout => (new DC::Layout),
2558 par => [], 3242 par => [],
3243 max_par => 0,
2559 height => 0, 3244 height => 0,
2560 children => [ 3245 children => [
2561 (new CFClient::UI::Empty expand => 1), 3246 (new DC::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 3247 (new DC::UI::Slider vertical => 1),
2563 ], 3248 ],
2564 ); 3249 );
2565 3250
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 3251 $self->{children}[1]->connect (changed => sub { $self->update });
2567 3252
… …
2576} 3261}
2577 3262
2578sub size_request { 3263sub size_request {
2579 my ($self) = @_; 3264 my ($self) = @_;
2580 3265
2581 my ($empty, $slider) = @{ $self->{children} }; 3266 my ($empty, $slider) = $self->visible_children;
2582 3267
2583 local $self->{children} = [$empty, $slider]; 3268 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request 3269 $self->SUPER::size_request
2585} 3270}
2586 3271
… …
2597 3282
2598 $self->reflow; 3283 $self->reflow;
2599 3284
2600 local $self->{children} = [$empty, $slider]; 3285 local $self->{children} = [$empty, $slider];
2601 $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
2602} 3297}
2603 3298
2604sub get_layout { 3299sub get_layout {
2605 my ($self, $para) = @_; 3300 my ($self, $para) = @_;
2606 3301
… …
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3308 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2614 $layout->set_markup ($para->{markup}); 3309 $layout->set_markup ($para->{markup});
2615 3310
2616 $layout->set_shapes ( 3311 $layout->set_shapes (
2617 map 3312 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3313 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}} 3314 @{$para->{widget}}
2620 ); 3315 );
2621 3316
2622 $layout 3317 $layout
2623} 3318}
… …
2632sub set_offset { 3327sub set_offset {
2633 my ($self, $offset) = @_; 3328 my ($self, $offset) = @_;
2634 3329
2635 # todo: base offset on lines or so, not on pixels 3330 # todo: base offset on lines or so, not on pixels
2636 $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;
2637} 3347}
2638 3348
2639sub clear { 3349sub clear {
2640 my ($self) = @_; 3350 my ($self) = @_;
2641 3351
… …
2646 $self->{height} = 0; 3356 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3358}
2649 3359
2650sub add_paragraph { 3360sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3361 my $self = shift;
2652 3362
2653 my ($text, @w) = ref $para ? @$para : $para; 3363 for my $para (@_) {
2654
2655 $para = { 3364 $para = {
3365 fg => [1, 1, 1, 1],
3366 indent => 0,
3367 markup => "",
3368 widget => [],
3369 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3370 w => 1e10,
2657 wrapped => 1, 3371 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3372 };
2663 3373
2664 $self->add (@w) if @w; 3374 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 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 }
2666 3381
2667 $self->{need_reflow}++; 3382 $self->{need_reflow}++;
2668 $self->update; 3383 $self->update;
2669} 3384}
2670 3385
2671sub scroll_to_bottom { 3386sub scroll_to_bottom {
2672 my ($self) = @_; 3387 my ($self) = @_;
2673 3388
2674 $self->{scroll_to_bottom} = 1; 3389 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3390 $self->update;
2676} 3391}
2677 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
2678sub update { 3426sub update {
2679 my ($self) = @_; 3427 my ($self) = @_;
2680 3428
2681 $self->SUPER::update; 3429 $self->SUPER::update;
2682 3430
2683 return unless $self->{h} > 0; 3431 return unless $self->{h} > 0;
2684 3432
2685 delete $self->{texture}; 3433 delete $self->{texture};
2686 3434
2687 $ROOT->on_post_alloc ($self => sub { 3435 $ROOT->on_post_alloc ($self => sub {
3436 $self->force_uptodate;
3437
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3438 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3439
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3440 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3441 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3442 glClear GL_COLOR_BUFFER_BIT;
2720 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;
2721 my $top = int $self->{children}[1]{range}[0]; 3452 my $top = int $self->{children}[1]{range}[0];
2722 3453
2723 my $y0 = $top; 3454 my $y0 = $top;
2724 my $y1 = $top + $H; 3455 my $y1 = $top + $H;
2725 3456
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3457 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3458 my $h = $para->{h};
3459 my $y = $para->{y};
2734 3460
2735 if ($y0 < $y + $h && $y < $y1) { 3461 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3462 my $layout = $self->get_layout ($para);
2738 3463
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3464 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3465 $layout->draw;
2743 3466
2744 if (my @w = @{ $para->{widget} }) { 3467 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3468 my @s = $layout->get_shapes;
2746 3469
2747 for (@w) { 3470 for (@w) {
… …
2753 $_->draw; 3476 $_->draw;
2754 } 3477 }
2755 } 3478 }
2756 } 3479 }
2757 3480
2758 $y += $h; 3481 $paridx++;
3482 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3483 }
2760 3484
2761 glDisable GL_BLEND; 3485 $self->{top_paragraph} = $top_paragraph;
2762 }; 3486 };
2763 }); 3487 });
2764} 3488}
2765 3489
2766sub reconfigure { 3490sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3508 $self->{children}[1]->draw;
2785} 3509}
2786 3510
2787############################################################################# 3511#############################################################################
2788 3512
2789package CFClient::UI::Animator; 3513package DC::UI::Animator;
2790 3514
2791use CFClient::OpenGL; 3515use DC::OpenGL;
2792 3516
2793our @ISA = CFClient::UI::Bin::; 3517our @ISA = DC::UI::Bin::;
2794 3518
2795sub moveto { 3519sub moveto {
2796 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
2797 3521
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3522 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3550 glPopMatrix;
2827} 3551}
2828 3552
2829############################################################################# 3553#############################################################################
2830 3554
2831package CFClient::UI::Flopper; 3555package DC::UI::Flopper;
2832 3556
2833our @ISA = CFClient::UI::Button::; 3557our @ISA = DC::UI::Button::;
2834 3558
2835sub new { 3559sub new {
2836 my $class = shift; 3560 my $class = shift;
2837 3561
2838 my $self = $class->SUPER::new ( 3562 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3574 $self->{other}->toggle_visibility;
2851} 3575}
2852 3576
2853############################################################################# 3577#############################################################################
2854 3578
2855package CFClient::UI::Tooltip; 3579package DC::UI::Tooltip;
2856 3580
2857our @ISA = CFClient::UI::Bin::; 3581our @ISA = DC::UI::Bin::;
2858 3582
2859use CFClient::OpenGL; 3583use DC::OpenGL;
2860 3584
2861sub new { 3585sub new {
2862 my $class = shift; 3586 my $class = shift;
2863 3587
2864 $class->SUPER::new ( 3588 $class->SUPER::new (
… …
2868} 3592}
2869 3593
2870sub set_tooltip_from { 3594sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3595 my ($self, $widget) = @_;
2872 3596
2873 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 =~ /^#(.*)$/;
2874 3602
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3603 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3604 $tip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3605 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n" 3606 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}"; 3607 . "visible $widget->{visible}";
2880 } 3608 }
2881 3609
2882 $tooltip =~ s/^\n+//; 3610 $tip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3611 $tip =~ s/\n+$//;
2884 3612
2885 $self->add (new CFClient::UI::Label 3613 $self->add (new DC::UI::Label
2886 markup => $tooltip, 3614 markup => $tip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3615 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3616 align => 0,
2888 fontsize => 0.8, 3617 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3618 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3619 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3620 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3621 );
2893} 3622}
2894 3623
… …
2913 3642
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3643 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3644 my $widget = $self->{owner}
2916 or return; 3645 or return;
2917 3646
3647 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3648 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3649
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3650 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3651 if $x + $self->{w} > $self->{root}{w};
2922 3652
2923 $self->move_abs ($x, $y); 3653 $self->move_abs ($x, $y);
3654 } else {
3655 $self->hide;
3656 }
2924 }); 3657 });
2925} 3658}
2926 3659
2927sub _draw { 3660sub _draw {
2928 my ($self) = @_; 3661 my ($self) = @_;
2929 3662
2930 glTranslate 0.375, 0.375;
2931
2932 my ($w, $h) = @$self{qw(w h)}; 3663 my ($w, $h) = @$self{qw(w h)};
2933 3664
2934 glColor 1, 0.8, 0.4; 3665 glColor 1, 0.8, 0.4;
2935 glBegin GL_QUADS; 3666 glRect 0, 0, $w, $h;
2936 glVertex 0 , 0;
2937 glVertex 0 , $h;
2938 glVertex $w, $h;
2939 glVertex $w, 0;
2940 glEnd;
2941 3667
2942 glColor 0, 0, 0; 3668 glColor 0, 0, 0;
2943 glBegin GL_LINE_LOOP; 3669 glRect_lineloop .5, .5, $w + .5, $h + .5;
2944 glVertex 0 , 0;
2945 glVertex 0 , $h;
2946 glVertex $w, $h;
2947 glVertex $w, 0;
2948 glEnd;
2949 3670
2950 glTranslate 2 - 0.375, 2 - 0.375; 3671 glTranslate 2, 2;
2951 3672
2952 $self->SUPER::_draw; 3673 $self->SUPER::_draw;
2953} 3674}
2954 3675
2955############################################################################# 3676#############################################################################
2956 3677
2957package CFClient::UI::Face; 3678package DC::UI::Face;
2958 3679
2959our @ISA = CFClient::UI::Base::; 3680our @ISA = DC::UI::DrawBG::;
2960 3681
2961use CFClient::OpenGL; 3682use DC::OpenGL;
2962 3683
2963sub new { 3684sub new {
2964 my $class = shift; 3685 my $class = shift;
2965 3686
2966 my $self = $class->SUPER::new ( 3687 my $self = $class->SUPER::new (
3688 size_w => 32,
3689 size_h => 8,
2967 aspect => 1, 3690 aspect => 1,
2968 can_events => 0, 3691 can_events => 0,
2969 @_, 3692 @_,
2970 ); 3693 );
2971 3694
2972 if ($self->{anim} && $self->{animspeed}) { 3695 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3696 DC::weaken (my $widget = $self);
2974 3697
2975 $self->{timer} = Event->timer ( 3698 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3699 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2977 hard => 1, 3700 return unless $::CONN;
2978 interval => $self->{animspeed}, 3701
2979 cb => sub { 3702 my $w = $widget
3703 or return;
3704
2980 ++$widget->{frame}; 3705 ++$w->{frame};
3706 $w->update_face;
3707
3708 # somehow, $widget can go away
2981 $widget->update; 3709 $w->update;
2982 }, 3710 $w->update_timer;
2983 ); 3711 };
3712
3713 $self->update_face;
3714 $self->update_timer;
2984 } 3715 }
2985 3716
2986 $self 3717 $self
2987} 3718}
2988 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
2989sub size_request { 3751sub size_request {
2990 (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)
2991} 3769}
2992 3770
2993sub update { 3771sub update {
2994 my ($self) = @_; 3772 my ($self) = @_;
2995 3773
2996 return unless $self->{visible}; 3774 return unless $self->{visible};
2997 3775
2998 $self->SUPER::update; 3776 $self->SUPER::update;
2999} 3777}
3000 3778
3779sub invoke_visibility_change {
3780 my ($self) = @_;
3781
3782 $self->update_timer;
3783
3784 0
3785}
3786
3001sub _draw { 3787sub _draw {
3002 my ($self) = @_; 3788 my ($self) = @_;
3003 3789
3004 return unless $::CONN; 3790 $self->SUPER::_draw;
3005 3791
3006 my $face; 3792 if (my $tex = $self->{tex}) {
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3793 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3795 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3796 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3797 glDisable GL_TEXTURE_2D;
… …
3024} 3799}
3025 3800
3026sub destroy { 3801sub destroy {
3027 my ($self) = @_; 3802 my ($self) = @_;
3028 3803
3029 $self->{timer}->cancel 3804 (delete $self->{timer})->cancel
3030 if $self->{timer}; 3805 if $self->{timer};
3031 3806
3032 $self->SUPER::destroy; 3807 $self->SUPER::destroy;
3033} 3808}
3034 3809
3035############################################################################# 3810#############################################################################
3036 3811
3037package CFClient::UI::Buttonbar; 3812package DC::UI::Buttonbar;
3038 3813
3039our @ISA = CFClient::UI::HBox::; 3814our @ISA = DC::UI::HBox::;
3040 3815
3041# TODO: should actualyl wrap buttons and other goodies. 3816# TODO: should actually wrap buttons and other goodies.
3042 3817
3043############################################################################# 3818#############################################################################
3044 3819
3045package CFClient::UI::Menu; 3820package DC::UI::Menu;
3046 3821
3047our @ISA = CFClient::UI::FancyFrame::; 3822our @ISA = DC::UI::Toplevel::;
3048 3823
3049use CFClient::OpenGL; 3824use DC::OpenGL;
3050 3825
3051sub new { 3826sub new {
3052 my $class = shift; 3827 my $class = shift;
3053 3828
3054 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
3055 items => [], 3830 items => [],
3056 z => 100, 3831 z => 100,
3057 @_, 3832 @_,
3058 ); 3833 );
3059 3834
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3835 $self->add ($self->{vbox} = new DC::UI::VBox);
3061 3836
3062 for my $item (@{ $self->{items} }) { 3837 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3838 my ($widget, $cb, $tooltip) = @$item;
3064 3839
3065 # handle various types of items, only text for now 3840 # handle various types of items, only text for now
3066 if (!ref $widget) { 3841 if (!ref $widget) {
3842 if ($widget =~ /\t/) {
3843 my ($left, $right) = split /\t/, $widget, 2;
3844
3067 $widget = new CFClient::UI::Label 3845 $widget = new DC::UI::HBox
3068 can_hover => 1, 3846 can_hover => 1,
3069 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,
3070 markup => $widget, 3860 markup => $widget,
3071 tooltip => $tooltip 3861 tooltip => $tooltip;
3862 }
3072 } 3863 }
3073 3864
3074 $self->{item}{$widget} = $item; 3865 $self->{item}{$widget} = $item;
3075 3866
3076 $self->{vbox}->add ($widget); 3867 $self->{vbox}->add ($widget);
… …
3119 1 3910 1
3120} 3911}
3121 3912
3122############################################################################# 3913#############################################################################
3123 3914
3124package CFClient::UI::Multiplexer; 3915package DC::UI::Multiplexer;
3125 3916
3126our @ISA = CFClient::UI::Container::; 3917our @ISA = DC::UI::Container::;
3127 3918
3128sub new { 3919sub new {
3129 my $class = shift; 3920 my $class = shift;
3130 3921
3131 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3145 3936
3146 $self->{current} = $self->{children}[0] 3937 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3938 if @{ $self->{children} };
3148} 3939}
3149 3940
3941sub get_current_page {
3942 my ($self) = @_;
3943
3944 $self->{current}
3945}
3946
3150sub set_current_page { 3947sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3948 my ($self, $page_or_widget) = @_;
3152 3949
3153 my $widget = ref $page_or_widget 3950 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3951 ? $page_or_widget
… …
3186 $self->{current}->draw; 3983 $self->{current}->draw;
3187} 3984}
3188 3985
3189############################################################################# 3986#############################################################################
3190 3987
3191package CFClient::UI::Notebook; 3988package DC::UI::Notebook;
3192 3989
3990use DC::OpenGL;
3991
3193our @ISA = CFClient::UI::VBox::; 3992our @ISA = DC::UI::VBox::;
3194 3993
3195sub new { 3994sub new {
3196 my $class = shift; 3995 my $class = shift;
3197 3996
3198 my $self = $class->SUPER::new ( 3997 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3998 buttonbar => (new DC::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3999 multiplexer => (new DC::UI::Multiplexer expand => 1),
4000 active_outline => [.7, .7, 0.2],
3201 # filter => # will be put between multiplexer and $self 4001 # filter => # will be put between multiplexer and $self
3202 @_, 4002 @_,
3203 ); 4003 );
3204 4004
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4005 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4006 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207 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
3208 $self 4042 $self
3209} 4043}
3210 4044
3211sub 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 add_tab {
3212 my ($self, $title, $widget, $tooltip) = @_; 4063 my ($self, $title, $widget, $tooltip) = @_;
3213 4064
3214 Scalar::Util::weaken $self; 4065 $title = [$title, $tooltip] unless ref $title;
4066 $widget->{c_tab} = $title;
3215 4067
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget); 4068 $self->add ($widget);
4069}
4070
4071sub get_current_page {
4072 my ($self) = @_;
4073
4074 $self->{multiplexer}->get_current_page
3223} 4075}
3224 4076
3225sub set_current_page { 4077sub set_current_page {
3226 my ($self, $page) = @_; 4078 my ($self, $page) = @_;
3227 4079
3228 $self->{multiplexer}->set_current_page ($page); 4080 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 4081 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 4082}
3231 4083
4084sub _draw {
4085 my ($self) = @_;
4086
4087 $self->SUPER::_draw ();
4088
4089 if (my $cur = $self->{multiplexer}{current}) {
4090 if ($cur = $cur->{c_tab_}) {
4091 glTranslate $self->{buttonbar}{x} + $cur->{x},
4092 $self->{buttonbar}{y} + $cur->{y};
4093 glLineWidth 3;
4094 #glEnable GL_BLEND;
4095 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4096 glColor @{$self->{active_outline}};
4097 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4098 glLineWidth 1;
4099 #glDisable GL_BLEND;
4100 }
4101 }
4102}
4103
3232############################################################################# 4104#############################################################################
3233 4105
3234package CFClient::UI::Combobox; 4106package DC::UI::Selector;
3235 4107
3236use utf8; 4108use utf8;
3237 4109
3238our @ISA = CFClient::UI::Button::; 4110our @ISA = DC::UI::Button::;
3239 4111
3240sub new { 4112sub new {
3241 my $class = shift; 4113 my $class = shift;
3242 4114
3243 my $self = $class->SUPER::new ( 4115 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 4132 my ($value, $title, $tooltip) = @$_;
3261 4133
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4134 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 4135 }
3264 4136
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4137 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 4138}
3267 4139
3268sub _set_value { 4140sub _set_value {
3269 my ($self, $value) = @_; 4141 my ($self, $value) = @_;
3270 4142
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4143 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4144 $item ||= $self->{options}[0]
3272 or return; 4145 or return;
3273 4146
3274 $self->{value} = $item->[0]; 4147 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓"); 4148 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]); 4149# $self->set_tooltip ($item->[2]);
3277} 4150}
3278 4151
3279sub set_value { 4152sub set_value {
3280 my ($self, $value) = @_; 4153 my ($self, $value) = @_;
3281 4154
… …
3283 4156
3284 $self->_set_value ($value); 4157 $self->_set_value ($value);
3285 $self->emit (changed => $value); 4158 $self->emit (changed => $value);
3286} 4159}
3287 4160
4161sub set_options {
4162 my ($self, $options) = @_;
4163
4164 $self->{options} = $options;
4165 $self->_set_value ($self->{value});
4166}
4167
3288############################################################################# 4168#############################################################################
3289 4169
3290package CFClient::UI::Statusbox; 4170package DC::UI::Statusbox;
3291 4171
3292our @ISA = CFClient::UI::VBox::; 4172our @ISA = DC::UI::VBox::;
3293 4173
3294sub new { 4174sub new {
3295 my $class = shift; 4175 my $class = shift;
3296 4176
3297 my $self = $class->SUPER::new ( 4177 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 4178 fontsize => 0.8,
3299 @_, 4179 @_,
3300 ); 4180 );
3301 4181
3302 Scalar::Util::weaken (my $this = $self); 4182 DC::weaken (my $this = $self);
3303 4183
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4184 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3305 4185
3306 $self 4186 $self
3307} 4187}
3308 4188
3309sub reorder { 4189sub reorder {
3310 my ($self) = @_; 4190 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 4191 my $NOW = Time::HiRes::time;
3312 4192
3313 # freeze display when hovering over any label 4193 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 4194 return if $DC::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4195 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 4196 values %{ $self->{item} };
3317 4197
3318 while (my ($k, $v) = each %{ $self->{item} }) { 4198 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4199 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 4200 }
4201
4202 $self->{timer}->set (1, 1);
3321 4203
3322 my @widgets; 4204 my @widgets;
3323 4205
3324 my @items = sort { 4206 my @items = sort {
3325 $a->{pri} <=> $b->{pri} 4207 $a->{pri} <=> $b->{pri}
3326 or $b->{id} <=> $a->{id} 4208 or $b->{id} <=> $a->{id}
3327 } values %{ $self->{item} }; 4209 } values %{ $self->{item} };
3328
3329 $self->{timer}->interval (1);
3330 4210
3331 my $count = 10 + 1; 4211 my $count = 10 + 1;
3332 for my $item (@items) { 4212 for my $item (@items) {
3333 last unless --$count; 4213 last unless --$count;
3334 4214
… …
3341 for ($short) { 4221 for ($short) {
3342 s/^\s+//; 4222 s/^\s+//;
3343 s/\s+/ /g; 4223 s/\s+/ /g;
3344 } 4224 }
3345 4225
3346 new CFClient::UI::Label 4226 new DC::UI::Label
3347 markup => $short, 4227 markup => $short,
3348 tooltip => $item->{tooltip}, 4228 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 4229 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 4230 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 4231 fontsize => $item->{fontsize} || $self->{fontsize},
3352 max_w => $::WIDTH * 0.44, 4232 max_w => $::WIDTH * 0.44,
4233 align => 0,
3353 fg => [@{ $item->{fg} }], 4234 fg => [@{ $item->{fg} }],
3354 can_events => 1, 4235 can_events => 1,
3355 can_hover => 1 4236 can_hover => 1
3356 }; 4237 };
3357 4238
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4239 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4240 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update; 4241 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff) 4242 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1; 4243 if $diff < 1;
3363 $self->{timer}->interval (1/30); 4244 $self->{timer}->set (1/30, 1/30);
3364 } else { 4245 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1; 4246 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 } 4247 }
3367 4248
3368 push @widgets, $label; 4249 push @widgets, $label;
… …
3405 count => 1, 4286 count => 1,
3406 %arg, 4287 %arg,
3407 }; 4288 };
3408 } 4289 }
3409 4290
4291 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 4292 $self->reorder;
4293 });
3411} 4294}
3412 4295
3413sub reconfigure { 4296sub reconfigure {
3414 my ($self) = @_; 4297 my ($self) = @_;
3415 4298
… …
3428 $self->SUPER::destroy; 4311 $self->SUPER::destroy;
3429} 4312}
3430 4313
3431############################################################################# 4314#############################################################################
3432 4315
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 4316package DC::UI::Root;
3806 4317
3807our @ISA = CFClient::UI::Container::; 4318our @ISA = DC::UI::Container::;
3808 4319
3809use List::Util qw(min max); 4320use List::Util qw(min max);
3810 4321
3811use CFClient::OpenGL; 4322use DC::OpenGL;
3812 4323
3813sub new { 4324sub new {
3814 my $class = shift; 4325 my $class = shift;
3815 4326
3816 my $self = $class->SUPER::new ( 4327 my $self = $class->SUPER::new (
3817 visible => 1, 4328 visible => 1,
3818 @_, 4329 @_,
3819 ); 4330 );
3820 4331
3821 Scalar::Util::weaken ($self->{root} = $self); 4332 DC::weaken ($self->{root} = $self);
3822 4333
3823 $self 4334 $self
3824} 4335}
3825 4336
3826sub size_request { 4337sub size_request {
… …
3874} 4385}
3875 4386
3876sub update { 4387sub update {
3877 my ($self) = @_; 4388 my ($self) = @_;
3878 4389
3879 $::WANT_REFRESH++; 4390 $::WANT_REFRESH = 1;
3880} 4391}
3881 4392
3882sub add { 4393sub add {
3883 my ($self, @children) = @_; 4394 my ($self, @children) = @_;
3884 4395
… …
3921 while ($self->{refresh_hook}) { 4432 while ($self->{refresh_hook}) {
3922 $_->() 4433 $_->()
3923 for values %{delete $self->{refresh_hook}}; 4434 for values %{delete $self->{refresh_hook}};
3924 } 4435 }
3925 4436
3926 if ($self->{realloc}) { 4437 while ($self->{realloc}) {
3927 my %queue; 4438 my %queue;
3928 my @queue; 4439 my @queue;
3929 my $widget; 4440 my $widget;
3930 4441
3931 outer: 4442 outer:
… …
3951 4462
3952 delete $queue{$widget+0}; 4463 delete $queue{$widget+0};
3953 4464
3954 my ($w, $h) = $widget->size_request; 4465 my ($w, $h) = $widget->size_request;
3955 4466
3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4467 $w += $widget->{padding_x} * 2;
3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4468 $h += $widget->{padding_y} * 2;
4469
4470 $w = max $widget->{min_w}, $w;
4471 $h = max $widget->{min_h}, $h;
3958 4472
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961 4475
3962 $w = $widget->{force_w} if exists $widget->{force_w}; 4476 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3978 } 4492 }
3979 } 4493 }
3980 4494
3981 delete $self->{realloc}{$widget+0}; 4495 delete $self->{realloc}{$widget+0};
3982 } 4496 }
3983 }
3984 4497
3985 while (my $size_alloc = delete $self->{size_alloc}) { 4498 while (my $size_alloc = delete $self->{size_alloc}) {
3986 my @queue = sort { $b->{visible} <=> $a->{visible} } 4499 my @queue = sort { $a->{visible} <=> $b->{visible} }
3987 values %$size_alloc; 4500 values %$size_alloc;
3988 4501
3989 while () { 4502 while () {
3990 my $widget = pop @queue || last; 4503 my $widget = pop @queue || last;
3991 4504
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4505 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4506
3994 $w = 0 if $w < 0; 4507 $w = max $widget->{min_w}, $w;
3995 $h = 0 if $h < 0; 4508 $h = max $widget->{min_h}, $h;
3996 4509
4510# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4511# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4512
4513 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4514 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4515
3997 $w = int $w + 0.5; 4516 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4517 $h = int $h + 0.5;
3999 4518
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4519 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4520 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h}; 4521 $widget->{old_h} = $widget->{h};
4003 4522
4004 $widget->{w} = $w; 4523 $widget->{w} = $w;
4005 $widget->{h} = $h; 4524 $widget->{h} = $h;
4006 4525
4007 $widget->emit (size_allocate => $w, $h); 4526 $widget->emit (size_allocate => $w, $h);
4527 }
4008 } 4528 }
4009 } 4529 }
4010 } 4530 }
4011 4531
4012 while ($self->{post_alloc_hook}) { 4532 while ($self->{post_alloc_hook}) {
4013 $_->() 4533 $_->()
4014 for values %{delete $self->{post_alloc_hook}}; 4534 for values %{delete $self->{post_alloc_hook}};
4015 } 4535 }
4016
4017 4536
4018 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4537 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4538 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020 glClear GL_COLOR_BUFFER_BIT; 4539 glClear GL_COLOR_BUFFER_BIT;
4021 4540
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4543 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4544 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4545 glLoadIdentity;
4027 4546
4028 { 4547 {
4029 package CFClient::UI::Base; 4548 package DC::UI::Base;
4030 4549
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4550 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4551 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4552
4035 $self->_draw; 4553 $self->_draw;
4554 }
4036} 4555}
4037 4556
4038############################################################################# 4557#############################################################################
4039 4558
4040package CFClient::UI; 4559package DC::UI;
4041 4560
4042$ROOT = new CFClient::UI::Root; 4561$ROOT = new DC::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4562$TOOLTIP = new DC::UI::Tooltip z => 900;
4044 4563
40451 45641
4046 4565

Diff Legend

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