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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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