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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.471 by elmex, Sun Dec 7 21:26:16 2008 UTC

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

Diff Legend

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