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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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