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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.458 by root, Fri Dec 28 15:05:33 2007 UTC

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

Diff Legend

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