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

Diff Legend

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