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.293 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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