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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.458 by root, Fri Dec 28 15:05:33 2007 UTC

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

Diff Legend

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