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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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