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

Diff Legend

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