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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

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

Diff Legend

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