ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.456 by root, Fri Dec 28 11:44:02 2007 UTC

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

Diff Legend

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