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

Diff Legend

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