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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use DC;
9use DC::Pod;
11use CFClient::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
98 117
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
125 }
101} 126}
102 127
103sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
104 my ($ev) = @_; 129 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 130
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 132
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 134
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
112 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 137
114 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 140 $grab->update if $grab;
117 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
118 142
143 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
120 } 145 }
121} 146}
122 147
123sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
124 my ($ev) = @_; 149 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
126 151
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 153
129 if ($widget != $HOVER) { 154 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 155
132 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 157 if $HOVER;
140} 158}
141 159
142# convert position array to integers 160# convert position array to integers
143sub harmonize { 161sub harmonize {
… …
193 reconfigure_widgets; 211 reconfigure_widgets;
194} 212}
195 213
196############################################################################# 214#############################################################################
197 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
198package CFClient::UI::Base; 224package DC::UI::Base;
199 225
200use strict; 226use strict;
201 227
202use CFClient::OpenGL; 228use DC::OpenGL;
203 229
204sub new { 230sub new {
205 my $class = shift; 231 my $class = shift;
206 232
207 my $self = bless { 233 my $self = bless {
… …
212 h => undef, 238 h => undef,
213 can_events => 1, 239 can_events => 1,
214 @_ 240 @_
215 }, $class; 241 }, $class;
216 242
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
218 244
219 for (keys %$self) { 245 for (keys %$self) {
220 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
222 } 248 }
223 } 249 }
224 250
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
230 256
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 259
234 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
239 265
240sub destroy { 266sub destroy {
241 my ($self) = @_; 267 my ($self) = @_;
242 268
243 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
244 %$self = (); 271 %$self = ();
245} 272}
246 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
247sub show { 278sub show {
248 my ($self) = @_; 279 my ($self) = @_;
249 280
250 return if $self->{parent}; 281 return if $self->{parent};
251 282
252 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
253} 284}
254 285
255sub set_visible { 286sub set_visible {
256 my ($self) = @_; 287 my ($self) = @_;
257 288
… …
278 delete $self->{root}; 309 delete $self->{root};
279 310
280 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
282 313
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
284 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
285 316
286 $self->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
1889sub key_down { 2296sub invoke_key_down {
1890 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
1891 2298
1892 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
1893 2300
1894 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
2304
1897 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2307 $self->emit (activate => $txt);
1900 $self->update; 2308 $self->update;
1901 2309
1902 } elsif ($sym == CFClient::SDLK_UP) { 2310 } elsif ($sym == DC::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
1905 } 2313 }
1906 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2318 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2320 }
1913 2321
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2322 } elsif ($sym == DC::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2325
1918 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2328 } else {
1921 $self->set_text ($self->{history_saveback}); 2329 $self->set_text ($self->{history_saveback});
1922 } 2330 }
1923 2331
1924 } else { 2332 } else {
1925 return $self->SUPER::key_down ($ev) 2333 return $self->SUPER::invoke_key_down ($ev)
1926 } 2334 }
1927 2335
1928 1 2336 1
1929} 2337}
1930 2338
1931############################################################################# 2339#############################################################################
1932 2340
1933package CFClient::UI::Button; 2341package DC::UI::TextEdit;
1934 2342
1935our @ISA = CFClient::UI::Label::; 2343our @ISA = DC::UI::EntryBase::;
1936 2344
1937use CFClient::OpenGL; 2345use DC::OpenGL;
1938
1939my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png);
1942 2346
1943sub new { 2347sub new {
1944 my $class = shift; 2348 my $class = shift;
1945 2349
1946 $class->SUPER::new ( 2350 $class->SUPER::new (
1947 padding_x => 4,
1948 padding_y => 4, 2351 padding_y => 4,
1949 fg => [1, 1, 1], 2352
1950 active_fg => [0, 0, 1], 2353 @_
2354 )
2355}
2356
2357sub move_cursor_ver {
2358 my ($self, $dy) = @_;
2359
2360 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2361
2362 $line += $dy;
2363
2364 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2365 $self->{cursor} = $index;
2366 delete $self->{cur_h};
2367 $self->update;
2368 return;
2369 }
2370}
2371
2372sub invoke_key_down {
2373 my ($self, $ev) = @_;
2374
2375 my $sym = $ev->{sym};
2376
2377 if ($sym == DC::SDLK_UP) {
2378 $self->move_cursor_ver (-1);
2379 } elsif ($sym == DC::SDLK_DOWN) {
2380 $self->move_cursor_ver (+1);
2381 } else {
2382 return $self->SUPER::invoke_key_down ($ev)
2383 }
2384
2385 1
2386}
2387
2388#############################################################################
2389
2390package DC::UI::ButtonBin;
2391
2392our @ISA = DC::UI::Bin::;
2393
2394use DC::OpenGL;
2395
2396my @tex =
2397 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2398 qw(b1_button_inactive.png b1_button_active.png);
2399
2400sub new {
2401 my $class = shift;
2402
2403 $class->SUPER::new (
1951 can_hover => 1, 2404 can_hover => 1,
1952 align => 0, 2405 align => 0.5,
1953 valign => 0, 2406 valign => 0.5,
1954 can_events => 1, 2407 can_events => 1,
1955 @_ 2408 @_
1956 ) 2409 )
1957} 2410}
1958 2411
1959sub activate { }
1960
1961sub button_up { 2412sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2413 my ($self, $ev, $x, $y) = @_;
1963 2414
1964 $self->emit ("activate") 2415 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2416 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2417 && $y >= 0 && $y < $self->{h};
… …
1969} 2420}
1970 2421
1971sub _draw { 2422sub _draw {
1972 my ($self) = @_; 2423 my ($self) = @_;
1973 2424
1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1975
1976 glEnable GL_TEXTURE_2D; 2425 glEnable GL_TEXTURE_2D;
1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2426 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1978 glColor 0, 0, 0, 1; 2427 glColor 0, 0, 0, 1;
1979 2428
2429 my $tex = $tex[$GRAB == $self];
1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2430 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981 2431
1982 glDisable GL_TEXTURE_2D; 2432 glDisable GL_TEXTURE_2D;
1983 2433
1984 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
1985} 2435}
1986 2436
1987############################################################################# 2437#############################################################################
1988 2438
1989package CFClient::UI::ImageButton; 2439package DC::UI::Button;
1990 2440
1991our @ISA = CFClient::UI::Image::; 2441our @ISA = DC::UI::Label::;
1992 2442
1993use CFClient::OpenGL; 2443use DC::OpenGL;
1994 2444
1995my %textures; 2445my @tex =
2446 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2447 qw(b1_button_inactive.png b1_button_active.png);
1996 2448
1997sub new { 2449sub new {
1998 my $class = shift; 2450 my $class = shift;
1999 2451
2000 my $self = $class->SUPER::new ( 2452 $class->SUPER::new (
2001 padding_x => 4, 2453 padding_x => 8,
2002 padding_y => 4, 2454 padding_y => 4,
2003 fg => [1, 1, 1], 2455 fg => [1.0, 1.0, 1.0],
2004 active_fg => [0, 0, 1], 2456 active_fg => [0.8, 0.8, 0.8],
2005 can_hover => 1, 2457 can_hover => 1,
2006 align => 0, 2458 align => 0.5,
2007 valign => 0, 2459 valign => 0.5,
2008 can_events => 1, 2460 can_events => 1,
2009 @_ 2461 @_
2010 ); 2462 )
2011} 2463}
2012 2464
2013sub activate { }
2014
2015sub button_up { 2465sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2466 my ($self, $ev, $x, $y) = @_;
2017 2467
2018 $self->emit ("activate") 2468 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2469 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2470 && $y >= 0 && $y < $self->{h};
2021 2471
2022 1 2472 1
2023} 2473}
2024 2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2479
2480 glEnable GL_TEXTURE_2D;
2481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2482 glColor 0, 0, 0, 1;
2483
2484 my $tex = $tex[$GRAB == $self];
2485 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2486
2487 glDisable GL_TEXTURE_2D;
2488
2489 $self->SUPER::_draw;
2490}
2491
2025############################################################################# 2492#############################################################################
2026 2493
2027package CFClient::UI::CheckBox; 2494package DC::UI::CheckBox;
2028 2495
2029our @ISA = CFClient::UI::DrawBG::; 2496our @ISA = DC::UI::DrawBG::;
2030 2497
2031my @tex = 2498my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2499 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2500 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034 2501
2035use CFClient::OpenGL; 2502use DC::OpenGL;
2036 2503
2037sub new { 2504sub new {
2038 my $class = shift; 2505 my $class = shift;
2039 2506
2040 $class->SUPER::new ( 2507 $class->SUPER::new (
… …
2054 my ($self) = @_; 2521 my ($self) = @_;
2055 2522
2056 (6) x 2 2523 (6) x 2
2057} 2524}
2058 2525
2526sub toggle {
2527 my ($self) = @_;
2528
2529 $self->{state} = !$self->{state};
2530 $self->emit (changed => $self->{state});
2531 $self->update;
2532}
2533
2059sub button_down { 2534sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2535 my ($self, $ev, $x, $y) = @_;
2061 2536
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2537 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2538 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2539 $self->toggle;
2065 $self->_emit (changed => $self->{state});
2066 } else { 2540 } else {
2067 return 0 2541 return 0
2068 } 2542 }
2069 2543
2070 1 2544 1
… …
2073sub _draw { 2547sub _draw {
2074 my ($self) = @_; 2548 my ($self) = @_;
2075 2549
2076 $self->SUPER::_draw; 2550 $self->SUPER::_draw;
2077 2551
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2552 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2079 2553
2080 my ($w, $h) = @$self{qw(w h)}; 2554 my ($w, $h) = @$self{qw(w h)};
2081 2555
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2556 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083 2557
… …
2090 glDisable GL_TEXTURE_2D; 2564 glDisable GL_TEXTURE_2D;
2091} 2565}
2092 2566
2093############################################################################# 2567#############################################################################
2094 2568
2095package CFClient::UI::Image; 2569package DC::UI::Image;
2096 2570
2097our @ISA = CFClient::UI::Base::; 2571our @ISA = DC::UI::Base::;
2098 2572
2099use CFClient::OpenGL; 2573use DC::OpenGL;
2100use Carp qw/confess/;
2101 2574
2102our %loaded_images; 2575our %texture_cache;
2103 2576
2104sub new { 2577sub new {
2105 my $class = shift; 2578 my $class = shift;
2106 2579
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2580 my $self = $class->SUPER::new (
2581 can_events => 0,
2582 scale => 1,
2583 @_,
2584 );
2108 2585
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2586 $self->{path} || $self->{tex}
2587 or Carp::croak "'path' or 'tex' attributes required";
2110 2588
2111 $loaded_images{$self->{image}} ||= 2589 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2590 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2113 2591
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2592 DC::weaken $texture_cache{$self->{path}};
2115 2593
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2594 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2595
2120 $self 2596 $self
2121} 2597}
2122 2598
2599sub STORABLE_freeze {
2600 my ($self, $cloning) = @_;
2601
2602 $self->{path}
2603 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2604
2605 $self->{path}
2606}
2607
2608sub STORABLE_attach {
2609 my ($self, $cloning, $path) = @_;
2610
2611 $self->new (path => $path)
2612}
2613
2123sub size_request { 2614sub size_request {
2124 my ($self) = @_; 2615 my ($self) = @_;
2125 2616
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2617 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2127} 2618}
2128 2619
2129sub _draw { 2620sub _draw {
2130 my ($self) = @_; 2621 my ($self) = @_;
2131 2622
… …
2148 glDisable GL_TEXTURE_2D; 2639 glDisable GL_TEXTURE_2D;
2149} 2640}
2150 2641
2151############################################################################# 2642#############################################################################
2152 2643
2644package DC::UI::ImageButton;
2645
2646our @ISA = DC::UI::Image::;
2647
2648use DC::OpenGL;
2649
2650my %textures;
2651
2652sub new {
2653 my $class = shift;
2654
2655 my $self = $class->SUPER::new (
2656 padding_x => 4,
2657 padding_y => 4,
2658 fg => [1, 1, 1],
2659 active_fg => [0, 0, 1],
2660 can_hover => 1,
2661 align => 0.5,
2662 valign => 0.5,
2663 can_events => 1,
2664 @_
2665 );
2666}
2667
2668sub invoke_button_down {
2669 my ($self, $ev, $x, $y) = @_;
2670
2671 1
2672}
2673
2674sub invoke_button_up {
2675 my ($self, $ev, $x, $y) = @_;
2676
2677 $self->emit ("activate")
2678 if $x >= 0 && $x < $self->{w}
2679 && $y >= 0 && $y < $self->{h};
2680
2681 1
2682}
2683
2684#############################################################################
2685
2153package CFClient::UI::VGauge; 2686package DC::UI::VGauge;
2154 2687
2155our @ISA = CFClient::UI::Base::; 2688our @ISA = DC::UI::Base::;
2156 2689
2157use List::Util qw(min max); 2690use List::Util qw(min max);
2158 2691
2159use CFClient::OpenGL; 2692use DC::OpenGL;
2160 2693
2161my %tex = ( 2694my %tex = (
2162 food => [ 2695 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2697 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2698 ],
2166 grace => [ 2699 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2700 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/ 2701 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169 ], 2702 ],
2170 hp => [ 2703 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2705 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2706 ],
2174 mana => [ 2707 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2708 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/ 2709 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177 ], 2710 ],
2178); 2711);
2179 2712
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2713# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2773 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2774 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2775
2243 my $h1 = $self->{h} * (1 - $ycut1); 2776 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2777 my $h2 = $self->{h} * (1 - $ycut2);
2778 my $h3 = $self->{h};
2779
2780 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2781
2246 glEnable GL_BLEND; 2782 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2783 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2784 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2785 glEnable GL_TEXTURE_2D;
… …
2268 2804
2269 if ($t3) { 2805 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2806 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2807 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2808 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2809 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2810 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2811 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2812 glEnd;
2277 } 2813 }
2278 2814
2279 glDisable GL_BLEND; 2815 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2816 glDisable GL_TEXTURE_2D;
2281} 2817}
2282 2818
2283############################################################################# 2819#############################################################################
2284 2820
2821package DC::UI::Progress;
2822
2823our @ISA = DC::UI::Label::;
2824
2825use DC::OpenGL;
2826
2827sub new {
2828 my ($class, %arg) = @_;
2829
2830 my $self = $class->SUPER::new (
2831 fg => [1, 1, 1],
2832 bg => [0, 0, 1, 0.2],
2833 bar => [0.7, 0.5, 0.1, 0.8],
2834 outline => [0.4, 0.3, 0],
2835 fontsize => 0.9,
2836 valign => 0.5,
2837 align => 0.5,
2838 can_events => 1,
2839 ellipsise => 1,
2840 label => "%d%%",
2841 %arg,
2842 );
2843
2844 $self->set_value ($arg{value} || -1);
2845
2846 $self
2847}
2848
2849sub set_label {
2850 my ($self, $label) = @_;
2851
2852 return if $self->{label} eq $label;
2853 $self->{label} = $label;
2854
2855 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2856}
2857
2858sub set_value {
2859 my ($self, $value) = @_;
2860
2861 if ($self->{value} ne $value) {
2862 $self->{value} = $value;
2863
2864 if ($value < 0) {
2865 $self->set_text ("-");
2866 } else {
2867 $self->set_text (sprintf $self->{label}, $value * 100);
2868 }
2869
2870 $self->update;
2871 }
2872}
2873
2874sub _draw {
2875 my ($self) = @_;
2876
2877 glEnable GL_BLEND;
2878 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2879
2880 if ($self->{value} >= 0) {
2881 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2882
2883 glColor_premultiply @{$self->{bar}};
2884 glRect 2, 2, $s, $self->{h} - 2;
2885 glColor_premultiply @{$self->{bg}};
2886 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2887 }
2888
2889 glColor_premultiply @{$self->{outline}};
2890 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2891
2892 glDisable GL_BLEND;
2893
2894 {
2895 local $self->{bg}; # do not draw background
2896 $self->SUPER::_draw;
2897 }
2898}
2899
2900#############################################################################
2901
2902package DC::UI::ExperienceProgress;
2903
2904our @ISA = DC::UI::Progress::;
2905
2906sub new {
2907 my ($class, %arg) = @_;
2908
2909 my $self = $class->SUPER::new (
2910 tooltip => sub {
2911 my ($self) = @_;
2912
2913 sprintf "level %d\n%s points\n%s next level\n%s to go",
2914 $self->{lvl},
2915 ::formsep ($self->{exp}),
2916 ::formsep ($self->{nxt}),
2917 ::formsep ($self->{nxt} - $self->{exp}),
2918 },
2919 %arg
2920 );
2921
2922 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2923 if $::CONN;
2924
2925 $self
2926}
2927
2928sub DESTROY {
2929 my ($self) = @_;
2930
2931 delete $::CONN->{on_exp_update}{$self+0}
2932 if $::CONN;
2933
2934 $self->SUPER::DESTROY;
2935}
2936
2937sub set_value {
2938 my ($self, $lvl, $exp) = @_;
2939
2940 $self->{lvl} = $lvl;
2941 $self->{exp} = $exp;
2942
2943 my $v = -1;
2944
2945 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2946 my $l0 = $table->[$lvl - 1];
2947 my $l1 = $table->[$lvl];
2948
2949 $self->{nxt} = $l1;
2950
2951 $v = ($exp - $l0) / ($l1 - $l0);
2952 }
2953
2954 $self->SUPER::set_value ($v);
2955}
2956
2957#############################################################################
2958
2285package CFClient::UI::Gauge; 2959package DC::UI::Gauge;
2286 2960
2287our @ISA = CFClient::UI::VBox::; 2961our @ISA = DC::UI::VBox::;
2288 2962
2289sub new { 2963sub new {
2290 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2291 2965
2292 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2968 can_hover => 1,
2295 can_events => 1, 2969 can_events => 1,
2296 %arg, 2970 %arg,
2297 ); 2971 );
2298 2972
2299 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2973 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2300 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2974 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2301 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2975 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2302 2976
2303 $self 2977 $self
2304} 2978}
2305 2979
2306sub set_fontsize { 2980sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 3001 $self->{value}->set_text ($val);
2328} 3002}
2329 3003
2330############################################################################# 3004#############################################################################
2331 3005
2332package CFClient::UI::Slider; 3006package DC::UI::Slider;
2333 3007
2334use strict; 3008use strict;
2335 3009
2336use CFClient::OpenGL; 3010use DC::OpenGL;
2337 3011
2338our @ISA = CFClient::UI::DrawBG::; 3012our @ISA = DC::UI::DrawBG::;
2339 3013
2340my @tex = 3014my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3015 map { new_from_file DC::Texture DC::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 3016 qw(s1_slider.png s1_slider_bg.png);
2343 3017
2344sub new { 3018sub new {
2345 my $class = shift; 3019 my $class = shift;
2346 3020
… …
2367 $self->update; 3041 $self->update;
2368 3042
2369 $self 3043 $self
2370} 3044}
2371 3045
2372sub changed { }
2373
2374sub set_range { 3046sub set_range {
2375 my ($self, $range) = @_; 3047 my ($self, $range) = @_;
2376 3048
2377 ($range, $self->{range}) = ($self->{range}, $range); 3049 ($range, $self->{range}) = ($self->{range}, $range);
2378 3050
… …
2398 if $unit; 3070 if $unit;
2399 3071
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3072 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 3073
2402 if ($value != $old_value) { 3074 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 3075 $self->emit (changed => $value);
2404 $self->update; 3076 $self->update;
2405 } 3077 }
2406} 3078}
2407 3079
2408sub size_request { 3080sub size_request {
2409 my ($self) = @_; 3081 my ($self) = @_;
2410 3082
2411 ($self->{req_w}, $self->{req_h}) 3083 ($self->{req_w}, $self->{req_h})
2412} 3084}
2413 3085
2414sub button_down { 3086sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 3087 my ($self, $ev, $x, $y) = @_;
2416 3088
2417 $self->SUPER::button_down ($ev, $x, $y); 3089 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 3090
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3091 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 3092
2421 $self->mouse_motion ($ev, $x, $y) 3093 $self->invoke_mouse_motion ($ev, $x, $y);
2422}
2423 3094
3095 1
3096}
3097
2424sub mouse_motion { 3098sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 3099 my ($self, $ev, $x, $y) = @_;
2426 3100
2427 if ($GRAB == $self) { 3101 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3102 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 3103
… …
2433 3107
2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3108 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else { 3109 } else {
2436 return 0; 3110 return 0;
2437 } 3111 }
3112
3113 1
3114}
3115
3116sub invoke_mouse_wheel {
3117 my ($self, $ev) = @_;
3118
3119 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3120
3121 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3122
3123 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2438 3124
2439 1 3125 1
2440} 3126}
2441 3127
2442sub update { 3128sub update {
… …
2493 glDisable GL_TEXTURE_2D; 3179 glDisable GL_TEXTURE_2D;
2494} 3180}
2495 3181
2496############################################################################# 3182#############################################################################
2497 3183
2498package CFClient::UI::ValSlider; 3184package DC::UI::ValSlider;
2499 3185
2500our @ISA = CFClient::UI::HBox::; 3186our @ISA = DC::UI::HBox::;
2501 3187
2502sub new { 3188sub new {
2503 my ($class, %arg) = @_; 3189 my ($class, %arg) = @_;
2504 3190
2505 my $range = delete $arg{range}; 3191 my $range = delete $arg{range};
2506 3192
2507 my $self = $class->SUPER::new ( 3193 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3194 slider => (new DC::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3195 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 3196 to_value => sub { shift },
2511 from_value => sub { shift }, 3197 from_value => sub { shift },
2512 %arg, 3198 %arg,
2513 ); 3199 );
2514 3200
… …
2534sub set_range { shift->{slider}->set_range (@_) } 3220sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 3221sub set_value { shift->{slider}->set_value (@_) }
2536 3222
2537############################################################################# 3223#############################################################################
2538 3224
2539package CFClient::UI::TextScroller; 3225package DC::UI::TextScroller;
2540 3226
2541our @ISA = CFClient::UI::HBox::; 3227our @ISA = DC::UI::HBox::;
2542 3228
2543use CFClient::OpenGL; 3229use DC::OpenGL;
2544 3230
2545sub new { 3231sub new {
2546 my $class = shift; 3232 my $class = shift;
2547 3233
2548 my $self = $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
2549 fontsize => 1, 3235 fontsize => 1,
2550 can_events => 0, 3236 can_events => 1,
2551 indent => 0, 3237 indent => 0,
2552 #font => default_font 3238 #font => default_font
2553 @_, 3239 @_,
2554 3240
2555 layout => (new CFClient::Layout 1), 3241 layout => (new DC::Layout),
2556 par => [], 3242 par => [],
3243 max_par => 0,
2557 height => 0, 3244 height => 0,
2558 children => [ 3245 children => [
2559 (new CFClient::UI::Empty expand => 1), 3246 (new DC::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 3247 (new DC::UI::Slider vertical => 1),
2561 ], 3248 ],
2562 ); 3249 );
2563 3250
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 3251 $self->{children}[1]->connect (changed => sub { $self->update });
2565 3252
… …
2571 3258
2572 $self->{fontsize} = $fontsize; 3259 $self->{fontsize} = $fontsize;
2573 $self->reflow; 3260 $self->reflow;
2574} 3261}
2575 3262
3263sub size_request {
3264 my ($self) = @_;
3265
3266 my ($empty, $slider) = $self->visible_children;
3267
3268 local $self->{children} = [$empty, $slider];
3269 $self->SUPER::size_request
3270}
3271
2576sub size_allocate { 3272sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 3273 my ($self, $w, $h) = @_;
2578 3274
2579 $self->SUPER::size_allocate ($w, $h); 3275 my ($empty, $slider, @other) = @{ $self->{children} };
3276 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 3277
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3278 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3279 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 3280 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3281 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 3282
2586 $self->reflow; 3283 $self->reflow;
2587}
2588 3284
2589sub text_size { 3285 local $self->{children} = [$empty, $slider];
3286 $self->SUPER::invoke_size_allocate ($w, $h)
3287}
3288
3289sub invoke_mouse_wheel {
2590 my ($self, $text, $indent) = @_; 3290 my ($self, $ev) = @_;
3291
3292 return 0 unless $ev->{dy}; # only vertical movements
3293
3294 $self->{children}[1]->emit (mouse_wheel => $ev);
3295
3296 1
3297}
3298
3299sub get_layout {
3300 my ($self, $para) = @_;
2591 3301
2592 my $layout = $self->{layout}; 3302 my $layout = $self->{layout};
2593 3303
3304 $layout->set_font ($self->{font}) if $self->{font};
3305 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3306 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 3307 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3308 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 3309 $layout->set_markup ($para->{markup});
3310
3311 $layout->set_shapes (
3312 map
3313 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3314 @{$para->{widget}}
2598 3315 );
3316
2599 $layout->size 3317 $layout
2600} 3318}
2601 3319
2602sub reflow { 3320sub reflow {
2603 my ($self) = @_; 3321 my ($self) = @_;
2604 3322
… …
2611 3329
2612 # todo: base offset on lines or so, not on pixels 3330 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 3331 $self->{children}[1]->set_value ($offset);
2614} 3332}
2615 3333
3334sub current_paragraph {
3335 my ($self) = @_;
3336
3337 $self->{top_paragraph} - 1
3338}
3339
3340sub scroll_to {
3341 my ($self, $para) = @_;
3342
3343 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3344
3345 $self->{scroll_to} = $para;
3346 $self->update;
3347}
3348
2616sub clear { 3349sub clear {
2617 my ($self) = @_; 3350 my ($self) = @_;
3351
3352 my (undef, undef, @other) = @{ $self->{children} };
3353 $self->remove ($_) for @other;
2618 3354
2619 $self->{par} = []; 3355 $self->{par} = [];
2620 $self->{height} = 0; 3356 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 3358}
2623 3359
2624sub add_paragraph { 3360sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 3361 my $self = shift;
2626 3362
2627 for my $line (split /\n/, $text) { 3363 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 3364 $para = {
3365 fg => [1, 1, 1, 1],
3366 indent => 0,
3367 markup => "",
3368 widget => [],
3369 ref $para ? %$para : (markup => $para),
3370 w => 1e10,
3371 wrapped => 1,
3372 };
3373
3374 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3375 push @{$self->{par}}, $para;
3376 }
3377
3378 if (my $max = $self->{max_par}) {
3379 shift @{$self->{par}} while @{$self->{par}} > $max;
3380 }
3381
3382 $self->{need_reflow}++;
3383 $self->update;
3384}
3385
3386sub scroll_to_bottom {
3387 my ($self) = @_;
3388
3389 $self->{scroll_to} = $#{$self->{par}};
3390 $self->update;
3391}
3392
3393sub force_uptodate {
3394 my ($self) = @_;
3395
3396 if (delete $self->{need_reflow}) {
3397 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3398
3399 my $height = 0;
3400
3401 for my $para (@{$self->{par}}) {
3402 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3403 my $layout = $self->get_layout ($para);
3404 my ($w, $h) = $layout->size;
3405
3406 $para->{w} = $w + $para->{indent};
3407 $para->{h} = $h;
3408 $para->{wrapped} = $layout->has_wrapped;
3409 }
3410
3411 $para->{y} = $height;
3412 $height += $para->{h};
3413 }
3414
2629 $self->{height} += $h; 3415 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3416 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 3417
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3418 delete $self->{texture};
3419 }
3420
3421 if (my $paridx = delete $self->{scroll_to}) {
3422 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3423 }
2634} 3424}
2635 3425
2636sub update { 3426sub update {
2637 my ($self) = @_; 3427 my ($self) = @_;
2638 3428
… …
2641 return unless $self->{h} > 0; 3431 return unless $self->{h} > 0;
2642 3432
2643 delete $self->{texture}; 3433 delete $self->{texture};
2644 3434
2645 $ROOT->on_post_alloc ($self => sub { 3435 $ROOT->on_post_alloc ($self => sub {
3436 $self->force_uptodate;
3437
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3438 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3439
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 { 3440 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3441 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3442 glClear GL_COLOR_BUFFER_BIT;
2678 3443
3444 package DC::UI::Base;
3445 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3446 (0, 0, $self->{w}, $self->{h});
3447
3448 my $top = int $self->{children}[1]{range}[0];
3449
3450 my $paridx = 0;
3451 my $top_paragraph;
2679 my $top = int $self->{children}[1]{range}[0]; 3452 my $top = int $self->{children}[1]{range}[0];
2680 3453
2681 my $y0 = $top; 3454 my $y0 = $top;
2682 my $y1 = $top + $H; 3455 my $y1 = $top + $H;
2683 3456
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}}) { 3457 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3458 my $h = $para->{h};
3459 my $y = $para->{y};
2696 3460
2697 if ($y0 < $y + $h && $y < $y1) { 3461 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3462 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 3463
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3464 $layout->render ($para->{indent}, $y - $y0);
3465 $layout->draw;
2704 3466
2705 glRasterPos $par->[3], $y - $y0; 3467 if (my @w = @{ $para->{widget} }) {
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3468 my @s = $layout->get_shapes;
3469
3470 for (@w) {
3471 my ($dx, $dy) = splice @s, 0, 2, ();
3472
3473 $_->{x} = $dx + $para->{indent};
3474 $_->{y} = $dy + $y - $y0;
3475
3476 $_->draw;
3477 }
3478 }
2707 } 3479 }
2708 3480
2709 $y += $h; 3481 $paridx++;
3482 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3483 }
2711 3484
2712 glDisable GL_BLEND; 3485 $self->{top_paragraph} = $top_paragraph;
2713 }; 3486 };
2714 }); 3487 });
3488}
3489
3490sub reconfigure {
3491 my ($self) = @_;
3492
3493 $self->SUPER::reconfigure;
3494
3495 $_->{w} = 1e10 for @{ $self->{par} };
3496 $self->reflow;
2715} 3497}
2716 3498
2717sub _draw { 3499sub _draw {
2718 my ($self) = @_; 3500 my ($self) = @_;
2719 3501
… …
2722 glColor 0, 0, 0, 1; 3504 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3505 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 3506 glDisable GL_TEXTURE_2D;
2725 3507
2726 $self->{children}[1]->draw; 3508 $self->{children}[1]->draw;
2727
2728} 3509}
2729 3510
2730############################################################################# 3511#############################################################################
2731 3512
2732package CFClient::UI::Animator; 3513package DC::UI::Animator;
2733 3514
2734use CFClient::OpenGL; 3515use DC::OpenGL;
2735 3516
2736our @ISA = CFClient::UI::Bin::; 3517our @ISA = DC::UI::Bin::;
2737 3518
2738sub moveto { 3519sub moveto {
2739 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
2740 3521
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3522 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3550 glPopMatrix;
2770} 3551}
2771 3552
2772############################################################################# 3553#############################################################################
2773 3554
2774package CFClient::UI::Flopper; 3555package DC::UI::Flopper;
2775 3556
2776our @ISA = CFClient::UI::Button::; 3557our @ISA = DC::UI::Button::;
2777 3558
2778sub new { 3559sub new {
2779 my $class = shift; 3560 my $class = shift;
2780 3561
2781 my $self = $class->SUPER::new ( 3562 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3574 $self->{other}->toggle_visibility;
2794} 3575}
2795 3576
2796############################################################################# 3577#############################################################################
2797 3578
2798package CFClient::UI::Tooltip; 3579package DC::UI::Tooltip;
2799 3580
2800our @ISA = CFClient::UI::Bin::; 3581our @ISA = DC::UI::Bin::;
2801 3582
2802use CFClient::OpenGL; 3583use DC::OpenGL;
2803 3584
2804sub new { 3585sub new {
2805 my $class = shift; 3586 my $class = shift;
2806 3587
2807 $class->SUPER::new ( 3588 $class->SUPER::new (
… …
2811} 3592}
2812 3593
2813sub set_tooltip_from { 3594sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3595 my ($self, $widget) = @_;
2815 3596
2816 my $tooltip = $widget->{tooltip}; 3597 my $tip = $widget->{tooltip};
3598 $tip = $tip->($widget) if "CODE" eq ref $tip;
3599
3600 $tip = DC::Pod::section_label tooltip => $1
3601 if $tip =~ /^#(.*)$/;
2817 3602
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3603 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3604 $tip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3605 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n" 3606 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}"; 3607 . "visible $widget->{visible}";
2823 } 3608 }
2824 3609
2825 $tooltip =~ s/^\n+//; 3610 $tip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3611 $tip =~ s/\n+$//;
2827 3612
2828 $self->add (new CFClient::UI::Label 3613 $self->add (new DC::UI::Label
2829 markup => $tooltip, 3614 markup => $tip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3615 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3616 align => 0,
2831 fontsize => 0.8, 3617 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3618 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3619 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3620 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3621 );
2836} 3622}
2837 3623
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3627 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3628
2843 ($w + 4, $h + 4) 3629 ($w + 4, $h + 4)
2844} 3630}
2845 3631
2846sub size_allocate { 3632sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3633 my ($self, $w, $h) = @_;
2848 3634
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3635 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3636}
2851 3637
2852sub visibility_change { 3638sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3639 my ($self, $visible) = @_;
2854 3640
2855 return unless $visible; 3641 return unless $visible;
2856 3642
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3643 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3644 my $widget = $self->{owner}
2859 or return; 3645 or return;
2860 3646
3647 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3648 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3649
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3650 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3651 if $x + $self->{w} > $self->{root}{w};
2865 3652
2866 $self->move_abs ($x, $y); 3653 $self->move_abs ($x, $y);
3654 } else {
3655 $self->hide;
3656 }
2867 }); 3657 });
2868} 3658}
2869 3659
2870sub _draw { 3660sub _draw {
2871 my ($self) = @_; 3661 my ($self) = @_;
2872 3662
2873 glTranslate 0.375, 0.375;
2874
2875 my ($w, $h) = @$self{qw(w h)}; 3663 my ($w, $h) = @$self{qw(w h)};
2876 3664
2877 glColor 1, 0.8, 0.4; 3665 glColor 1, 0.8, 0.4;
2878 glBegin GL_QUADS; 3666 glRect 0, 0, $w, $h;
2879 glVertex 0 , 0;
2880 glVertex 0 , $h;
2881 glVertex $w, $h;
2882 glVertex $w, 0;
2883 glEnd;
2884 3667
2885 glColor 0, 0, 0; 3668 glColor 0, 0, 0;
2886 glBegin GL_LINE_LOOP; 3669 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 3670
2893 glTranslate 2 - 0.375, 2 - 0.375; 3671 glTranslate 2, 2;
2894 3672
2895 $self->SUPER::_draw; 3673 $self->SUPER::_draw;
2896} 3674}
2897 3675
2898############################################################################# 3676#############################################################################
2899 3677
2900package CFClient::UI::Face; 3678package DC::UI::Face;
2901 3679
2902our @ISA = CFClient::UI::Base::; 3680our @ISA = DC::UI::DrawBG::;
2903 3681
2904use CFClient::OpenGL; 3682use DC::OpenGL;
2905 3683
2906sub new { 3684sub new {
2907 my $class = shift; 3685 my $class = shift;
2908 3686
2909 my $self = $class->SUPER::new ( 3687 my $self = $class->SUPER::new (
3688 size_w => 32,
3689 size_h => 8,
2910 aspect => 1, 3690 aspect => 1,
2911 can_events => 0, 3691 can_events => 0,
2912 @_, 3692 @_,
2913 ); 3693 );
2914 3694
2915 if ($self->{anim} && $self->{animspeed}) { 3695 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3696 DC::weaken (my $widget = $self);
2917 3697
2918 $self->{timer} = Event->timer ( 3698 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3699 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2920 hard => 1, 3700 return unless $::CONN;
2921 interval => $self->{animspeed}, 3701
2922 cb => sub { 3702 my $w = $widget
3703 or return;
3704
2923 ++$widget->{frame}; 3705 ++$w->{frame};
3706 $w->update_face;
3707
3708 # somehow, $widget can go away
2924 $widget->update; 3709 $w->update;
2925 }, 3710 $w->update_timer;
2926 ); 3711 };
3712
3713 $self->update_face;
3714 $self->update_timer;
2927 } 3715 }
2928 3716
2929 $self 3717 $self
2930} 3718}
2931 3719
3720sub update_timer {
3721 my ($self) = @_;
3722
3723 return unless $self->{timer};
3724
3725 if ($self->{visible}) {
3726 $self->{timer}->start;
3727 } else {
3728 $self->{timer}->stop;
3729 }
3730}
3731
3732sub update_face {
3733 my ($self) = @_;
3734
3735 if ($::CONN) {
3736 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3737 if ($anim && @$anim) {
3738 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3739 delete $self->{face_change_cb};
3740
3741 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3742 unless ($tex->{name} || $tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746 }
3747 }
3748 }
3749}
3750
2932sub size_request { 3751sub size_request {
2933 (32, 8) 3752 my ($self) = @_;
3753
3754 if ($::CONN) {
3755 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3756 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3757 if ($tex->{name}) {
3758 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3759 } elsif (!$tex->{loading}) {
3760 $tex->upload (sub { $self->reconfigure });
3761 }
3762 }
3763
3764 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3765 }
3766 }
3767
3768 ($self->{size_w} || 8, $self->{size_h} || 8)
2934} 3769}
2935 3770
2936sub update { 3771sub update {
2937 my ($self) = @_; 3772 my ($self) = @_;
2938 3773
2939 return unless $self->{visible}; 3774 return unless $self->{visible};
2940 3775
2941 $self->SUPER::update; 3776 $self->SUPER::update;
2942} 3777}
2943 3778
3779sub invoke_visibility_change {
3780 my ($self) = @_;
3781
3782 $self->update_timer;
3783
3784 0
3785}
3786
2944sub _draw { 3787sub _draw {
2945 my ($self) = @_; 3788 my ($self) = @_;
2946 3789
2947 return unless $::CONN; 3790 $self->SUPER::_draw;
2948 3791
2949 my $face; 3792 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; 3793 glEnable GL_TEXTURE_2D;
2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963 glColor 0, 0, 0, 1; 3795 glColor 0, 0, 0, 1;
2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3796 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2965 glDisable GL_TEXTURE_2D; 3797 glDisable GL_TEXTURE_2D;
… …
2967} 3799}
2968 3800
2969sub destroy { 3801sub destroy {
2970 my ($self) = @_; 3802 my ($self) = @_;
2971 3803
2972 $self->{timer}->cancel 3804 (delete $self->{timer})->cancel
2973 if $self->{timer}; 3805 if $self->{timer};
2974 3806
2975 $self->SUPER::destroy; 3807 $self->SUPER::destroy;
2976} 3808}
2977 3809
2978############################################################################# 3810#############################################################################
2979 3811
2980package CFClient::UI::Buttonbar; 3812package DC::UI::Buttonbar;
2981 3813
2982our @ISA = CFClient::UI::HBox::; 3814our @ISA = DC::UI::HBox::;
2983 3815
2984# TODO: should actualyl wrap buttons and other goodies. 3816# TODO: should actually wrap buttons and other goodies.
2985 3817
2986############################################################################# 3818#############################################################################
2987 3819
2988package CFClient::UI::Menu; 3820package DC::UI::Menu;
2989 3821
2990our @ISA = CFClient::UI::FancyFrame::; 3822our @ISA = DC::UI::Toplevel::;
2991 3823
2992use CFClient::OpenGL; 3824use DC::OpenGL;
2993 3825
2994sub new { 3826sub new {
2995 my $class = shift; 3827 my $class = shift;
2996 3828
2997 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
2998 items => [], 3830 items => [],
2999 z => 100, 3831 z => 100,
3000 @_, 3832 @_,
3001 ); 3833 );
3002 3834
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3835 $self->add ($self->{vbox} = new DC::UI::VBox);
3004 3836
3005 for my $item (@{ $self->{items} }) { 3837 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3838 my ($widget, $cb, $tooltip) = @$item;
3007 3839
3008 # handle various types of items, only text for now 3840 # handle various types of items, only text for now
3009 if (!ref $widget) { 3841 if (!ref $widget) {
3842 if ($widget =~ /\t/) {
3843 my ($left, $right) = split /\t/, $widget, 2;
3844
3010 $widget = new CFClient::UI::Label 3845 $widget = new DC::UI::HBox
3011 can_hover => 1, 3846 can_hover => 1,
3012 can_events => 1, 3847 can_events => 1,
3848 tooltip => $tooltip,
3849 children => [
3850 (new DC::UI::Label markup => $left, expand => 1),
3851 (new DC::UI::Label markup => $right, align => 1),
3852 ],
3853 ;
3854
3855 } else {
3856 $widget = new DC::UI::Label
3857 can_hover => 1,
3858 can_events => 1,
3859 align => 0,
3013 markup => $widget, 3860 markup => $widget,
3014 tooltip => $tooltip 3861 tooltip => $tooltip;
3862 }
3015 } 3863 }
3016 3864
3017 $self->{item}{$widget} = $item; 3865 $self->{item}{$widget} = $item;
3018 3866
3019 $self->{vbox}->add ($widget); 3867 $self->{vbox}->add ($widget);
… …
3024 3872
3025# popup given the event (must be a mouse button down event currently) 3873# popup given the event (must be a mouse button down event currently)
3026sub popup { 3874sub popup {
3027 my ($self, $ev) = @_; 3875 my ($self, $ev) = @_;
3028 3876
3029 $self->_emit ("popdown"); 3877 $self->emit ("popdown");
3030 3878
3031 # maybe save $GRAB? must be careful about events... 3879 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3880 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3881 $self->{button} = $ev->{button};
3034 3882
3035 $self->show; 3883 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3884 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3885}
3038 3886
3039sub mouse_motion { 3887sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3888 my ($self, $ev, $x, $y) = @_;
3041 3889
3042 # TODO: should use vbox->find_widget or so 3890 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3891 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3892 $self->{hover} = $self->{item}{$HOVER};
3045 3893
3046 0 3894 0
3047} 3895}
3048 3896
3049sub button_up { 3897sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3898 my ($self, $ev, $x, $y) = @_;
3051 3899
3052 if ($ev->{button} == $self->{button}) { 3900 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3901 undef $GRAB;
3054 $self->hide; 3902 $self->hide;
3055 3903
3056 $self->_emit ("popdown"); 3904 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3905 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3906 } else {
3059 return 0 3907 return 0
3060 } 3908 }
3061 3909
3062 1 3910 1
3063} 3911}
3064 3912
3065############################################################################# 3913#############################################################################
3066 3914
3067package CFClient::UI::Multiplexer; 3915package DC::UI::Multiplexer;
3068 3916
3069our @ISA = CFClient::UI::Container::; 3917our @ISA = DC::UI::Container::;
3070 3918
3071sub new { 3919sub new {
3072 my $class = shift; 3920 my $class = shift;
3073 3921
3074 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3088 3936
3089 $self->{current} = $self->{children}[0] 3937 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3938 if @{ $self->{children} };
3091} 3939}
3092 3940
3941sub get_current_page {
3942 my ($self) = @_;
3943
3944 $self->{current}
3945}
3946
3093sub set_current_page { 3947sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3948 my ($self, $page_or_widget) = @_;
3095 3949
3096 my $widget = ref $page_or_widget 3950 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3951 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3952 : $self->{children}[$page_or_widget];
3099 3953
3100 $self->{current} = $widget; 3954 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3955 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3956
3103 $self->_emit (page_changed => $self->{current}); 3957 $self->emit (page_changed => $self->{current});
3104 3958
3105 $self->realloc; 3959 $self->realloc;
3106} 3960}
3107 3961
3108sub visible_children { 3962sub visible_children {
… …
3113 my ($self) = @_; 3967 my ($self) = @_;
3114 3968
3115 $self->{current}->size_request 3969 $self->{current}->size_request
3116} 3970}
3117 3971
3118sub size_allocate { 3972sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3973 my ($self, $w, $h) = @_;
3120 3974
3121 $self->{current}->configure (0, 0, $w, $h); 3975 $self->{current}->configure (0, 0, $w, $h);
3976
3977 1
3122} 3978}
3123 3979
3124sub _draw { 3980sub _draw {
3125 my ($self) = @_; 3981 my ($self) = @_;
3126 3982
3127 $self->{current}->draw; 3983 $self->{current}->draw;
3128} 3984}
3129 3985
3130############################################################################# 3986#############################################################################
3131 3987
3132package CFClient::UI::Notebook; 3988package DC::UI::Notebook;
3133 3989
3990use DC::OpenGL;
3991
3134our @ISA = CFClient::UI::VBox::; 3992our @ISA = DC::UI::VBox::;
3135 3993
3136sub new { 3994sub new {
3137 my $class = shift; 3995 my $class = shift;
3138 3996
3139 my $self = $class->SUPER::new ( 3997 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3998 buttonbar => (new DC::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3999 multiplexer => (new DC::UI::Multiplexer expand => 1),
4000 active_outline => [.7, .7, 0.2],
3142 # filter => # will be put between multiplexer and $self 4001 # filter => # will be put between multiplexer and $self
3143 @_, 4002 @_,
3144 ); 4003 );
3145 4004
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4005 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4006 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148 4007
4008 {
4009 Scalar::Util::weaken (my $wself = $self);
4010
4011 $self->{multiplexer}->connect (c_add => sub {
4012 my ($mplex, $widgets) = @_;
4013
4014 for my $child (@$widgets) {
4015 Scalar::Util::weaken $child;
4016 $child->{c_tab_} ||= do {
4017 my $tab =
4018 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4019 ? $child->{c_tab}
4020 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4021
4022 $tab->connect (activate => sub {
4023 $wself->set_current_page ($child);
4024 });
4025
4026 $tab
4027 };
4028
4029 $self->{buttonbar}->add ($child->{c_tab_});
4030 }
4031 });
4032
4033 $self->{multiplexer}->connect (c_remove => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 $wself->{buttonbar}->remove ($child->{c_tab_});
4038 }
4039 });
4040 }
4041
3149 $self 4042 $self
3150} 4043}
3151 4044
3152sub add { 4045sub add {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->add (@widgets)
4049}
4050
4051sub remove {
4052 my ($self, @widgets) = @_;
4053
4054 $self->{multiplexer}->remove (@widgets)
4055}
4056
4057sub pages {
4058 my ($self) = @_;
4059 $self->{multiplexer}->children
4060}
4061
4062sub add_tab {
3153 my ($self, $title, $widget, $tooltip) = @_; 4063 my ($self, $title, $widget, $tooltip) = @_;
3154 4064
3155 Scalar::Util::weaken $self; 4065 $title = [$title, $tooltip] unless ref $title;
4066 $widget->{c_tab} = $title;
3156 4067
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); 4068 $self->add ($widget);
4069}
4070
4071sub get_current_page {
4072 my ($self) = @_;
4073
4074 $self->{multiplexer}->get_current_page
3164} 4075}
3165 4076
3166sub set_current_page { 4077sub set_current_page {
3167 my ($self, $page) = @_; 4078 my ($self, $page) = @_;
3168 4079
3169 $self->{multiplexer}->set_current_page ($page); 4080 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 4081 $self->emit (page_changed => $self->{multiplexer}{current});
4082}
4083
4084sub _draw {
4085 my ($self) = @_;
4086
4087 $self->SUPER::_draw ();
4088
4089 if (my $cur = $self->{multiplexer}{current}) {
4090 if ($cur = $cur->{c_tab_}) {
4091 glTranslate $self->{buttonbar}{x} + $cur->{x},
4092 $self->{buttonbar}{y} + $cur->{y};
4093 glLineWidth 3;
4094 #glEnable GL_BLEND;
4095 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4096 glColor @{$self->{active_outline}};
4097 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4098 glLineWidth 1;
4099 #glDisable GL_BLEND;
4100 }
4101 }
3171} 4102}
3172 4103
3173############################################################################# 4104#############################################################################
3174 4105
3175package CFClient::UI::Combobox; 4106package DC::UI::Selector;
3176 4107
3177use utf8; 4108use utf8;
3178 4109
3179our @ISA = CFClient::UI::Button::; 4110our @ISA = DC::UI::Button::;
3180 4111
3181sub new { 4112sub new {
3182 my $class = shift; 4113 my $class = shift;
3183 4114
3184 my $self = $class->SUPER::new ( 4115 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 4121 $self->_set_value ($self->{value});
3191 4122
3192 $self 4123 $self
3193} 4124}
3194 4125
3195sub button_down { 4126sub invoke_button_down {
3196 my ($self, $ev) = @_; 4127 my ($self, $ev) = @_;
3197 4128
3198 my @menu_items; 4129 my @menu_items;
3199 4130
3200 for (@{ $self->{options} }) { 4131 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 4132 my ($value, $title, $tooltip) = @$_;
3202 4133
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4134 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 4135 }
3205 4136
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4137 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 4138}
3208 4139
3209sub _set_value { 4140sub _set_value {
3210 my ($self, $value) = @_; 4141 my ($self, $value) = @_;
3211 4142
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4143 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4144 $item ||= $self->{options}[0]
3213 or return; 4145 or return;
3214 4146
3215 $self->{value} = $item->[0]; 4147 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓"); 4148 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]); 4149# $self->set_tooltip ($item->[2]);
3218} 4150}
3219 4151
3220sub set_value { 4152sub set_value {
3221 my ($self, $value) = @_; 4153 my ($self, $value) = @_;
3222 4154
3223 return unless $self->{value} ne $value; 4155 return unless $self->{value} ne $value;
3224 4156
3225 $self->_set_value ($value); 4157 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 4158 $self->emit (changed => $value);
4159}
4160
4161sub set_options {
4162 my ($self, $options) = @_;
4163
4164 $self->{options} = $options;
4165 $self->_set_value ($self->{value});
3227} 4166}
3228 4167
3229############################################################################# 4168#############################################################################
3230 4169
3231package CFClient::UI::Statusbox; 4170package DC::UI::Statusbox;
3232 4171
3233our @ISA = CFClient::UI::VBox::; 4172our @ISA = DC::UI::VBox::;
3234 4173
3235sub new { 4174sub new {
3236 my $class = shift; 4175 my $class = shift;
3237 4176
3238 my $self = $class->SUPER::new ( 4177 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 4178 fontsize => 0.8,
3240 @_, 4179 @_,
3241 ); 4180 );
3242 4181
3243 Scalar::Util::weaken (my $this = $self); 4182 DC::weaken (my $this = $self);
3244 4183
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4184 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3246 4185
3247 $self 4186 $self
3248} 4187}
3249 4188
3250sub reorder { 4189sub reorder {
3251 my ($self) = @_; 4190 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 4191 my $NOW = Time::HiRes::time;
3253 4192
3254 # freeze display when hovering over any label 4193 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 4194 return if $DC::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4195 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 4196 values %{ $self->{item} };
3258 4197
3259 while (my ($k, $v) = each %{ $self->{item} }) { 4198 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4199 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 4200 }
4201
4202 $self->{timer}->set (1, 1);
3262 4203
3263 my @widgets; 4204 my @widgets;
3264 4205
3265 my @items = sort { 4206 my @items = sort {
3266 $a->{pri} <=> $b->{pri} 4207 $a->{pri} <=> $b->{pri}
3267 or $b->{id} <=> $a->{id} 4208 or $b->{id} <=> $a->{id}
3268 } values %{ $self->{item} }; 4209 } values %{ $self->{item} };
3269
3270 $self->{timer}->interval (1);
3271 4210
3272 my $count = 10 + 1; 4211 my $count = 10 + 1;
3273 for my $item (@items) { 4212 for my $item (@items) {
3274 last unless --$count; 4213 last unless --$count;
3275 4214
… …
3282 for ($short) { 4221 for ($short) {
3283 s/^\s+//; 4222 s/^\s+//;
3284 s/\s+/ /g; 4223 s/\s+/ /g;
3285 } 4224 }
3286 4225
3287 new CFClient::UI::Label 4226 new DC::UI::Label
3288 markup => $short, 4227 markup => $short,
3289 tooltip => $item->{tooltip}, 4228 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 4229 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 4230 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 4231 fontsize => $item->{fontsize} || $self->{fontsize},
3293 max_w => $::WIDTH * 0.44, 4232 max_w => $::WIDTH * 0.44,
4233 align => 0,
3294 fg => [@{ $item->{fg} }], 4234 fg => [@{ $item->{fg} }],
3295 can_events => 1, 4235 can_events => 1,
3296 can_hover => 1 4236 can_hover => 1
3297 }; 4237 };
3298 4238
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4239 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4240 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update; 4241 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff) 4242 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1; 4243 if $diff < 1;
3304 $self->{timer}->interval (1/30); 4244 $self->{timer}->set (1/30, 1/30);
3305 } else { 4245 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1; 4246 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 } 4247 }
3308 4248
3309 push @widgets, $label; 4249 push @widgets, $label;
… …
3346 count => 1, 4286 count => 1,
3347 %arg, 4287 %arg,
3348 }; 4288 };
3349 } 4289 }
3350 4290
4291 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 4292 $self->reorder;
4293 });
3352} 4294}
3353 4295
3354sub reconfigure { 4296sub reconfigure {
3355 my ($self) = @_; 4297 my ($self) = @_;
3356 4298
… …
3369 $self->SUPER::destroy; 4311 $self->SUPER::destroy;
3370} 4312}
3371 4313
3372############################################################################# 4314#############################################################################
3373 4315
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, $end_cb) = @_;
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 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root; 4316package DC::UI::Root;
3737 4317
3738our @ISA = CFClient::UI::Container::; 4318our @ISA = DC::UI::Container::;
3739 4319
3740use List::Util qw(min max); 4320use List::Util qw(min max);
3741 4321
3742use CFClient::OpenGL; 4322use DC::OpenGL;
3743 4323
3744sub new { 4324sub new {
3745 my $class = shift; 4325 my $class = shift;
3746 4326
3747 my $self = $class->SUPER::new ( 4327 my $self = $class->SUPER::new (
3748 visible => 1, 4328 visible => 1,
3749 @_, 4329 @_,
3750 ); 4330 );
3751 4331
3752 Scalar::Util::weaken ($self->{root} = $self); 4332 DC::weaken ($self->{root} = $self);
3753 4333
3754 $self 4334 $self
3755} 4335}
3756 4336
3757sub size_request { 4337sub size_request {
… …
3772 $coord = $max - $size if $coord > $max - $size; 4352 $coord = $max - $size if $coord > $max - $size;
3773 4353
3774 int $coord + 0.5 4354 int $coord + 0.5
3775} 4355}
3776 4356
3777sub size_allocate { 4357sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 4358 my ($self, $w, $h) = @_;
3779 4359
3780 for my $child ($self->children) { 4360 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4361 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 4362
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 4366 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 4367 $Y = _to_pixel $Y, $H, $self->{h};
3788 4368
3789 $child->configure ($X, $Y, $W, $H); 4369 $child->configure ($X, $Y, $W, $H);
3790 } 4370 }
4371
4372 1
3791} 4373}
3792 4374
3793sub coord2local { 4375sub coord2local {
3794 my ($self, $x, $y) = @_; 4376 my ($self, $x, $y) = @_;
3795 4377
… …
3803} 4385}
3804 4386
3805sub update { 4387sub update {
3806 my ($self) = @_; 4388 my ($self) = @_;
3807 4389
3808 $::WANT_REFRESH++; 4390 $::WANT_REFRESH = 1;
3809} 4391}
3810 4392
3811sub add { 4393sub add {
3812 my ($self, @children) = @_; 4394 my ($self, @children) = @_;
3813 4395
… …
3850 while ($self->{refresh_hook}) { 4432 while ($self->{refresh_hook}) {
3851 $_->() 4433 $_->()
3852 for values %{delete $self->{refresh_hook}}; 4434 for values %{delete $self->{refresh_hook}};
3853 } 4435 }
3854 4436
3855 if ($self->{realloc}) { 4437 while ($self->{realloc}) {
3856 my %queue; 4438 my %queue;
3857 my @queue; 4439 my @queue;
3858 my $widget; 4440 my $widget;
3859 4441
3860 outer: 4442 outer:
… …
3880 4462
3881 delete $queue{$widget+0}; 4463 delete $queue{$widget+0};
3882 4464
3883 my ($w, $h) = $widget->size_request; 4465 my ($w, $h) = $widget->size_request;
3884 4466
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4467 $w += $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4468 $h += $widget->{padding_y} * 2;
4469
4470 $w = max $widget->{min_w}, $w;
4471 $h = max $widget->{min_h}, $h;
3887 4472
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890 4475
3891 $w = $widget->{force_w} if exists $widget->{force_w}; 4476 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3907 } 4492 }
3908 } 4493 }
3909 4494
3910 delete $self->{realloc}{$widget+0}; 4495 delete $self->{realloc}{$widget+0};
3911 } 4496 }
3912 }
3913 4497
3914 while (my $size_alloc = delete $self->{size_alloc}) { 4498 while (my $size_alloc = delete $self->{size_alloc}) {
3915 my @queue = sort { $b->{visible} <=> $a->{visible} } 4499 my @queue = sort { $a->{visible} <=> $b->{visible} }
3916 values %$size_alloc; 4500 values %$size_alloc;
3917 4501
3918 while () { 4502 while () {
3919 my $widget = pop @queue || last; 4503 my $widget = pop @queue || last;
3920 4504
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4505 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 4506
3923 $w = 0 if $w < 0; 4507 $w = max $widget->{min_w}, $w;
3924 $h = 0 if $h < 0; 4508 $h = max $widget->{min_h}, $h;
3925 4509
4510# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4511# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4512
4513 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4514 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4515
3926 $w = int $w + 0.5; 4516 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 4517 $h = int $h + 0.5;
3928 4518
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4519 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w}; 4520 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h}; 4521 $widget->{old_h} = $widget->{h};
3932 4522
3933 $widget->{w} = $w; 4523 $widget->{w} = $w;
3934 $widget->{h} = $h; 4524 $widget->{h} = $h;
3935 4525
3936 $widget->emit (size_allocate => $w, $h); 4526 $widget->emit (size_allocate => $w, $h);
4527 }
3937 } 4528 }
3938 } 4529 }
3939 } 4530 }
3940 4531
3941 while ($self->{post_alloc_hook}) { 4532 while ($self->{post_alloc_hook}) {
3942 $_->() 4533 $_->()
3943 for values %{delete $self->{post_alloc_hook}}; 4534 for values %{delete $self->{post_alloc_hook}};
3944 } 4535 }
3945
3946 4536
3947 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4537 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4538 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3949 glClear GL_COLOR_BUFFER_BIT; 4539 glClear GL_COLOR_BUFFER_BIT;
3950 4540
… …
3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4543 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954 glMatrixMode GL_MODELVIEW; 4544 glMatrixMode GL_MODELVIEW;
3955 glLoadIdentity; 4545 glLoadIdentity;
3956 4546
3957 { 4547 {
3958 package CFClient::UI::Base; 4548 package DC::UI::Base;
3959 4549
3960 ($draw_x, $draw_y, $draw_w, $draw_h) = 4550 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h}); 4551 (0, 0, $self->{w}, $self->{h});
3962 }
3963 4552
3964 $self->_draw; 4553 $self->_draw;
4554 }
3965} 4555}
3966 4556
3967############################################################################# 4557#############################################################################
3968 4558
3969package CFClient::UI; 4559package DC::UI;
3970 4560
3971$ROOT = new CFClient::UI::Root; 4561$ROOT = new DC::UI::Root;
3972$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4562$TOOLTIP = new DC::UI::Tooltip z => 900;
3973 4563
39741 45641
3975 4565

Diff Legend

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