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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

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

Diff Legend

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