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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.474 by root, Sun Jan 11 22:11:23 2009 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use Guard ();
9
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 strict;
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
345 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
346 403
347 if ($self->{aspect}) { 404 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
349 406
350 $w = List::Util::min $w, int $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
352 409
353 # use alignment to adjust x, y 410 # use alignment to adjust x, y
354 411
355 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
397 454
398 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
399 456
400 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
401 458
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
405 } 462 }
406} 463}
407 464
408# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
409sub coord2local { 466sub coord2local {
410 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
411 468
469 return (undef, undef) unless $self->{parent};
470
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 472}
414 473
415# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
416sub coord2global { 475sub coord2global {
417 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
477
478 return (undef, undef) unless $self->{parent};
418 479
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 481}
421 482
422sub invoke_focus_in { 483sub invoke_focus_in {
456 517
457sub invoke_mouse_motion { 0 } 518sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 0 } 519sub invoke_button_up { 0 }
459sub invoke_key_down { 0 } 520sub invoke_key_down { 0 }
460sub invoke_key_up { 0 } 521sub invoke_key_up { 0 }
522sub invoke_mouse_wheel { 0 }
461 523
462sub invoke_button_down { 524sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 525 my ($self, $ev, $x, $y) = @_;
464 526
465 $self->grab_focus; 527 $self->grab_focus;
469 531
470sub connect { 532sub connect {
471 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
472 534
473 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 }
474} 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);
475 555
476sub emit { 556sub emit {
477 my ($self, $signal, @args) = @_; 557 my ($self, $signal, @args) = @_;
478 558
559 # I do not really like this solution, but I do not like duplication
560 # and needlessly verbose code, either.
561 my @append
562 = $has_coords{$signal}
563 ? $args[0]->xy ($self)
564 : ();
565
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 566 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480 567
481 #d##TODO# stop propagating at first true, do not use sum 568 for my $cb (
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 569 @{$self->{signal_cb}{$signal} || []}, # before
483 || ($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
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 576 $self->{parent} && $self->{parent}->emit ($signal, @args)
485} 577}
486 578
487sub find_widget { 579#sub find_widget {
488 my ($self, $x, $y) = @_; 580# in .xs
489
490 return () unless $self->{can_events};
491
492 return $self
493 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496 ()
497}
498 581
499sub set_parent { 582sub set_parent {
500 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
501 584
502 Scalar::Util::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
503 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
504} 587}
505 588
506sub realloc { 589sub realloc {
507 my ($self) = @_; 590 my ($self) = @_;
533 616
534# 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
535# functions seems pointless. 618# functions seems pointless.
536our ($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
537 620
538sub draw { 621#sub draw {
539 my ($self) = @_; 622#CFPlus.xs
540
541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584 623
585sub _draw { 624sub _draw {
586 my ($self) = @_; 625 my ($self) = @_;
587 626
588 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
589} 628}
590 629
591sub DESTROY { 630sub DESTROY {
592 my ($self) = @_; 631 my ($self) = @_;
593 632
594 return if CFClient::in_destruct; 633 return if DC::in_destruct;
595 634
596 delete $WIDGET{$self+0}; 635 local $@;
597
598 eval { $self->destroy }; 636 eval { $self->destroy };
599 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};
600} 640}
601 641
602############################################################################# 642#############################################################################
603 643
604package CFClient::UI::DrawBG; 644package DC::UI::DrawBG;
605 645
606our @ISA = CFClient::UI::Base::; 646our @ISA = DC::UI::Base::;
607 647
608use strict; 648use strict;
609use CFClient::OpenGL; 649use DC::OpenGL;
610 650
611sub new { 651sub new {
612 my $class = shift; 652 my $class = shift;
613
614 # range [value, low, high, page]
615 653
616 $class->SUPER::new ( 654 $class->SUPER::new (
617 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
618 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
619 @_ 657 @_
631 my ($w, $h) = @$self{qw(w h)}; 669 my ($w, $h) = @$self{qw(w h)};
632 670
633 glEnable GL_BLEND; 671 glEnable GL_BLEND;
634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
635 glColor_premultiply @$color; 673 glColor_premultiply @$color;
636
637 glBegin GL_QUADS;
638 glVertex 0 , 0;
639 glVertex 0 , $h;
640 glVertex $w, $h; 674 glRect 0, 0, $w, $h;
641 glVertex $w, 0;
642 glEnd;
643
644 glDisable GL_BLEND; 675 glDisable GL_BLEND;
645 } 676 }
646} 677}
647 678
648############################################################################# 679#############################################################################
649 680
650package CFClient::UI::Empty; 681package DC::UI::Empty;
651 682
652our @ISA = CFClient::UI::Base::; 683our @ISA = DC::UI::Base::;
653 684
654sub new { 685sub new {
655 my ($class, %arg) = @_; 686 my ($class, %arg) = @_;
656 $class->SUPER::new (can_events => 0, %arg); 687 $class->SUPER::new (can_events => 0, %arg);
657} 688}
664 695
665sub draw { } 696sub draw { }
666 697
667############################################################################# 698#############################################################################
668 699
669package CFClient::UI::Container; 700package DC::UI::Container;
670 701
671our @ISA = CFClient::UI::Base::; 702our @ISA = DC::UI::Base::;
672 703
673sub new { 704sub new {
674 my ($class, %arg) = @_; 705 my ($class, %arg) = @_;
675 706
676 my $children = delete $arg{children}; 707 my $children = delete $arg{children};
680 can_events => 0, 711 can_events => 0,
681 %arg, 712 %arg,
682 ); 713 );
683 714
684 $self->add (@$children) 715 $self->add (@$children)
685 if $children; 716 if $children && @$children;
686 717
687 $self 718 $self
719}
720
721sub realloc {
722 my ($self) = @_;
723
724 $self->{force_realloc} = 1;
725 $self->{force_size_alloc} = 1;
726 $self->SUPER::realloc;
688} 727}
689 728
690sub add { 729sub add {
691 my ($self, @widgets) = @_; 730 my ($self, @widgets) = @_;
692 731
693 $_->set_parent ($self) 732 $_->set_parent ($self)
694 for @widgets; 733 for @widgets;
695 734
735 # TODO: only do this in widgets that need it, e.g. root, fixed
696 use sort 'stable'; 736 use sort 'stable';
697 737
698 $self->{children} = [ 738 $self->{children} = [
699 sort { $a->{z} <=> $b->{z} } 739 sort { $a->{z} <=> $b->{z} }
700 @{$self->{children}}, @widgets 740 @{$self->{children}}, @widgets
701 ]; 741 ];
702 742
703 $self->realloc; 743 $self->realloc;
744
745 $self->emit (c_add => \@widgets);
746
747 map $_+0, @widgets
704} 748}
705 749
706sub children { 750sub children {
707 @{ $_[0]{children} } 751 @{ $_[0]{children} }
708} 752}
709 753
710sub remove { 754sub remove {
711 my ($self, $child) = @_; 755 my ($self, @widgets) = @_;
712 756
757 $self->emit (c_remove => \@widgets);
758
759 for my $child (@widgets) {
713 delete $child->{parent}; 760 delete $child->{parent};
714 $child->hide; 761 $child->hide;
715
716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 762 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
763 }
717 764
718 $self->realloc; 765 $self->realloc;
719} 766}
720 767
721sub clear { 768sub clear {
722 my ($self) = @_; 769 my ($self) = @_;
723 770
724 my $children = delete $self->{children}; 771 my $children = $self->{children};
725 $self->{children} = []; 772 $self->{children} = [];
726 773
727 for (@$children) { 774 for (@$children) {
728 delete $_->{parent}; 775 delete $_->{parent};
729 $_->hide; 776 $_->hide;
749} 796}
750 797
751sub _draw { 798sub _draw {
752 my ($self) = @_; 799 my ($self) = @_;
753 800
754 $_->draw for @{$self->{children}}; 801 $_->draw for $self->visible_children;
755} 802}
756 803
757############################################################################# 804#############################################################################
758 805
759package CFClient::UI::Bin; 806package DC::UI::Bin;
760 807
761our @ISA = CFClient::UI::Container::; 808our @ISA = DC::UI::Container::;
762 809
763sub new { 810sub new {
764 my ($class, %arg) = @_; 811 my ($class, %arg) = @_;
765 812
766 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 813 my $child = (delete $arg{child}) || new DC::UI::Empty::;
767 814
768 $class->SUPER::new (children => [$child], %arg) 815 $class->SUPER::new (children => [$child], %arg)
769} 816}
770 817
771sub add { 818sub add {
772 my ($self, $child) = @_; 819 my ($self, $child) = @_;
773 820
774 $self->SUPER::remove ($_) for @{ $self->{children} }; 821 $self->clear;
775 $self->SUPER::add ($child); 822 $self->SUPER::add ($child);
776} 823}
777 824
778sub remove { 825sub remove {
779 my ($self, $widget) = @_; 826 my ($self, $widget) = @_;
780 827
781 $self->SUPER::remove ($widget); 828 $self->SUPER::remove ($widget);
782 829
783 $self->{children} = [new CFClient::UI::Empty] 830 $self->{children} = [new DC::UI::Empty]
784 unless @{$self->{children}}; 831 unless @{$self->{children}};
785} 832}
786 833
787sub child { $_[0]->{children}[0] } 834sub child { $_[0]->{children}[0] }
788 835
797 844
798 1 845 1
799} 846}
800 847
801############################################################################# 848#############################################################################
802
803# back-buffered drawing area 849# back-buffered drawing area
804 850
805package CFClient::UI::Window; 851package DC::UI::Window;
806 852
807our @ISA = CFClient::UI::Bin::; 853our @ISA = DC::UI::Bin::;
808 854
809use CFClient::OpenGL; 855use DC::OpenGL;
810 856
811sub new { 857sub new {
812 my ($class, %arg) = @_; 858 my ($class, %arg) = @_;
813 859
814 my $self = $class->SUPER::new (%arg); 860 my $self = $class->SUPER::new (%arg);
836} 882}
837 883
838sub render_child { 884sub render_child {
839 my ($self) = @_; 885 my ($self) = @_;
840 886
841 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 887 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
842 glClearColor 0, 0, 0, 0; 888 glClearColor 0, 0, 0, 0;
843 glClear GL_COLOR_BUFFER_BIT; 889 glClear GL_COLOR_BUFFER_BIT;
844 890
845 { 891 {
846 package CFClient::UI::Base; 892 package DC::UI::Base;
847 893
848 ($draw_x, $draw_y, $draw_w, $draw_h) = 894 local ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h}); 895 (0, 0, $self->{w}, $self->{h});
896
897 $self->_render;
850 } 898 }
851
852 $self->_render;
853 }; 899 };
854} 900}
855 901
856sub _draw { 902sub _draw {
857 my ($self) = @_; 903 my ($self) = @_;
858
859 my ($w, $h) = @$self{qw(w h)};
860 904
861 my $tex = $self->{texture} 905 my $tex = $self->{texture}
862 or return; 906 or return;
863 907
864 glEnable GL_TEXTURE_2D; 908 glEnable GL_TEXTURE_2D;
865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 909 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866 glColor 0, 0, 0, 1; 910 glColor 0, 0, 0, 1;
867 911
868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 912 $tex->draw_quad_alpha_premultiplied (0, 0);
869 913
870 glDisable GL_TEXTURE_2D; 914 glDisable GL_TEXTURE_2D;
871} 915}
872 916
873############################################################################# 917#############################################################################
874 918
875package CFClient::UI::ViewPort; 919package DC::UI::ViewPort;
876 920
921use List::Util qw(min max);
922
877our @ISA = CFClient::UI::Window::; 923our @ISA = DC::UI::Window::;
878 924
879sub new { 925sub new {
880 my $class = shift; 926 my $class = shift;
881 927
882 $class->SUPER::new ( 928 $class->SUPER::new (
889sub size_request { 935sub size_request {
890 my ($self) = @_; 936 my ($self) = @_;
891 937
892 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 938 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893 939
894 $w = 10 if $self->{scroll_x}; 940 $w = 1 if $self->{scroll_x};
895 $h = 10 if $self->{scroll_y}; 941 $h = 1 if $self->{scroll_y};
896 942
897 ($w, $h) 943 ($w, $h)
898} 944}
899 945
900sub invoke_size_allocate { 946sub invoke_size_allocate {
912} 958}
913 959
914sub set_offset { 960sub set_offset {
915 my ($self, $x, $y) = @_; 961 my ($self, $x, $y) = @_;
916 962
963 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
964 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
965
966 if ($x != $self->{view_x} or $y != $self->{view_y}) {
917 $self->{view_x} = int $x; 967 $self->{view_x} = $x;
918 $self->{view_y} = int $y; 968 $self->{view_y} = $y;
919 969
970 $self->emit (changed => $x, $y);
920 $self->update; 971 $self->update;
972 }
973}
974
975sub set_center {
976 my ($self, $x, $y) = @_;
977
978 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
979}
980
981sub make_visible {
982 my ($self, $x, $y, $border) = @_;
983
984 if ( $x < $self->{view_x} + $self->{w} * $border
985 || $x > $self->{view_x} + $self->{w} * (1 - $border)
986 || $y < $self->{view_y} + $self->{h} * $border
987 || $y > $self->{view_y} + $self->{h} * (1 - $border)
988 ) {
989 $self->set_center ($x, $y);
990 }
921} 991}
922 992
923# hmm, this does not work for topleft of $self... but we should not ask for that 993# hmm, this does not work for topleft of $self... but we should not ask for that
924sub coord2local { 994sub coord2local {
925 my ($self, $x, $y) = @_; 995 my ($self, $x, $y) = @_;
940 my ($self, $x, $y) = @_; 1010 my ($self, $x, $y) = @_;
941 1011
942 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1012 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1013 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
944 ) { 1014 ) {
945 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1015 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946 } else { 1016 } else {
947 $self->CFClient::UI::Base::find_widget ($x, $y) 1017 $self->DC::UI::Base::find_widget ($x, $y)
948 } 1018 }
949} 1019}
950 1020
951sub _render { 1021sub _render {
952 my ($self) = @_; 1022 my ($self) = @_;
953 1023
954 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1024 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
955 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1025 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
956 1026
957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1027 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958 1028
959 $self->SUPER::_render; 1029 $self->SUPER::_render;
960} 1030}
961 1031
962############################################################################# 1032#############################################################################
963 1033
964package CFClient::UI::ScrolledWindow; 1034package DC::UI::ScrolledWindow;
965 1035
966our @ISA = CFClient::UI::HBox::; 1036our @ISA = DC::UI::Table::;
967 1037
968sub new { 1038sub new {
969 my ($class, %arg) = @_; 1039 my ($class, %arg) = @_;
970 1040
971 my $child = delete $arg{child}; 1041 my $child = delete $arg{child};
972 1042
973 my $self; 1043 my $self;
974 1044
975 my $slider = new CFClient::UI::Slider 1045 my $hslider = new DC::UI::Slider
1046 c_col => 0,
1047 c_row => 1,
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new DC::UI::Slider
1057 c_col => 1,
1058 c_row => 0,
976 vertical => 1, 1059 vertical => 1,
977 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
978 on_changed => sub { 1061 on_changed => sub {
979 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980 }, 1064 },
981 ; 1065 ;
982 1066
983 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
984 vp => (new CFClient::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1070 can_events => 1,
985 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
986 %arg, 1075 %arg,
987 ); 1076 );
988 1077
1078 $self->{vp} = new DC::UI::ViewPort
1079 c_col => 0,
1080 c_row => 0,
1081 expand => 1,
1082 scroll_x => $self->{scroll_x},
1083 scroll_y => $self->{scroll_y},
1084 on_changed => sub {
1085 my ($vp, $x, $y) = @_;
1086
1087 $vp->{parent}{hslider}->set_value ($x);
1088 $vp->{parent}{vslider}->set_value ($y);
1089
1090 0
1091 },
1092 on_size_allocate => sub {
1093 my ($vp, $w, $h) = @_;
1094 $vp->{parent}->update_slider;
1095 0
1096 },
1097 ;
1098
989 $self->SUPER::add ($self->{vp}, $self->{slider}); 1099 $self->SUPER::add ($self->{vp});
1100
990 $self->add ($child) if $child; 1101 $self->add ($child) if $child;
991 1102
992 $self 1103 $self
993} 1104}
994
995#TODO# update range on size_allocate depending on child
996 1105
997sub add { 1106sub add {
998 my ($self, $widget) = @_; 1107 my ($self, $widget) = @_;
999 1108
1000 $self->{vp}->add ($self->{child} = $widget); 1109 $self->{vp}->add ($self->{child} = $widget);
1001} 1110}
1002 1111
1112sub set_offset { shift->{vp}->set_offset (@_) }
1113sub set_center { shift->{vp}->set_center (@_) }
1114sub make_visible { shift->{vp}->make_visible (@_) }
1115
1116sub update_slider {
1117 my ($self) = @_;
1118
1119 my $child = ($self->{vp} or return)->child;
1120
1121 if ($self->{scroll_x}) {
1122 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1123 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1124
1125 my $visible = $w1 > $w2;
1126 if ($visible != $self->{hslider_visible}) {
1127 $self->{hslider_visible} = $visible;
1128 $visible ? $self->SUPER::add ($self->{hslider})
1129 : $self->SUPER::remove ($self->{hslider});
1130 }
1131 }
1132
1133 if ($self->{scroll_y}) {
1134 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1135 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1136
1137 my $visible = $h1 > $h2;
1138 if ($visible != $self->{vslider_visible}) {
1139 $self->{vslider_visible} = $visible;
1140 $visible ? $self->SUPER::add ($self->{vslider})
1141 : $self->SUPER::remove ($self->{vslider});
1142 }
1143 }
1144}
1145
1146sub start_dragging {
1147 my ($self, $ev) = @_;
1148
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x};
1152 my $oy = $self->{vp}{view_y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $ox -= $ev->{xrel};
1158 $oy -= $ev->{yrel};
1159
1160 $self->{vp}->set_offset ($ox, $oy);
1161 };
1162}
1163
1164sub invoke_mouse_wheel {
1165 my ($self, $ev) = @_;
1166
1167 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1168 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1169
1170 1
1171}
1172
1173sub invoke_button_down {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if ($ev->{button} == 2) {
1177 $self->start_dragging ($ev);
1178 return 1;
1179 }
1180
1181 0
1182}
1183
1003sub invoke_button_up { 1184sub invoke_button_up {
1004 my ($self, $ev) = @_; 1185 my ($self, $ev, $x, $y) = @_;
1005 1186
1006 warn "button up $ev->{button}\n";#d# 1187 if (delete $self->{motion}) {
1188 return 1;
1007 1189 }
1190
1008 0 1191 0
1009} 1192}
1010 1193
1011sub update_slider { 1194sub invoke_mouse_motion {
1012 my ($self) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1013 1196
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1197 if ($self->{motion}) {
1015} 1198 $self->{motion}->($ev, $x, $y);
1199 return 1;
1200 }
1016 1201
1017sub update { 1202 0
1018 my ($self) = @_;
1019
1020 $self->SUPER::update;
1021
1022 $self->update_slider;
1023} 1203}
1024 1204
1025sub invoke_size_allocate { 1205sub invoke_size_allocate {
1026 my ($self, $w, $h) = @_; 1206 my ($self, $w, $h) = @_;
1027 1207
1028 $self->update_slider; 1208 $self->update_slider;
1029
1030 $self->SUPER::invoke_size_allocate ($w, $h) 1209 $self->SUPER::invoke_size_allocate ($w, $h)
1031} 1210}
1032 1211
1033############################################################################# 1212#############################################################################
1034 1213
1035package CFClient::UI::Frame; 1214package DC::UI::Frame;
1036 1215
1037our @ISA = CFClient::UI::Bin::; 1216our @ISA = DC::UI::Bin::;
1038 1217
1039use CFClient::OpenGL; 1218use DC::OpenGL;
1040 1219
1041sub new { 1220sub new {
1042 my $class = shift; 1221 my $class = shift;
1043 1222
1044 $class->SUPER::new ( 1223 $class->SUPER::new (
1054 my ($w, $h) = @$self{qw(w h)}; 1233 my ($w, $h) = @$self{qw(w h)};
1055 1234
1056 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1058 glColor_premultiply @{ $self->{bg} }; 1237 glColor_premultiply @{ $self->{bg} };
1059
1060 glBegin GL_QUADS;
1061 glVertex 0 , 0;
1062 glVertex 0 , $h;
1063 glVertex $w, $h; 1238 glRect 0, 0, $w, $h;
1064 glVertex $w, 0;
1065 glEnd;
1066
1067 glDisable GL_BLEND; 1239 glDisable GL_BLEND;
1068 } 1240 }
1069 1241
1070 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1071} 1243}
1072 1244
1073############################################################################# 1245#############################################################################
1074 1246
1075package CFClient::UI::FancyFrame; 1247package DC::UI::FancyFrame;
1076 1248
1077our @ISA = CFClient::UI::Bin::; 1249our @ISA = DC::UI::Bin::;
1078 1250
1079use CFClient::OpenGL; 1251use DC::OpenGL;
1252
1253sub new {
1254 my ($class, %arg) = @_;
1255
1256 if ((exists $arg{label}) && !ref $arg{label}) {
1257 $arg{label} = new DC::UI::Label
1258 align => 1,
1259 valign => 0.5,
1260 text => $arg{label},
1261 fontsize => ($arg{border} || 0.8) * 0.75;
1262 }
1263
1264 my $self = $class->SUPER::new (
1265 # label => "",
1266 fg => undef,
1267 border => 0.8,
1268 style => 'single',
1269 %arg,
1270 );
1271
1272 $self
1273}
1274
1275sub add {
1276 my ($self, @widgets) = @_;
1277
1278 $self->SUPER::add (@widgets);
1279 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1280}
1281
1282sub border {
1283 int $_[0]{border} * $::FONTSIZE
1284}
1285
1286sub size_request {
1287 my ($self) = @_;
1288
1289 ($self->{label_w}, undef) = $self->{label}->size_request
1290 if $self->{label};
1291
1292 my ($w, $h) = $self->SUPER::size_request;
1293
1294 (
1295 $w + $self->border * 2,
1296 $h + $self->border * 2,
1297 )
1298}
1299
1300sub invoke_size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 my $border = $self->border;
1304
1305 $w -= List::Util::max 0, $border * 2;
1306 $h -= List::Util::max 0, $border * 2;
1307
1308 if (my $label = $self->{label}) {
1309 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1310 $label->{h} = List::Util::min $h, $border;
1311 $label->invoke_size_allocate ($label->{w}, $label->{h});
1312 }
1313
1314 $self->child->configure ($border, $border, $w, $h);
1315
1316 1
1317}
1318
1319sub _draw {
1320 my ($self) = @_;
1321
1322 my $child = $self->{children}[0];
1323
1324 my $border = $self->border;
1325 my ($w, $h) = ($self->{w}, $self->{h});
1326
1327 $child->draw;
1328
1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1330 glBegin GL_LINE_STRIP;
1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1337 glEnd;
1338
1339 if ($self->{label}) {
1340 glTranslate $border * 2, 0;
1341 $self->{label}->_draw;
1342 }
1343}
1344
1345#############################################################################
1346
1347package DC::UI::Toplevel;
1348
1349our @ISA = DC::UI::Bin::;
1350
1351use DC::OpenGL;
1080 1352
1081my $bg = 1353my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1083 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1084 1356
1085my @border = 1357my @border =
1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1358 map { new_from_resource DC::Texture $_, mipmap => 1 }
1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1360
1361my @icon =
1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1363 qw(x1_move.png x1_resize.png);
1088 1364
1089sub new { 1365sub new {
1090 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1091 1367
1092 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1093 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1094 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1095 border => 0.6, 1371 border => 0.8,
1096 can_events => 1, 1372 can_events => 1,
1097 min_w => 64, 1373 min_w => 64,
1098 min_h => 32, 1374 min_h => 32,
1099 %arg, 1375 %arg,
1100 ); 1376 );
1101 1377
1102 $self->{title_widget} = new CFClient::UI::Label 1378 $self->{title_widget} = new DC::UI::Label
1103 align => 0, 1379 align => 0.5,
1104 valign => 1, 1380 valign => 1,
1105 text => $self->{title}, 1381 text => $self->{title},
1106 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1107 if exists $self->{title}; 1383 if exists $self->{title};
1108 1384
1109 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1110 $self->{close_button} = 1386 $self->{close_button} =
1111 new CFClient::UI::ImageButton 1387 new DC::UI::ImageButton
1112 path => 'x1_close.png', 1388 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") }; 1389 on_activate => sub { $self->emit ("delete") };
1114 1390
1115 $self->CFClient::UI::Container::add ($self->{close_button}); 1391 $self->DC::UI::Container::add ($self->{close_button});
1116 } 1392 }
1117 1393
1118 $self 1394 $self
1119} 1395}
1120 1396
1121sub add { 1397sub add {
1122 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1123 1399
1124 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127} 1403}
1128 1404
1129sub border { 1405sub border {
1130 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1407}
1408
1409sub get_max_wh {
1410 my ($self) = @_;
1411
1412 return ($self->{w}, $self->{h})
1413 if $self->{visible} && $self->{w};
1414
1415 $self->SUPER::get_max_wh
1131} 1416}
1132 1417
1133sub size_request { 1418sub size_request {
1134 my ($self) = @_; 1419 my ($self) = @_;
1135 1420
1239 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1524 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240 1525
1241 ! ! $self->{motion} 1526 ! ! $self->{motion}
1242} 1527}
1243 1528
1529sub invoke_visibility_change {
1530 my ($self, $visible) = @_;
1531
1532 delete $self->{motion} unless $visible;
1533
1534 0
1535}
1536
1244sub _draw { 1537sub _draw {
1245 my ($self) = @_; 1538 my ($self) = @_;
1246 1539
1247 my $child = $self->{children}[0]; 1540 my $child = $self->{children}[0];
1248 1541
1252 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254 1547
1255 my $border = $self->border; 1548 my $border = $self->border;
1256 1549
1550 if ($border) {
1257 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1258 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1262 1571
1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1265 1574
1266 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
1285 if $self->{close_button}; 1594 if $self->{close_button};
1286} 1595}
1287 1596
1288############################################################################# 1597#############################################################################
1289 1598
1290package CFClient::UI::Table; 1599package DC::UI::Table;
1291 1600
1292our @ISA = CFClient::UI::Base::; 1601our @ISA = DC::UI::Container::;
1293 1602
1294use List::Util qw(max sum); 1603use List::Util qw(max sum);
1295 1604
1296use CFClient::OpenGL; 1605use DC::OpenGL;
1297 1606
1298sub new { 1607sub new {
1299 my $class = shift; 1608 my $class = shift;
1300 1609
1301 $class->SUPER::new ( 1610 $class->SUPER::new (
1302 col_expand => [], 1611 col_expand => [],
1612 row_expand => [],
1303 @_, 1613 @_,
1304 ) 1614 )
1305} 1615}
1306 1616
1307sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309}
1310
1311sub add { 1617sub add {
1312 my ($self, $x, $y, $child) = @_; 1618 my ($self, @widgets) = @_;
1313 1619
1314 $child->set_parent ($self); 1620 for my $child (@widgets) {
1315 $self->{children}[$y][$x] = $child; 1621 $child->{c_rowspan} ||= 1;
1622 $child->{c_colspan} ||= 1;
1623 }
1316 1624
1317 $self->realloc; 1625 $self->SUPER::add (@widgets);
1318} 1626}
1319 1627
1320sub remove { 1628sub add_at {
1629 my $self = shift;
1630
1631 my @widgets;
1632
1633 while (@_) {
1634 my ($col, $row, $child) = splice @_, 0, 3, ();
1635
1636 $child->{c_row} = $row;
1637 $child->{c_col} = $col;
1638
1639 push @widgets, $child;
1640 }
1641
1642 $self->add (@widgets);
1643}
1644
1645sub get_wh {
1321 my ($self, $child) = @_; 1646 my ($self) = @_;
1322 1647
1323 # TODO: not yet implemented 1648 my (@w, @h);
1324}
1325
1326# TODO: move to container class maybe? send children a signal on removal?
1327sub clear {
1328 my ($self) = @_;
1329 1649
1330 my @children = $self->children; 1650 my @children = $self->children;
1331 delete $self->{children}; 1651
1652 # first pass, columns
1653 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1654 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1655
1656 my $sw = sum @w[$c .. $c + $cs - 1];
1657
1658 if ($w > $sw) {
1659 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1660 }
1332 1661 }
1333 for (@children) {
1334 delete $_->{parent};
1335 $_->hide;
1336 }
1337 1662
1338 $self->realloc; 1663 # second pass, rows
1339} 1664 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1340
1341sub get_wh {
1342 my ($self) = @_;
1343
1344 my (@w, @h);
1345
1346 for my $y (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$y]
1348 or next;
1349
1350 for my $x (0 .. $#$row) {
1351 my $widget = $row->[$x]
1352 or next;
1353 my ($w, $h) = @$widget{qw(req_w req_h)}; 1665 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1354 1666
1355 $w[$x] = max $w[$x], $w; 1667 my $sh = sum @h[$r .. $r + $rs - 1];
1356 $h[$y] = max $h[$y], $h; 1668
1669 if ($h > $sh) {
1670 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357 } 1671 }
1358 } 1672 }
1359 1673
1360 (\@w, \@h) 1674 (\@w, \@h)
1361} 1675}
1377 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1378 1692
1379 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1380 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1381 1695
1382 # TODO: nicer code && do row_expand 1696 # now linearly scale the rows/columns to the allocated size
1383 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1384 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1385 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1386 1700
1387 # linearly scale sizes
1388 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390 1702
1391 CFClient::UI::harmonize $ws; 1703 DC::UI::harmonize $ws;
1704
1705 my @row_expand = @{$self->{row_expand}};
1706 @row_expand = (1) x @$ws unless @row_expand;
1707 my $row_expand = (sum @row_expand) || 1;
1708
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710
1392 CFClient::UI::harmonize $hs; 1711 DC::UI::harmonize $hs;
1393 1712
1394 my $y; 1713 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1714 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395 1715
1396 for my $r (0 .. $#{$self->{children}}) { 1716 for my $widget ($self->children) {
1397 my $row = $self->{children}[$r] 1717 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1398 or next;
1399 1718
1400 my $x = 0; 1719 $widget->configure (
1401 my $row_h = $hs->[$r]; 1720 $x[$c], $y[$r],
1721 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402 1722 );
1403 for my $c (0 .. $#$row) { 1723 }
1404 my $col_w = $ws->[$c];
1405 1724
1406 if (my $widget = $row->[$c]) { 1725 1
1407 $widget->configure ($x, $y, $col_w, $row_h); 1726}
1408 }
1409 1727
1410 $x += $col_w; 1728#############################################################################
1729
1730package DC::UI::Fixed;
1731
1732use List::Util qw(min max);
1733
1734our @ISA = DC::UI::Container::;
1735
1736sub _scale($$$) {
1737 my ($rel, $val, $max) = @_;
1738
1739 $rel ? $val * $max : $val
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 unless ($child->{c_rel}) {
1750 my $x = $child->{c_x};
1751 my $y = $child->{c_y};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1411 } 1755 }
1756 }
1412 1757
1413 $y += $row_h; 1758 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1;
1760
1761 # now layout remaining widgets
1762 for my $child ($self->visible_children) {
1763 if ($child->{c_rel}) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 }
1770 }
1771
1772 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1;
1774
1775 ($W, $H)
1776}
1777
1778sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_;
1780
1781 for my $child ($self->visible_children) {
1782 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1783 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1784
1785 $x += $child->{c_halign} * $child->{req_w};
1786 $y += $child->{c_valign} * $child->{req_h};
1787
1788 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1414 } 1789 }
1415 1790
1416 1 1791 1
1417} 1792}
1418 1793
1419sub find_widget {
1420 my ($self, $x, $y) = @_;
1421
1422 $x -= $self->{x};
1423 $y -= $self->{y};
1424
1425 my $res;
1426
1427 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1428 $res = $_->find_widget ($x, $y)
1429 and return $res;
1430 }
1431
1432 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1433}
1434
1435sub _draw {
1436 my ($self) = @_;
1437
1438 for (grep $_, @{$self->{children}}) {
1439 $_->draw for grep $_, @$_;
1440 }
1441}
1442
1443############################################################################# 1794#############################################################################
1444 1795
1445package CFClient::UI::Box; 1796package DC::UI::Box;
1446 1797
1447our @ISA = CFClient::UI::Container::; 1798our @ISA = DC::UI::Container::;
1448 1799
1449sub size_request { 1800sub size_request {
1450 my ($self) = @_; 1801 my ($self) = @_;
1802
1803 my @children = $self->visible_children;
1451 1804
1452 $self->{vertical} 1805 $self->{vertical}
1453 ? ( 1806 ? (
1454 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::max map $_->{req_w}, @children),
1455 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::sum map $_->{req_h}, @children),
1456 ) 1809 )
1457 : ( 1810 : (
1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1811 (List::Util::sum map $_->{req_w}, @children),
1459 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1812 (List::Util::max map $_->{req_h}, @children),
1460 ) 1813 )
1461} 1814}
1462 1815
1463sub invoke_size_allocate { 1816sub invoke_size_allocate {
1464 my ($self, $w, $h) = @_; 1817 my ($self, $w, $h) = @_;
1485 $req[$_] += $space * $children[$_]{expand} 1838 $req[$_] += $space * $children[$_]{expand}
1486 for 0 .. $#children; 1839 for 0 .. $#children;
1487 } 1840 }
1488 } 1841 }
1489 1842
1490 CFClient::UI::harmonize \@req; 1843 DC::UI::harmonize \@req;
1491 1844
1492 my $pos = 0; 1845 my $pos = 0;
1493 for (0 .. $#children) { 1846 for (0 .. $#children) {
1494 my $alloc = $req[$_]; 1847 my $alloc = $req[$_];
1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1848 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1500 1 1853 1
1501} 1854}
1502 1855
1503############################################################################# 1856#############################################################################
1504 1857
1505package CFClient::UI::HBox; 1858package DC::UI::HBox;
1506 1859
1507our @ISA = CFClient::UI::Box::; 1860our @ISA = DC::UI::Box::;
1508 1861
1509sub new { 1862sub new {
1510 my $class = shift; 1863 my $class = shift;
1511 1864
1512 $class->SUPER::new ( 1865 $class->SUPER::new (
1515 ) 1868 )
1516} 1869}
1517 1870
1518############################################################################# 1871#############################################################################
1519 1872
1520package CFClient::UI::VBox; 1873package DC::UI::VBox;
1521 1874
1522our @ISA = CFClient::UI::Box::; 1875our @ISA = DC::UI::Box::;
1523 1876
1524sub new { 1877sub new {
1525 my $class = shift; 1878 my $class = shift;
1526 1879
1527 $class->SUPER::new ( 1880 $class->SUPER::new (
1530 ) 1883 )
1531} 1884}
1532 1885
1533############################################################################# 1886#############################################################################
1534 1887
1535package CFClient::UI::Label; 1888package DC::UI::Label;
1536 1889
1537our @ISA = CFClient::UI::DrawBG::; 1890our @ISA = DC::UI::DrawBG::;
1538 1891
1539use CFClient::OpenGL; 1892use DC::OpenGL;
1540 1893
1541sub new { 1894sub new {
1542 my ($class, %arg) = @_; 1895 my ($class, %arg) = @_;
1543 1896
1544 my $self = $class->SUPER::new ( 1897 my $self = $class->SUPER::new (
1547 #active_bg => none 1900 #active_bg => none
1548 #font => default_font 1901 #font => default_font
1549 #text => initial text 1902 #text => initial text
1550 #markup => initial narkup 1903 #markup => initial narkup
1551 #max_w => maximum pixel width 1904 #max_w => maximum pixel width
1905 #style => 0, # render flags
1552 ellipsise => 3, # end 1906 ellipsise => 3, # end
1553 layout => (new CFClient::Layout), 1907 layout => (new DC::Layout),
1554 fontsize => 1, 1908 fontsize => 1,
1555 align => -1, 1909 align => 0.5,
1556 valign => -1, 1910 valign => 0.5,
1557 padding_x => 2, 1911 padding_x => 4,
1558 padding_y => 2, 1912 padding_y => 2,
1559 can_events => 0, 1913 can_events => 0,
1560 %arg 1914 %arg
1561 ); 1915 );
1562 1916
1563 if (exists $self->{template}) { 1917 if (exists $self->{template}) {
1564 my $layout = new CFClient::Layout; 1918 my $layout = new DC::Layout;
1565 $layout->set_text (delete $self->{template}); 1919 $layout->set_text (delete $self->{template});
1566 $self->{template} = $layout; 1920 $self->{template} = $layout;
1567 } 1921 }
1568 1922
1569 if (exists $self->{markup}) { 1923 if (exists $self->{markup}) {
1573 } 1927 }
1574 1928
1575 $self 1929 $self
1576} 1930}
1577 1931
1578sub escape($) {
1579 local $_ = $_[0];
1580
1581 s/&/&amp;/g;
1582 s/>/&gt;/g;
1583 s/</&lt;/g;
1584
1585 $_
1586}
1587
1588sub update { 1932sub update {
1589 my ($self) = @_; 1933 my ($self) = @_;
1590 1934
1591 delete $self->{texture}; 1935 delete $self->{texture};
1592 $self->SUPER::update; 1936 $self->SUPER::update;
1595sub realloc { 1939sub realloc {
1596 my ($self) = @_; 1940 my ($self) = @_;
1597 1941
1598 delete $self->{ox}; 1942 delete $self->{ox};
1599 $self->SUPER::realloc; 1943 $self->SUPER::realloc;
1944}
1945
1946sub clear {
1947 my ($self) = @_;
1948
1949 $self->set_text ("");
1600} 1950}
1601 1951
1602sub set_text { 1952sub set_text {
1603 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1604 1954
1629 1979
1630sub size_request { 1980sub size_request {
1631 my ($self) = @_; 1981 my ($self) = @_;
1632 1982
1633 $self->{size_req} ||= do { 1983 $self->{size_req} ||= do {
1984 my ($max_w, $max_h) = $self->get_max_wh;
1985
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($max_w);
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1991
1640 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1641 1993
1642 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1643 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1); 1996 $self->{template}->set_width ($max_w);
1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1646 1998
1647 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1648 2000
1649 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
1705 2057
1706 [$self->{layout}->size] 2058 [$self->{layout}->size]
1707 }; 2059 };
1708 2060
1709 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2063 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1712 : ($self->{w} - $size->[0]) * 0.5);
1713 2064
1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1716 : ($self->{h} - $size->[1]) * 0.5);
1717 }; 2066 };
1718 2067
1719 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2068# unless ($self->{list}) {
1720 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2069# $self->{list} = DC::OpenGL::glGenList;
1721 2070# DC::OpenGL::glNewList $self->{list};
1722 $self->{layout}->render ($self->{ox}, $self->{oy}); 2071# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072# DC::OpenGL::glEndList;
2073# }
2074#
2075# DC::OpenGL::glCallList $self->{list};
2076
2077 $self->{layout}->draw;
1723} 2078}
2079
2080#sub destroy {
2081# my ($self) = @_;
2082#
2083# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2084#
2085# $self->SUPER::destroy;
2086#}
1724 2087
1725############################################################################# 2088#############################################################################
1726 2089
1727package CFClient::UI::EntryBase; 2090package DC::UI::EntryBase;
1728 2091
1729our @ISA = CFClient::UI::Label::; 2092our @ISA = DC::UI::Label::;
1730 2093
1731use CFClient::OpenGL; 2094use DC::OpenGL;
1732 2095
1733sub new { 2096sub new {
1734 my $class = shift; 2097 my $class = shift;
1735 2098
1736 $class->SUPER::new ( 2099 $class->SUPER::new (
1737 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
1738 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2102 outline => undef,
1739 active_bg => [1, 1, 1, 0.5], 2103 active_bg => [0, 0, 1, .2],
1740 active_fg => [0, 0, 0], 2104 active_fg => [1, 1, 1],
2105 active_outline => [1, 1, 0],
1741 can_hover => 1, 2106 can_hover => 1,
1742 can_focus => 1, 2107 can_focus => 1,
2108 align => 0,
1743 valign => 0, 2109 valign => 0.5,
1744 can_events => 1, 2110 can_events => 1,
2111 ellipsise => 0,
2112 padding_x => 4,
2113 padding_y => 2,
1745 #text => ... 2114 #text => ...
1746 #hidden => "*", 2115 #hidden => "*",
1747 @_ 2116 @_
1748 ) 2117 )
1749} 2118}
1794 my $sym = $ev->{sym}; 2163 my $sym = $ev->{sym};
1795 my $uni = $ev->{unicode}; 2164 my $uni = $ev->{unicode};
1796 2165
1797 my $text = $self->get_text; 2166 my $text = $self->get_text;
1798 2167
1799 if ($uni == 8) { 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2169
2170 if ($sym == DC::SDLK_BACKSPACE) {
1800 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
1802 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
1803 } elsif ($sym == CFClient::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
1804 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
1805 } elsif ($sym == CFClient::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
1806 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1807 } elsif ($sym == CFClient::SDLK_HOME) { 2178 } elsif ($sym == DC::SDLK_HOME) {
2179 # what a hack
2180 $self->{cursor} =
2181 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2182 ? length $1
2183 : 0;
2184 } elsif ($sym == DC::SDLK_END) {
2185 # uh, again
2186 $self->{cursor} =
2187 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2188 ? $self->{cursor} + length $1
2189 : length $self->{text};
2190 } elsif ($uni == 21) { # ctrl-u
2191 $text = "";
1808 $self->{cursor} = 0; 2192 $self->{cursor} = 0;
1809 } elsif ($sym == CFClient::SDLK_END) {
1810 $self->{cursor} = length $text;
1811 } elsif ($uni == 27) { 2193 } elsif ($uni == 27) {
1812 $self->emit ('escape'); 2194 $self->emit ('escape');
1813 } elsif ($uni) { 2195 } elsif ($uni == 0x0d) {
2196 substr $text, $self->{cursor}++, 0, "\012";
2197 } elsif ($uni >= 0x20) {
1814 substr $text, $self->{cursor}++, 0, chr $uni; 2198 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else { 2199 } else {
1816 return 0; 2200 return 0;
1817 } 2201 }
1818 2202
1819 $self->_set_text ($text); 2203 $self->_set_text ($text);
1820 2204
1821 $self->realloc; 2205 $self->realloc;
2206 $self->update;
1822 2207
1823 1 2208 1
1824} 2209}
1825 2210
1826sub invoke_focus_in { 2211sub invoke_focus_in {
1868 glColor_premultiply @{$self->{bg}}; 2253 glColor_premultiply @{$self->{bg}};
1869 } 2254 }
1870 2255
1871 glEnable GL_BLEND; 2256 glEnable GL_BLEND;
1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2257 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1873 glBegin GL_QUADS;
1874 glVertex 0 , 0;
1875 glVertex 0 , $self->{h};
1876 glVertex $self->{w}, $self->{h}; 2258 glRect 0, 0, $self->{w}, $self->{h};
1877 glVertex $self->{w}, 0;
1878 glEnd;
1879 glDisable GL_BLEND; 2259 glDisable GL_BLEND;
1880 2260
1881 $self->SUPER::_draw; 2261 $self->SUPER::_draw;
1882 2262
1883 #TODO: force update every cursor change :( 2263 #TODO: force update every cursor change :(
1885 2265
1886 unless (exists $self->{cur_h}) { 2266 unless (exists $self->{cur_h}) {
1887 my $text = substr $self->{text}, 0, $self->{cursor}; 2267 my $text = substr $self->{text}, 0, $self->{cursor};
1888 utf8::encode $text; 2268 utf8::encode $text;
1889 2269
1890 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1891 } 2271 }
1892 2272
1893 glColor @{$self->{fg}}; 2273 glColor_premultiply @{$self->{active_fg}};
1894 glBegin GL_LINES; 2274 glBegin GL_LINES;
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1896 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897 glEnd; 2277 glEnd;
1898 }
1899}
1900 2278
2279 glLineWidth 3;
2280 glColor @{$self->{active_outline}};
2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2282 glLineWidth 1;
2283
2284 } else {
2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2286 glBegin GL_LINE_STRIP;
2287 glVertex .5, $self->{h} * .5;
2288 glVertex .5, $self->{h} - 2.5;
2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2290 glVertex $self->{w} - .5, $self->{h} * .5;
2291 glEnd;
2292 }
2293}
2294
2295#############################################################################
2296
1901package CFClient::UI::Entry; 2297package DC::UI::Entry;
1902 2298
1903our @ISA = CFClient::UI::EntryBase::; 2299our @ISA = DC::UI::EntryBase::;
1904 2300
1905use CFClient::OpenGL; 2301use DC::OpenGL;
2302
2303sub new {
2304 my $class = shift;
2305
2306 $class->SUPER::new (
2307 history_pointer => -1,
2308 @_
2309 )
2310}
2311
1906 2312
1907sub invoke_key_down { 2313sub invoke_key_down {
1908 my ($self, $ev) = @_; 2314 my ($self, $ev) = @_;
1909 2315
1910 my $sym = $ev->{sym}; 2316 my $sym = $ev->{sym};
1911 2317
1912 if ($sym == 13) { 2318 if ($ev->{uni} == 0x0d || $sym == 13) {
1913 unshift @{$self->{history}}, 2319 unshift @{$self->{history}},
1914 my $txt = $self->get_text; 2320 my $txt = $self->get_text;
1915 2321
1916 $self->{history_pointer} = -1; 2322 $self->{history_pointer} = -1;
1917 $self->{history_saveback} = ''; 2323 $self->{history_saveback} = '';
1918 $self->emit (activate => $txt); 2324 $self->emit (activate => $txt);
1919 $self->update; 2325 $self->update;
1920 2326
1921 } elsif ($sym == CFClient::SDLK_UP) { 2327 } elsif ($sym == DC::SDLK_UP) {
1922 if ($self->{history_pointer} < 0) { 2328 if ($self->{history_pointer} < 0) {
1923 $self->{history_saveback} = $self->get_text; 2329 $self->{history_saveback} = $self->get_text;
1924 } 2330 }
1925 if (@{$self->{history} || []} > 0) { 2331 if (@{$self->{history} || []} > 0) {
1926 $self->{history_pointer}++; 2332 $self->{history_pointer}++;
1928 $self->{history_pointer} = @{$self->{history} || []} - 1; 2334 $self->{history_pointer} = @{$self->{history} || []} - 1;
1929 } 2335 }
1930 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2336 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1931 } 2337 }
1932 2338
1933 } elsif ($sym == CFClient::SDLK_DOWN) { 2339 } elsif ($sym == DC::SDLK_DOWN) {
1934 $self->{history_pointer}--; 2340 $self->{history_pointer}--;
1935 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2341 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936 2342
1937 if ($self->{history_pointer} >= 0) { 2343 if ($self->{history_pointer} >= 0) {
1938 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2344 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1939 } else { 2345 } else {
2346 if (defined $self->{history_saveback}) {
1940 $self->set_text ($self->{history_saveback}); 2347 $self->set_text ($self->{history_saveback});
2348 $self->{history_saveback} = undef;
2349 }
1941 } 2350 }
1942 2351
1943 } else { 2352 } else {
1944 return $self->SUPER::invoke_key_down ($ev) 2353 return $self->SUPER::invoke_key_down ($ev)
1945 } 2354 }
1947 1 2356 1
1948} 2357}
1949 2358
1950############################################################################# 2359#############################################################################
1951 2360
1952package CFClient::UI::Button; 2361package DC::UI::TextEdit;
1953 2362
1954our @ISA = CFClient::UI::Label::; 2363our @ISA = DC::UI::EntryBase::;
1955 2364
1956use CFClient::OpenGL; 2365use DC::OpenGL;
1957
1958my @tex =
1959 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1960 qw(b1_button_active.png);
1961 2366
1962sub new { 2367sub new {
1963 my $class = shift; 2368 my $class = shift;
1964 2369
1965 $class->SUPER::new ( 2370 $class->SUPER::new (
1966 padding_x => 4,
1967 padding_y => 4, 2371 padding_y => 4,
1968 fg => [1, 1, 1], 2372
1969 active_fg => [0, 0, 1], 2373 @_
2374 )
2375}
2376
2377sub move_cursor_ver {
2378 my ($self, $dy) = @_;
2379
2380 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2381
2382 $line += $dy;
2383
2384 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2385 $self->{cursor} = $index;
2386 delete $self->{cur_h};
2387 $self->update;
2388 return;
2389 }
2390}
2391
2392sub invoke_key_down {
2393 my ($self, $ev) = @_;
2394
2395 my $sym = $ev->{sym};
2396
2397 if ($sym == DC::SDLK_UP) {
2398 $self->move_cursor_ver (-1);
2399 } elsif ($sym == DC::SDLK_DOWN) {
2400 $self->move_cursor_ver (+1);
2401 } else {
2402 return $self->SUPER::invoke_key_down ($ev)
2403 }
2404
2405 1
2406}
2407
2408#############################################################################
2409
2410package DC::UI::ButtonBin;
2411
2412our @ISA = DC::UI::Bin::;
2413
2414use DC::OpenGL;
2415
2416my @tex =
2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2418 qw(b1_button_inactive.png b1_button_active.png);
2419
2420sub new {
2421 my $class = shift;
2422
2423 $class->SUPER::new (
1970 can_hover => 1, 2424 can_hover => 1,
1971 align => 0, 2425 align => 0.5,
1972 valign => 0, 2426 valign => 0.5,
1973 can_events => 1, 2427 can_events => 1,
1974 @_ 2428 @_
1975 ) 2429 )
1976} 2430}
1977 2431
1986} 2440}
1987 2441
1988sub _draw { 2442sub _draw {
1989 my ($self) = @_; 2443 my ($self) = @_;
1990 2444
1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1992
1993 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
1996 2448
2449 my $tex = $tex[$GRAB == $self];
1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998 2451
1999 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2000 2453
2001 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2002} 2455}
2003 2456
2004############################################################################# 2457#############################################################################
2005 2458
2006package CFClient::UI::ImageButton; 2459package DC::UI::Button;
2007 2460
2008our @ISA = CFClient::UI::Image::; 2461our @ISA = DC::UI::Label::;
2009 2462
2010use CFClient::OpenGL; 2463use DC::OpenGL;
2011 2464
2012my %textures; 2465my @tex =
2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2467 qw(b1_button_inactive.png b1_button_active.png);
2013 2468
2014sub new { 2469sub new {
2015 my $class = shift; 2470 my $class = shift;
2016 2471
2017 my $self = $class->SUPER::new ( 2472 $class->SUPER::new (
2018 padding_x => 4, 2473 padding_x => 8,
2019 padding_y => 4, 2474 padding_y => 4,
2020 fg => [1, 1, 1], 2475 fg => [1.0, 1.0, 1.0],
2021 active_fg => [0, 0, 1], 2476 active_fg => [0.8, 0.8, 0.8],
2022 can_hover => 1, 2477 can_hover => 1,
2023 align => 0, 2478 align => 0.5,
2024 valign => 0, 2479 valign => 0.5,
2025 can_events => 1, 2480 can_events => 1,
2026 @_ 2481 @_
2027 ); 2482 )
2028} 2483}
2029 2484
2030sub invoke_button_up { 2485sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_; 2486 my ($self, $ev, $x, $y) = @_;
2032 2487
2035 && $y >= 0 && $y < $self->{h}; 2490 && $y >= 0 && $y < $self->{h};
2036 2491
2037 1 2492 1
2038} 2493}
2039 2494
2495sub _draw {
2496 my ($self) = @_;
2497
2498 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2499
2500 glEnable GL_TEXTURE_2D;
2501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2502 glColor 0, 0, 0, 1;
2503
2504 my $tex = $tex[$GRAB == $self];
2505 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2506
2507 glDisable GL_TEXTURE_2D;
2508
2509 $self->SUPER::_draw;
2510}
2511
2040############################################################################# 2512#############################################################################
2041 2513
2042package CFClient::UI::CheckBox; 2514package DC::UI::CheckBox;
2043 2515
2044our @ISA = CFClient::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2045 2517
2046my @tex = 2518my @tex =
2047 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2048 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049 2521
2050use CFClient::OpenGL; 2522use DC::OpenGL;
2051 2523
2052sub new { 2524sub new {
2053 my $class = shift; 2525 my $class = shift;
2054 2526
2055 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2056 padding_x => 2, 2529 padding_x => 2,
2057 padding_y => 2, 2530 padding_y => 2,
2058 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2059 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2060 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
2066} 2539}
2067 2540
2068sub size_request { 2541sub size_request {
2069 my ($self) = @_; 2542 my ($self) = @_;
2070 2543
2071 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2072} 2545}
2073 2546
2074sub toggle { 2547sub toggle {
2075 my ($self) = @_; 2548 my ($self) = @_;
2076 2549
2095sub _draw { 2568sub _draw {
2096 my ($self) = @_; 2569 my ($self) = @_;
2097 2570
2098 $self->SUPER::_draw; 2571 $self->SUPER::_draw;
2099 2572
2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2573 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2101 2574
2102 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2103 2576
2104 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2577 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105 2578
2112 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2113} 2586}
2114 2587
2115############################################################################# 2588#############################################################################
2116 2589
2117package CFClient::UI::Image; 2590package DC::UI::Image;
2118 2591
2119our @ISA = CFClient::UI::Base::; 2592our @ISA = DC::UI::Base::;
2120 2593
2121use CFClient::OpenGL; 2594use DC::OpenGL;
2122 2595
2123our %texture_cache; 2596our %texture_cache;
2124 2597
2125sub new { 2598sub new {
2126 my $class = shift; 2599 my $class = shift;
2127 2600
2128 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2129 can_events => 0, 2602 can_events => 0,
2603 scale => 1,
2130 @_, 2604 @_,
2131 ); 2605 );
2132 2606
2133 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2135 2609
2136 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2138 2612
2139 Scalar::Util::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2140 2614
2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142 2616
2143 $self 2617 $self
2144} 2618}
2145 2619
2620sub STORABLE_freeze {
2621 my ($self, $cloning) = @_;
2622
2623 $self->{path}
2624 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2625
2626 $self->{path}
2627}
2628
2629sub STORABLE_attach {
2630 my ($self, $cloning, $path) = @_;
2631
2632 $self->new (path => $path)
2633}
2634
2146sub size_request { 2635sub size_request {
2147 my ($self) = @_; 2636 my ($self) = @_;
2148 2637
2149 ($self->{tex}{w}, $self->{tex}{h}) 2638 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2150} 2639}
2151 2640
2152sub _draw { 2641sub _draw {
2153 my ($self) = @_; 2642 my ($self) = @_;
2154 2643
2171 glDisable GL_TEXTURE_2D; 2660 glDisable GL_TEXTURE_2D;
2172} 2661}
2173 2662
2174############################################################################# 2663#############################################################################
2175 2664
2665package DC::UI::ImageButton;
2666
2667our @ISA = DC::UI::Image::;
2668
2669use DC::OpenGL;
2670
2671my %textures;
2672
2673sub new {
2674 my $class = shift;
2675
2676 my $self = $class->SUPER::new (
2677 padding_x => 4,
2678 padding_y => 4,
2679 fg => [1, 1, 1],
2680 active_fg => [0, 0, 1],
2681 can_hover => 1,
2682 align => 0.5,
2683 valign => 0.5,
2684 can_events => 1,
2685 @_
2686 );
2687}
2688
2689sub invoke_button_down {
2690 my ($self, $ev, $x, $y) = @_;
2691
2692 1
2693}
2694
2695sub invoke_button_up {
2696 my ($self, $ev, $x, $y) = @_;
2697
2698 $self->emit ("activate")
2699 if $x >= 0 && $x < $self->{w}
2700 && $y >= 0 && $y < $self->{h};
2701
2702 1
2703}
2704
2705#############################################################################
2706
2176package CFClient::UI::VGauge; 2707package DC::UI::VGauge;
2177 2708
2178our @ISA = CFClient::UI::Base::; 2709our @ISA = DC::UI::Base::;
2179 2710
2180use List::Util qw(min max); 2711use List::Util qw(min max);
2181 2712
2182use CFClient::OpenGL; 2713use DC::OpenGL;
2183 2714
2184my %tex = ( 2715my %tex = (
2185 food => [ 2716 food => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2187 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188 ], 2719 ],
2189 grace => [ 2720 grace => [
2190 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2191 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192 ], 2723 ],
2193 hp => [ 2724 hp => [
2194 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2195 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196 ], 2727 ],
2197 mana => [ 2728 mana => [
2198 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2729 map { new_from_resource DC::Texture $_, mipmap => 1 }
2199 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200 ], 2731 ],
2201); 2732);
2202 2733
2203# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
2306 glDisable GL_TEXTURE_2D; 2837 glDisable GL_TEXTURE_2D;
2307} 2838}
2308 2839
2309############################################################################# 2840#############################################################################
2310 2841
2842package DC::UI::Progress;
2843
2844our @ISA = DC::UI::Label::;
2845
2846use DC::OpenGL;
2847
2848sub new {
2849 my ($class, %arg) = @_;
2850
2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2854 fg => [1, 1, 1],
2855 bg => [0, 0, 1, 0.2],
2856 bar => [0.7, 0.5, 0.1, 0.8],
2857 outline => [0.4, 0.3, 0],
2858 fontsize => 0.9,
2859 valign => 0.5,
2860 align => 0.5,
2861 can_events => 1,
2862 ellipsise => 1,
2863 label => "%d%%",
2864 %arg,
2865 );
2866
2867 $self->set_value ($arg{value} || -1);
2868
2869 $self
2870}
2871
2872sub set_label {
2873 my ($self, $label) = @_;
2874
2875 return if $self->{label} eq $label;
2876 $self->{label} = $label;
2877
2878 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2879}
2880
2881sub set_value {
2882 my ($self, $value) = @_;
2883
2884 if ($self->{value} ne $value) {
2885 $self->{value} = $value;
2886
2887 if ($value < 0) {
2888 $self->set_text ("-");
2889 } else {
2890 $self->set_text (sprintf $self->{label}, $value * 100);
2891 }
2892
2893 $self->update;
2894 }
2895}
2896
2897sub _draw {
2898 my ($self) = @_;
2899
2900 glEnable GL_BLEND;
2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2906 if ($self->{value} >= 0) {
2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2908
2909 glColor_premultiply @{$self->{bar}};
2910 glRect $px, $py, $s, $self->{h} - $py;
2911 glColor_premultiply @{$self->{bg}};
2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2913 }
2914
2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2921
2922 glDisable GL_BLEND;
2923
2924 {
2925 local $self->{bg}; # do not draw background
2926 $self->SUPER::_draw;
2927 }
2928}
2929
2930#############################################################################
2931
2932package DC::UI::ExperienceProgress;
2933
2934our @ISA = DC::UI::Progress::;
2935
2936sub new {
2937 my ($class, %arg) = @_;
2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2941 my $self = $class->SUPER::new (
2942 %arg,
2943 tooltip => sub {
2944 my ($self) = @_;
2945
2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go / %d%%",
2947 $tt,
2948 $self->{lvl},
2949 ::formsep ($self->{exp}),
2950 ::formsep ($self->{nxt}),
2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2953 },
2954 );
2955
2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2957 if $::CONN;
2958
2959 $self
2960}
2961
2962sub DESTROY {
2963 my ($self) = @_;
2964
2965 delete $::CONN->{on_exp_update}{$self+0}
2966 if $::CONN;
2967
2968 $self->SUPER::DESTROY;
2969}
2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2985sub set_value {
2986 my ($self, $lvl, $exp) = @_;
2987
2988 $self->{lvl} = $lvl;
2989 $self->{exp} = $exp;
2990
2991 $self->SUPER::set_value ($self->_percent);
2992}
2993
2994#############################################################################
2995
2311package CFClient::UI::Gauge; 2996package DC::UI::Gauge;
2312 2997
2313our @ISA = CFClient::UI::VBox::; 2998our @ISA = DC::UI::VBox::;
2314 2999
2315sub new { 3000sub new {
2316 my ($class, %arg) = @_; 3001 my ($class, %arg) = @_;
2317 3002
2318 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
2320 can_hover => 1, 3005 can_hover => 1,
2321 can_events => 1, 3006 can_events => 1,
2322 %arg, 3007 %arg,
2323 ); 3008 );
2324 3009
2325 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 3010 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2326 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3011 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 3012 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2328 3013
2329 $self 3014 $self
2330} 3015}
2331 3016
2332sub set_fontsize { 3017sub set_fontsize {
2353 $self->{value}->set_text ($val); 3038 $self->{value}->set_text ($val);
2354} 3039}
2355 3040
2356############################################################################# 3041#############################################################################
2357 3042
2358package CFClient::UI::Slider; 3043package DC::UI::Slider;
2359 3044
2360use strict; 3045use strict;
2361 3046
2362use CFClient::OpenGL; 3047use DC::OpenGL;
2363 3048
2364our @ISA = CFClient::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
2365 3050
2366my @tex = 3051my @tex =
2367 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
2368 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
2369 3054
2370sub new { 3055sub new {
2371 my $class = shift; 3056 my $class = shift;
2372 3057
2409sub set_value { 3094sub set_value {
2410 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
2411 3096
2412 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2413 3098
2414 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
2415 3100
2416 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
2417
2418 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
2419 $value = $hi - $page if $value > $hi - $page;
2420 3103
2421 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2422 if $unit; 3105 if $unit;
2423 3106
2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2440 3123
2441 $self->SUPER::invoke_button_down ($ev, $x, $y); 3124 $self->SUPER::invoke_button_down ($ev, $x, $y);
2442 3125
2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3126 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2444 3127
2445 $self->invoke_mouse_motion ($ev, $x, $y) 3128 $self->invoke_mouse_motion ($ev, $x, $y);
3129
3130 1
2446} 3131}
2447 3132
2448sub invoke_mouse_motion { 3133sub invoke_mouse_motion {
2449 my ($self, $ev, $x, $y) = @_; 3134 my ($self, $ev, $x, $y) = @_;
2450 3135
2461 } 3146 }
2462 3147
2463 1 3148 1
2464} 3149}
2465 3150
3151sub invoke_mouse_wheel {
3152 my ($self, $ev) = @_;
3153
3154 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3155
3156 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3157
3158 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3159
3160 1
3161}
3162
2466sub update { 3163sub update {
2467 my ($self) = @_; 3164 my ($self) = @_;
2468 3165
2469 delete $self->{knob_w}; 3166 delete $self->{knob_w};
2470 $self->SUPER::update; 3167 $self->SUPER::update;
2474 my ($self) = @_; 3171 my ($self) = @_;
2475 3172
2476 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
2477 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
2478 3175
2479 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2480 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
2481 3178
2482 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2483 3180
2484 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2485 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2486 3183
2487 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
2517 glDisable GL_TEXTURE_2D; 3214 glDisable GL_TEXTURE_2D;
2518} 3215}
2519 3216
2520############################################################################# 3217#############################################################################
2521 3218
2522package CFClient::UI::ValSlider; 3219package DC::UI::ValSlider;
2523 3220
2524our @ISA = CFClient::UI::HBox::; 3221our @ISA = DC::UI::HBox::;
2525 3222
2526sub new { 3223sub new {
2527 my ($class, %arg) = @_; 3224 my ($class, %arg) = @_;
2528 3225
2529 my $range = delete $arg{range}; 3226 my $range = delete $arg{range};
2530 3227
2531 my $self = $class->SUPER::new ( 3228 my $self = $class->SUPER::new (
2532 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3229 slider => (new DC::UI::Slider expand => 1, range => $range),
2533 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3230 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2534 to_value => sub { shift }, 3231 to_value => sub { shift },
2535 from_value => sub { shift }, 3232 from_value => sub { shift },
2536 %arg, 3233 %arg,
2537 ); 3234 );
2538 3235
2558sub set_range { shift->{slider}->set_range (@_) } 3255sub set_range { shift->{slider}->set_range (@_) }
2559sub set_value { shift->{slider}->set_value (@_) } 3256sub set_value { shift->{slider}->set_value (@_) }
2560 3257
2561############################################################################# 3258#############################################################################
2562 3259
2563package CFClient::UI::TextScroller; 3260package DC::UI::TextScroller;
2564 3261
2565our @ISA = CFClient::UI::HBox::; 3262our @ISA = DC::UI::HBox::;
2566 3263
2567use CFClient::OpenGL; 3264use DC::OpenGL;
2568 3265
2569sub new { 3266sub new {
2570 my $class = shift; 3267 my $class = shift;
2571 3268
2572 my $self = $class->SUPER::new ( 3269 my $self = $class->SUPER::new (
2573 fontsize => 1, 3270 fontsize => 1,
2574 can_events => 0, 3271 can_events => 1,
2575 indent => 0, 3272 indent => 0,
2576 #font => default_font 3273 #font => default_font
2577 @_, 3274 @_,
2578 3275
2579 layout => (new CFClient::Layout), 3276 layout => (new DC::Layout),
2580 par => [], 3277 par => [],
3278 max_par => 0,
2581 height => 0, 3279 height => 0,
2582 children => [ 3280 children => [
2583 (new CFClient::UI::Empty expand => 1), 3281 (new DC::UI::Empty expand => 1),
2584 (new CFClient::UI::Slider vertical => 1), 3282 (new DC::UI::Slider vertical => 1),
2585 ], 3283 ],
2586 ); 3284 );
2587 3285
2588 $self->{children}[1]->connect (changed => sub { $self->update }); 3286 $self->{children}[1]->connect (changed => sub { $self->update });
2589 3287
2598} 3296}
2599 3297
2600sub size_request { 3298sub size_request {
2601 my ($self) = @_; 3299 my ($self) = @_;
2602 3300
2603 my ($empty, $slider) = @{ $self->{children} }; 3301 my ($empty, $slider) = $self->visible_children;
2604 3302
2605 local $self->{children} = [$empty, $slider]; 3303 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request 3304 $self->SUPER::size_request
2607} 3305}
2608 3306
2619 3317
2620 $self->reflow; 3318 $self->reflow;
2621 3319
2622 local $self->{children} = [$empty, $slider]; 3320 local $self->{children} = [$empty, $slider];
2623 $self->SUPER::invoke_size_allocate ($w, $h) 3321 $self->SUPER::invoke_size_allocate ($w, $h)
3322}
3323
3324sub invoke_mouse_wheel {
3325 my ($self, $ev) = @_;
3326
3327 return 0 unless $ev->{dy}; # only vertical movements
3328
3329 $self->{children}[1]->emit (mouse_wheel => $ev);
3330
3331 1
2624} 3332}
2625 3333
2626sub get_layout { 3334sub get_layout {
2627 my ($self, $para) = @_; 3335 my ($self, $para) = @_;
2628 3336
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3343 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2636 $layout->set_markup ($para->{markup}); 3344 $layout->set_markup ($para->{markup});
2637 3345
2638 $layout->set_shapes ( 3346 $layout->set_shapes (
2639 map 3347 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3348 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}} 3349 @{$para->{widget}}
2642 ); 3350 );
2643 3351
2644 $layout 3352 $layout
2645} 3353}
2654sub set_offset { 3362sub set_offset {
2655 my ($self, $offset) = @_; 3363 my ($self, $offset) = @_;
2656 3364
2657 # todo: base offset on lines or so, not on pixels 3365 # todo: base offset on lines or so, not on pixels
2658 $self->{children}[1]->set_value ($offset); 3366 $self->{children}[1]->set_value ($offset);
3367}
3368
3369sub current_paragraph {
3370 my ($self) = @_;
3371
3372 $self->{top_paragraph} - 1
3373}
3374
3375sub scroll_to {
3376 my ($self, $para) = @_;
3377
3378 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3379
3380 $self->{scroll_to} = $para;
3381 $self->update;
2659} 3382}
2660 3383
2661sub clear { 3384sub clear {
2662 my ($self) = @_; 3385 my ($self) = @_;
2663 3386
2668 $self->{height} = 0; 3391 $self->{height} = 0;
2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3392 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670} 3393}
2671 3394
2672sub add_paragraph { 3395sub add_paragraph {
2673 my ($self, $color, $para, $indent) = @_; 3396 my $self = shift;
2674 3397
2675 my ($text, @w) = ref $para ? @$para : $para; 3398 for my $para (@_) {
2676
2677 $para = { 3399 $para = {
3400 fg => [1, 1, 1, 1],
3401 indent => 0,
3402 markup => "",
3403 widget => [],
3404 ref $para ? %$para : (markup => $para),
2678 w => 1e10, 3405 w => 1e10,
2679 wrapped => 1, 3406 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2684 }; 3407 };
2685 3408
2686 $self->add (@w) if @w; 3409 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687 push @{$self->{par}}, $para; 3410 push @{$self->{par}}, $para;
3411 }
3412
3413 if (my $max = $self->{max_par}) {
3414 shift @{$self->{par}} while @{$self->{par}} > $max;
3415 }
2688 3416
2689 $self->{need_reflow}++; 3417 $self->{need_reflow}++;
2690 $self->update; 3418 $self->update;
2691} 3419}
2692 3420
2693sub scroll_to_bottom { 3421sub scroll_to_bottom {
2694 my ($self) = @_; 3422 my ($self) = @_;
2695 3423
2696 $self->{scroll_to_bottom} = 1; 3424 $self->{scroll_to} = $#{$self->{par}};
2697 $self->update; 3425 $self->update;
2698} 3426}
2699 3427
3428sub force_uptodate {
3429 my ($self) = @_;
3430
3431 if (delete $self->{need_reflow}) {
3432 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3433
3434 my $height = 0;
3435
3436 for my $para (@{$self->{par}}) {
3437 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3438 my $layout = $self->get_layout ($para);
3439 my ($w, $h) = $layout->size;
3440
3441 $para->{w} = $w + $para->{indent};
3442 $para->{h} = $h;
3443 $para->{wrapped} = $layout->has_wrapped;
3444 }
3445
3446 $para->{y} = $height;
3447 $height += $para->{h};
3448 }
3449
3450 $self->{height} = $height;
3451 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3452
3453 delete $self->{texture};
3454 }
3455
3456 if (my $paridx = delete $self->{scroll_to}) {
3457 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3458 }
3459}
3460
2700sub update { 3461sub update {
2701 my ($self) = @_; 3462 my ($self) = @_;
2702 3463
2703 $self->SUPER::update; 3464 $self->SUPER::update;
2704 3465
2705 return unless $self->{h} > 0; 3466 return unless $self->{h} > 0;
2706 3467
2707 delete $self->{texture}; 3468 delete $self->{texture};
2708 3469
2709 $ROOT->on_post_alloc ($self => sub { 3470 $ROOT->on_post_alloc ($self => sub {
3471 $self->force_uptodate;
3472
2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3473 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711 3474
2712 if (delete $self->{need_reflow}) {
2713 my $height = 0;
2714
2715 for my $para (@{$self->{par}}) {
2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717 my $layout = $self->get_layout ($para);
2718 my ($w, $h) = $layout->size;
2719
2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2723 }
2724
2725 $height += $para->{h};
2726 }
2727
2728 $self->{height} = $height;
2729
2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3475 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2740 glClearColor 0, 0, 0, 0; 3476 glClearColor 0, 0, 0, 0;
2741 glClear GL_COLOR_BUFFER_BIT; 3477 glClear GL_COLOR_BUFFER_BIT;
2742 3478
3479 package DC::UI::Base;
3480 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3481 (0, 0, $self->{w}, $self->{h});
3482
3483 my $top = int $self->{children}[1]{range}[0];
3484
3485 my $paridx = 0;
3486 my $top_paragraph;
2743 my $top = int $self->{children}[1]{range}[0]; 3487 my $top = int $self->{children}[1]{range}[0];
2744 3488
2745 my $y0 = $top; 3489 my $y0 = $top;
2746 my $y1 = $top + $H; 3490 my $y1 = $top + $H;
2747 3491
2748 my $y = 0;
2749
2750 for my $para (@{$self->{par}}) { 3492 for my $para (@{$self->{par}}) {
2751 my $h = $para->{h}; 3493 my $h = $para->{h};
3494 my $y = $para->{y};
2752 3495
2753 if ($y0 < $y + $h && $y < $y1) { 3496 if ($y0 < $y + $h && $y < $y1) {
2754
2755 my $layout = $self->get_layout ($para); 3497 my $layout = $self->get_layout ($para);
2756 3498
2757 $layout->render ($para->{indent}, $y - $y0); 3499 $layout->render ($para->{indent}, $y - $y0);
3500 $layout->draw;
2758 3501
2759 if (my @w = @{ $para->{widget} }) { 3502 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes; 3503 my @s = $layout->get_shapes;
2761 3504
2762 for (@w) { 3505 for (@w) {
2768 $_->draw; 3511 $_->draw;
2769 } 3512 }
2770 } 3513 }
2771 } 3514 }
2772 3515
2773 $y += $h; 3516 $paridx++;
3517 $top_paragraph ||= $paridx if $y >= $top;
2774 } 3518 }
3519
3520 $self->{top_paragraph} = $top_paragraph;
2775 }; 3521 };
2776 }); 3522 });
2777} 3523}
2778 3524
2779sub reconfigure { 3525sub reconfigure {
2797 $self->{children}[1]->draw; 3543 $self->{children}[1]->draw;
2798} 3544}
2799 3545
2800############################################################################# 3546#############################################################################
2801 3547
2802package CFClient::UI::Animator; 3548package DC::UI::Animator;
2803 3549
2804use CFClient::OpenGL; 3550use DC::OpenGL;
2805 3551
2806our @ISA = CFClient::UI::Bin::; 3552our @ISA = DC::UI::Bin::;
2807 3553
2808sub moveto { 3554sub moveto {
2809 my ($self, $x, $y) = @_; 3555 my ($self, $x, $y) = @_;
2810 3556
2811 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3557 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
2839 glPopMatrix; 3585 glPopMatrix;
2840} 3586}
2841 3587
2842############################################################################# 3588#############################################################################
2843 3589
2844package CFClient::UI::Flopper; 3590package DC::UI::Flopper;
2845 3591
2846our @ISA = CFClient::UI::Button::; 3592our @ISA = DC::UI::Button::;
2847 3593
2848sub new { 3594sub new {
2849 my $class = shift; 3595 my $class = shift;
2850 3596
2851 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
2863 $self->{other}->toggle_visibility; 3609 $self->{other}->toggle_visibility;
2864} 3610}
2865 3611
2866############################################################################# 3612#############################################################################
2867 3613
2868package CFClient::UI::Tooltip; 3614package DC::UI::Tooltip;
2869 3615
2870our @ISA = CFClient::UI::Bin::; 3616our @ISA = DC::UI::Bin::;
2871 3617
2872use CFClient::OpenGL; 3618use DC::OpenGL;
2873 3619
2874sub new { 3620sub new {
2875 my $class = shift; 3621 my $class = shift;
2876 3622
2877 $class->SUPER::new ( 3623 $class->SUPER::new (
2881} 3627}
2882 3628
2883sub set_tooltip_from { 3629sub set_tooltip_from {
2884 my ($self, $widget) = @_; 3630 my ($self, $widget) = @_;
2885 3631
2886 my $tooltip = $widget->{tooltip}; 3632 my $tip = $widget->{tooltip};
3633 $tip = $tip->($widget) if "CODE" eq ref $tip;
3634
3635 $tip = DC::Pod::section_label tooltip => $1
3636 if $tip =~ /^#(.*)$/;
2887 3637
2888 if ($ENV{CFPLUS_DEBUG} & 2) { 3638 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n" 3639 $tip .= "\n\n" . (ref $widget) . "\n"
2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3640 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891 . "req $widget->{req_w} $widget->{req_h}\n" 3641 . "req $widget->{req_w} $widget->{req_h}\n"
2892 . "visible $widget->{visible}"; 3642 . "visible $widget->{visible}";
2893 } 3643 }
2894 3644
2895 $tooltip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
2897 3647
2898 $self->add (new CFClient::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
2899 markup => $tooltip, 3650 markup => $tip,
2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3652 align => 0,
2901 fontsize => 0.8, 3653 fontsize => 0.8,
2902 fg => [0, 0, 0, 1], 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2903 ellipsise => 0, 3655 ellipsise => 0,
2904 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
2905 ); 3657 );
2906} 3658}
2907 3659
2926 3678
2927 $self->{root}->on_post_alloc ("move_$self" => sub { 3679 $self->{root}->on_post_alloc ("move_$self" => sub {
2928 my $widget = $self->{owner} 3680 my $widget = $self->{owner}
2929 or return; 3681 or return;
2930 3682
3683 if ($widget->{visible}) {
2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3684 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932 3685
2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3686 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934 if $x + $self->{w} > $self->{root}{w}; 3687 if $x + $self->{w} > $self->{root}{w};
2935 3688
2936 $self->move_abs ($x, $y); 3689 $self->move_abs ($x, $y);
3690 } else {
3691 $self->hide;
3692 }
2937 }); 3693 });
2938} 3694}
2939 3695
2940sub _draw { 3696sub _draw {
2941 my ($self) = @_; 3697 my ($self) = @_;
2942 3698
2943 glTranslate 0.375, 0.375;
2944
2945 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
2946 3700
2947 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
2948 glBegin GL_QUADS; 3702 glRect 0, 0, $w, $h;
2949 glVertex 0 , 0;
2950 glVertex 0 , $h;
2951 glVertex $w, $h;
2952 glVertex $w, 0;
2953 glEnd;
2954 3703
2955 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
2956 glBegin GL_LINE_LOOP; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
2957 glVertex 0 , 0;
2958 glVertex 0 , $h;
2959 glVertex $w, $h;
2960 glVertex $w, 0;
2961 glEnd;
2962 3706
2963 glTranslate 2 - 0.375, 2 - 0.375; 3707 glTranslate 2, 2;
2964 3708
2965 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
2966} 3710}
2967 3711
2968############################################################################# 3712#############################################################################
2969 3713
2970package CFClient::UI::Face; 3714package DC::UI::Face;
2971 3715
2972our @ISA = CFClient::UI::Base::; 3716our @ISA = DC::UI::DrawBG::;
2973 3717
2974use CFClient::OpenGL; 3718use DC::OpenGL;
2975 3719
2976sub new { 3720sub new {
2977 my $class = shift; 3721 my $class = shift;
2978 3722
2979 my $self = $class->SUPER::new ( 3723 my $self = $class->SUPER::new (
3724 size_w => 32,
3725 size_h => 8,
2980 aspect => 1, 3726 aspect => 1,
2981 can_events => 0, 3727 can_events => 0,
2982 @_, 3728 @_,
2983 ); 3729 );
2984 3730
2985 if ($self->{anim} && $self->{animspeed}) { 3731 if ($self->{anim} && $self->{animspeed}) {
2986 Scalar::Util::weaken (my $widget = $self); 3732 DC::weaken (my $widget = $self);
2987 3733
2988 $self->{timer} = Event->timer ( 3734 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2989 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3735 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2990 hard => 1, 3736 return unless $::CONN;
2991 interval => $self->{animspeed}, 3737
2992 cb => sub { 3738 my $w = $widget
3739 or return;
3740
2993 ++$widget->{frame}; 3741 ++$w->{frame};
3742 $w->update_face;
3743
3744 # somehow, $widget can go away
2994 $widget->update; 3745 $w->update;
2995 }, 3746 $w->update_timer;
2996 ); 3747 };
3748
3749 $self->update_face;
3750 $self->update_timer;
2997 } 3751 }
2998 3752
2999 $self 3753 $self
3000} 3754}
3001 3755
3756sub update_timer {
3757 my ($self) = @_;
3758
3759 return unless $self->{timer};
3760
3761 if ($self->{visible}) {
3762 $self->{timer}->start;
3763 } else {
3764 $self->{timer}->stop;
3765 }
3766}
3767
3768sub update_face {
3769 my ($self) = @_;
3770
3771 if ($::CONN) {
3772 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3773 if ($anim && @$anim) {
3774 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3775 delete $self->{face_change_cb};
3776
3777 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3778 unless ($tex->{name} || $tex->{loading}) {
3779 $tex->upload (sub { $self->reconfigure });
3780 }
3781 }
3782 }
3783 }
3784 }
3785}
3786
3002sub size_request { 3787sub size_request {
3003 (32, 8) 3788 my ($self) = @_;
3789
3790 if ($::CONN) {
3791 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3792 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3793 if ($tex->{name}) {
3794 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3795 } elsif (!$tex->{loading}) {
3796 $tex->upload (sub { $self->reconfigure });
3797 }
3798 }
3799
3800 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3801 }
3802 }
3803
3804 ($self->{size_w} || 8, $self->{size_h} || 8)
3004} 3805}
3005 3806
3006sub update { 3807sub update {
3007 my ($self) = @_; 3808 my ($self) = @_;
3008 3809
3009 return unless $self->{visible}; 3810 return unless $self->{visible};
3010 3811
3011 $self->SUPER::update; 3812 $self->SUPER::update;
3012} 3813}
3013 3814
3815sub invoke_visibility_change {
3816 my ($self) = @_;
3817
3818 $self->update_timer;
3819
3820 0
3821}
3822
3014sub _draw { 3823sub _draw {
3015 my ($self) = @_; 3824 my ($self) = @_;
3016 3825
3017 return unless $::CONN; 3826 $self->SUPER::_draw;
3018 3827
3019 my $face; 3828 if (my $tex = $self->{tex}) {
3020
3021 if ($self->{frame}) {
3022 my $anim = $::CONN->{anim}[$self->{anim}];
3023
3024 $face = $anim->[ $self->{frame} % @$anim ]
3025 if $anim && @$anim;
3026 }
3027
3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3029
3030 if ($tex) {
3031 glEnable GL_TEXTURE_2D; 3829 glEnable GL_TEXTURE_2D;
3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033 glColor 0, 0, 0, 1; 3831 glColor 0, 0, 0, 1;
3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3832 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3035 glDisable GL_TEXTURE_2D; 3833 glDisable GL_TEXTURE_2D;
3037} 3835}
3038 3836
3039sub destroy { 3837sub destroy {
3040 my ($self) = @_; 3838 my ($self) = @_;
3041 3839
3042 $self->{timer}->cancel 3840 (delete $self->{timer})->cancel
3043 if $self->{timer}; 3841 if $self->{timer};
3044 3842
3045 $self->SUPER::destroy; 3843 $self->SUPER::destroy;
3046} 3844}
3047 3845
3048############################################################################# 3846#############################################################################
3049 3847
3050package CFClient::UI::Buttonbar; 3848package DC::UI::Buttonbar;
3051 3849
3052our @ISA = CFClient::UI::HBox::; 3850our @ISA = DC::UI::HBox::;
3053 3851
3054# TODO: should actualyl wrap buttons and other goodies. 3852# TODO: should actually wrap buttons and other goodies.
3055 3853
3056############################################################################# 3854#############################################################################
3057 3855
3058package CFClient::UI::Menu; 3856package DC::UI::Menu;
3059 3857
3060our @ISA = CFClient::UI::FancyFrame::; 3858our @ISA = DC::UI::Toplevel::;
3061 3859
3062use CFClient::OpenGL; 3860use DC::OpenGL;
3063 3861
3064sub new { 3862sub new {
3065 my $class = shift; 3863 my $class = shift;
3066 3864
3067 my $self = $class->SUPER::new ( 3865 my $self = $class->SUPER::new (
3068 items => [], 3866 items => [],
3069 z => 100, 3867 z => 100,
3070 @_, 3868 @_,
3071 ); 3869 );
3072 3870
3073 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3871 $self->add ($self->{vbox} = new DC::UI::VBox);
3074 3872
3075 for my $item (@{ $self->{items} }) { 3873 for my $item (@{ $self->{items} }) {
3076 my ($widget, $cb, $tooltip) = @$item; 3874 my ($widget, $cb, $tooltip) = @$item;
3077 3875
3078 # handle various types of items, only text for now 3876 # handle various types of items, only text for now
3079 if (!ref $widget) { 3877 if (!ref $widget) {
3080 if ($widget =~ /\t/) { 3878 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2; 3879 my ($left, $right) = split /\t/, $widget, 2;
3082 3880
3083 $widget = new CFClient::UI::HBox 3881 $widget = new DC::UI::HBox
3084 can_hover => 1, 3882 can_hover => 1,
3085 can_events => 1, 3883 can_events => 1,
3086 tooltip => $tooltip, 3884 tooltip => $tooltip,
3087 children => [ 3885 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1), 3887 (new DC::UI::Label markup => $right, align => 1),
3090 ], 3888 ],
3091 ; 3889 ;
3092 3890
3093 } else { 3891 } else {
3094 $widget = new CFClient::UI::Label 3892 $widget = new DC::UI::Label
3095 can_hover => 1, 3893 can_hover => 1,
3096 can_events => 1, 3894 can_events => 1,
3895 align => 0,
3097 markup => $widget, 3896 markup => $widget,
3098 tooltip => $tooltip; 3897 tooltip => $tooltip;
3099 } 3898 }
3100 } 3899 }
3101 3900
3116 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3117 $GRAB = $self; 3916 $GRAB = $self;
3118 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3119 3918
3120 $self->show; 3919 $self->show;
3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3122} 3929}
3123 3930
3124sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3125 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3126 3933
3147 1 3954 1
3148} 3955}
3149 3956
3150############################################################################# 3957#############################################################################
3151 3958
3152package CFClient::UI::Multiplexer; 3959package DC::UI::Multiplexer;
3153 3960
3154our @ISA = CFClient::UI::Container::; 3961our @ISA = DC::UI::Container::;
3155 3962
3156sub new { 3963sub new {
3157 my $class = shift; 3964 my $class = shift;
3158 3965
3159 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3160 @_, 3967 @_,
3161 ); 3968 );
3162 3969
3163 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3164 if @{ $self->{children} };
3165 3971
3166 $self 3972 $self
3167} 3973}
3168 3974
3169sub add { 3975sub add {
3170 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3171 3977
3172 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3173 3979
3174 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3175 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3176} 3982}
3177 3983
3178sub get_current_page { 3984sub get_current_page {
3179 my ($self) = @_; 3985 my ($self) = @_;
3180 3986
3186 3992
3187 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3188 ? $page_or_widget 3994 ? $page_or_widget
3189 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3190 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3191 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3193 4002
3194 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3195 4005
3196 $self->realloc; 4006 $self->realloc;
3197} 4007}
3198 4008
3199sub visible_children { 4009sub visible_children {
3200 $_[0]{current} 4010 $_[0]{current} || ()
3201} 4011}
3202 4012
3203sub size_request { 4013sub size_request {
3204 my ($self) = @_; 4014 my ($self) = @_;
3205 4015
4016 $self->{current}
3206 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3207} 4019}
3208 4020
3209sub invoke_size_allocate { 4021sub invoke_size_allocate {
3210 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3211 4023
3212 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3213 4026
3214 1 4027 1
3215} 4028}
3216 4029
3217sub _draw { 4030sub _draw {
3218 my ($self) = @_; 4031 my ($self) = @_;
3219 4032
3220 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3221} 4035}
3222 4036
3223############################################################################# 4037#############################################################################
3224 4038
3225package CFClient::UI::Notebook; 4039package DC::UI::Notebook;
3226 4040
4041use DC::OpenGL;
4042
3227our @ISA = CFClient::UI::VBox::; 4043our @ISA = DC::UI::VBox::;
3228 4044
3229sub new { 4045sub new {
3230 my $class = shift; 4046 my $class = shift;
3231 4047
3232 my $self = $class->SUPER::new ( 4048 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar), 4049 buttonbar => (new DC::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4050 multiplexer => (new DC::UI::Multiplexer expand => 1),
4051 active_outline => [.7, .7, 0.2],
3235 # filter => # will be put between multiplexer and $self 4052 # filter => # will be put between multiplexer and $self
3236 @_, 4053 @_,
3237 ); 4054 );
3238 4055
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241 4058
4059 {
4060 Scalar::Util::weaken (my $wself = $self);
4061
4062 $self->{multiplexer}->connect (c_add => sub {
4063 my ($mplex, $widgets) = @_;
4064
4065 for my $child (@$widgets) {
4066 Scalar::Util::weaken $child;
4067 $child->{c_tab_} ||= do {
4068 my $tab =
4069 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4070 ? $child->{c_tab}
4071 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4072
4073 $tab->connect (activate => sub {
4074 $wself->set_current_page ($child);
4075 });
4076
4077 $tab
4078 };
4079
4080 $self->{buttonbar}->add ($child->{c_tab_});
4081 }
4082 });
4083
4084 $self->{multiplexer}->connect (c_remove => sub {
4085 my ($mplex, $widgets) = @_;
4086
4087 for my $child (@$widgets) {
4088 $wself->{buttonbar}->remove ($child->{c_tab_});
4089 }
4090 });
4091 }
4092
3242 $self 4093 $self
3243} 4094}
3244 4095
3245sub add { 4096sub add {
4097 my ($self, @widgets) = @_;
4098
4099 $self->{multiplexer}->add (@widgets)
4100}
4101
4102sub remove {
4103 my ($self, @widgets) = @_;
4104
4105 $self->{multiplexer}->remove (@widgets)
4106}
4107
4108sub pages {
4109 my ($self) = @_;
4110 $self->{multiplexer}->children
4111}
4112
4113sub page_index {
4114 my ($self, $widget) = @_;
4115
4116 my $i = 0;
4117 for ($self->pages) {
4118 if ($_ eq $widget) { return $i };
4119 $i++;
4120 }
4121
4122 undef
4123}
4124
4125sub add_tab {
3246 my ($self, $title, $widget, $tooltip) = @_; 4126 my ($self, $title, $widget, $tooltip) = @_;
3247 4127
3248 Scalar::Util::weaken $self; 4128 $title = [$title, $tooltip] unless ref $title;
4129 $widget->{c_tab} = $title;
3249 4130
3250 $self->{buttonbar}->add (new CFClient::UI::Button
3251 markup => $title,
3252 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) },
3254 );
3255
3256 $self->{multiplexer}->add ($widget); 4131 $self->add ($widget);
3257} 4132}
3258 4133
3259sub get_current_page { 4134sub get_current_page {
3260 my ($self) = @_; 4135 my ($self) = @_;
3261 4136
3267 4142
3268 $self->{multiplexer}->set_current_page ($page); 4143 $self->{multiplexer}->set_current_page ($page);
3269 $self->emit (page_changed => $self->{multiplexer}{current}); 4144 $self->emit (page_changed => $self->{multiplexer}{current});
3270} 4145}
3271 4146
4147sub _draw {
4148 my ($self) = @_;
4149
4150 $self->SUPER::_draw ();
4151
4152 if (my $cur = $self->{multiplexer}{current}) {
4153 if ($cur = $cur->{c_tab_}) {
4154 glTranslate $self->{buttonbar}{x} + $cur->{x},
4155 $self->{buttonbar}{y} + $cur->{y};
4156 glLineWidth 3;
4157 #glEnable GL_BLEND;
4158 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4159 glColor @{$self->{active_outline}};
4160 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4161 glLineWidth 1;
4162 #glDisable GL_BLEND;
4163 }
4164 }
4165}
4166
3272############################################################################# 4167#############################################################################
3273 4168
3274package CFClient::UI::Combobox; 4169package DC::UI::Selector;
3275 4170
3276use utf8; 4171use utf8;
3277 4172
3278our @ISA = CFClient::UI::Button::; 4173our @ISA = DC::UI::Button::;
3279 4174
3280sub new { 4175sub new {
3281 my $class = shift; 4176 my $class = shift;
3282 4177
3283 my $self = $class->SUPER::new ( 4178 my $self = $class->SUPER::new (
3300 my ($value, $title, $tooltip) = @$_; 4195 my ($value, $title, $tooltip) = @$_;
3301 4196
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4197 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 } 4198 }
3304 4199
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4200 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306} 4201}
3307 4202
3308sub _set_value { 4203sub _set_value {
3309 my ($self, $value) = @_; 4204 my ($self, $value) = @_;
3310 4205
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4206 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4207 $item ||= $self->{options}[0]
3312 or return; 4208 or return;
3313 4209
3314 $self->{value} = $item->[0]; 4210 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓"); 4211 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]); 4212# $self->set_tooltip ($item->[2]);
3317} 4213}
3318 4214
3319sub set_value { 4215sub set_value {
3320 my ($self, $value) = @_; 4216 my ($self, $value) = @_;
3321 4217
3323 4219
3324 $self->_set_value ($value); 4220 $self->_set_value ($value);
3325 $self->emit (changed => $value); 4221 $self->emit (changed => $value);
3326} 4222}
3327 4223
4224sub set_options {
4225 my ($self, $options) = @_;
4226
4227 $self->{options} = $options;
4228 $self->_set_value ($self->{value});
4229}
4230
3328############################################################################# 4231#############################################################################
3329 4232
3330package CFClient::UI::Statusbox; 4233package DC::UI::Statusbox;
3331 4234
3332our @ISA = CFClient::UI::VBox::; 4235our @ISA = DC::UI::VBox::;
3333 4236
3334sub new { 4237sub new {
3335 my $class = shift; 4238 my $class = shift;
3336 4239
3337 my $self = $class->SUPER::new ( 4240 my $self = $class->SUPER::new (
3338 fontsize => 0.8, 4241 fontsize => 0.8,
3339 @_, 4242 @_,
3340 ); 4243 );
3341 4244
3342 Scalar::Util::weaken (my $this = $self); 4245 DC::weaken (my $this = $self);
3343 4246
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4247 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3345 4248
3346 $self 4249 $self
3347} 4250}
3348 4251
3349sub reorder { 4252sub reorder {
3350 my ($self) = @_; 4253 my ($self) = @_;
3351 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
3352 4255
3353 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} }; 4259 values %{ $self->{item} };
3357 4260
3358 while (my ($k, $v) = each %{ $self->{item} }) { 4261 while (my ($k, $v) = each %{ $self->{item} }) {
3359 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4262 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360 } 4263 }
4264
4265 $self->{timer}->set (1, 1);
3361 4266
3362 my @widgets; 4267 my @widgets;
3363 4268
3364 my @items = sort { 4269 my @items = sort {
3365 $a->{pri} <=> $b->{pri} 4270 $a->{pri} <=> $b->{pri}
3366 or $b->{id} <=> $a->{id} 4271 or $b->{id} <=> $a->{id}
3367 } values %{ $self->{item} }; 4272 } values %{ $self->{item} };
3368
3369 $self->{timer}->interval (1);
3370 4273
3371 my $count = 10 + 1; 4274 my $count = 10 + 1;
3372 for my $item (@items) { 4275 for my $item (@items) {
3373 last unless --$count; 4276 last unless --$count;
3374 4277
3381 for ($short) { 4284 for ($short) {
3382 s/^\s+//; 4285 s/^\s+//;
3383 s/\s+/ /g; 4286 s/\s+/ /g;
3384 } 4287 }
3385 4288
3386 new CFClient::UI::Label 4289 new DC::UI::Label
3387 markup => $short, 4290 markup => $short,
3388 tooltip => $item->{tooltip}, 4291 tooltip => $item->{tooltip},
3389 tooltip_font => $::FONT_PROP, 4292 tooltip_font => $::FONT_PROP,
3390 tooltip_width => 0.67, 4293 tooltip_width => 0.67,
3391 fontsize => $item->{fontsize} || $self->{fontsize}, 4294 fontsize => $item->{fontsize} || $self->{fontsize},
3392 max_w => $::WIDTH * 0.44, 4295 max_w => $::WIDTH * 0.44,
4296 align => 0,
3393 fg => [@{ $item->{fg} }], 4297 fg => [@{ $item->{fg} }],
3394 can_events => 1, 4298 can_events => 1,
3395 can_hover => 1 4299 can_hover => 1
3396 }; 4300 };
3397 4301
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4302 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4303 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update; 4304 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff) 4305 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1; 4306 if $diff < 1;
3403 $self->{timer}->interval (1/30); 4307 $self->{timer}->set (1/30, 1/30);
3404 } else { 4308 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 } 4310 }
3407 4311
3408 push @widgets, $label; 4312 push @widgets, $label;
3409 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
3410 4318
3411 $self->clear; 4319 $self->clear;
3412 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
3413} 4321}
3414 4322
3470 $self->SUPER::destroy; 4378 $self->SUPER::destroy;
3471} 4379}
3472 4380
3473############################################################################# 4381#############################################################################
3474 4382
3475package CFClient::UI::Inventory;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 col_expand => [0, 1, 0],
3484 @_,
3485 );
3486
3487 $self
3488}
3489
3490sub set_items {
3491 my ($self, $items) = @_;
3492
3493 $self->clear;
3494 return unless $items;
3495
3496 my @items = sort {
3497 ($a->{type} <=> $b->{type})
3498 or ($a->{name} cmp $b->{name})
3499 } values %$items;
3500
3501 $self->{real_items} = \@items;
3502
3503 my $row = 0;
3504 for my $item (@items) {
3505 CFClient::Item::update_widgets $item;
3506
3507 $self->add (0, $row, $item->{face_widget});
3508 $self->add (1, $row, $item->{desc_widget});
3509 $self->add (2, $row, $item->{weight_widget});
3510
3511 $row++;
3512 }
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::SpellList;
3518
3519our @ISA = CFClient::UI::Table::;
3520
3521sub new {
3522 my $class = shift;
3523
3524 my $self = $class->SUPER::new (
3525 binding => [],
3526 commands => [],
3527 @_,
3528 )
3529}
3530
3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3616sub add_spell {
3617 my ($self, $spell) = @_;
3618
3619 $self->{spell}->{$spell->{name}} = $spell;
3620 $self->rebuild_spell_list;
3621}
3622
3623sub remove_spell {
3624 my ($self, $spell) = @_;
3625
3626 delete $self->{spell}->{$spell->{name}};
3627 $self->rebuild_spell_list;
3628}
3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::Root; 4383package DC::UI::Root;
3640 4384
3641our @ISA = CFClient::UI::Container::; 4385our @ISA = DC::UI::Container::;
3642 4386
3643use List::Util qw(min max); 4387use List::Util qw(min max);
3644 4388
3645use CFClient::OpenGL; 4389use DC::OpenGL;
3646 4390
3647sub new { 4391sub new {
3648 my $class = shift; 4392 my $class = shift;
3649 4393
3650 my $self = $class->SUPER::new ( 4394 my $self = $class->SUPER::new (
3651 visible => 1, 4395 visible => 1,
3652 @_, 4396 @_,
3653 ); 4397 );
3654 4398
3655 Scalar::Util::weaken ($self->{root} = $self); 4399 DC::weaken ($self->{root} = $self);
3656 4400
3657 $self 4401 $self
3658} 4402}
3659 4403
3660sub size_request { 4404sub size_request {
3708} 4452}
3709 4453
3710sub update { 4454sub update {
3711 my ($self) = @_; 4455 my ($self) = @_;
3712 4456
3713 $::WANT_REFRESH++; 4457 $::WANT_REFRESH = 1;
3714} 4458}
3715 4459
3716sub add { 4460sub add {
3717 my ($self, @children) = @_; 4461 my ($self, @children) = @_;
3718 4462
3755 while ($self->{refresh_hook}) { 4499 while ($self->{refresh_hook}) {
3756 $_->() 4500 $_->()
3757 for values %{delete $self->{refresh_hook}}; 4501 for values %{delete $self->{refresh_hook}};
3758 } 4502 }
3759 4503
3760 if ($self->{realloc}) { 4504 while ($self->{realloc}) {
3761 my %queue; 4505 my %queue;
3762 my @queue; 4506 my @queue;
3763 my $widget; 4507 my $widget;
3764 4508
3765 outer: 4509 outer:
3785 4529
3786 delete $queue{$widget+0}; 4530 delete $queue{$widget+0};
3787 4531
3788 my ($w, $h) = $widget->size_request; 4532 my ($w, $h) = $widget->size_request;
3789 4533
3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4534 $w += $widget->{padding_x} * 2;
3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4535 $h += $widget->{padding_y} * 2;
4536
4537 $w = max $widget->{min_w}, $w;
4538 $h = max $widget->{min_h}, $h;
3792 4539
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4540 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4541 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3795 4542
3796 $w = $widget->{force_w} if exists $widget->{force_w}; 4543 $w = $widget->{force_w} if exists $widget->{force_w};
3812 } 4559 }
3813 } 4560 }
3814 4561
3815 delete $self->{realloc}{$widget+0}; 4562 delete $self->{realloc}{$widget+0};
3816 } 4563 }
3817 }
3818 4564
3819 while (my $size_alloc = delete $self->{size_alloc}) { 4565 while (my $size_alloc = delete $self->{size_alloc}) {
3820 my @queue = sort { $b->{visible} <=> $a->{visible} } 4566 my @queue = sort { $a->{visible} <=> $b->{visible} }
3821 values %$size_alloc; 4567 values %$size_alloc;
3822 4568
3823 while () { 4569 while () {
3824 my $widget = pop @queue || last; 4570 my $widget = pop @queue || last;
3825 4571
3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4572 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3827 4573
3828 $w = 0 if $w < 0;
3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w; 4574 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h; 4575 $h = max $widget->{min_h}, $h;
3833 4576
4577# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4578# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4579
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4580 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4581 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836 4582
3837 $w = int $w + 0.5; 4583 $w = int $w + 0.5;
3838 $h = int $h + 0.5; 4584 $h = int $h + 0.5;
3839 4585
3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4586 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841 $widget->{old_w} = $widget->{w}; 4587 $widget->{old_w} = $widget->{w};
3842 $widget->{old_h} = $widget->{h}; 4588 $widget->{old_h} = $widget->{h};
3843 4589
3844 $widget->{w} = $w; 4590 $widget->{w} = $w;
3845 $widget->{h} = $h; 4591 $widget->{h} = $h;
3846 4592
3847 $widget->emit (size_allocate => $w, $h); 4593 $widget->emit (size_allocate => $w, $h);
4594 }
3848 } 4595 }
3849 } 4596 }
3850 } 4597 }
3851 4598
3852 while ($self->{post_alloc_hook}) { 4599 while ($self->{post_alloc_hook}) {
3853 $_->() 4600 $_->()
3854 for values %{delete $self->{post_alloc_hook}}; 4601 for values %{delete $self->{post_alloc_hook}};
3855 } 4602 }
3856
3857 4603
3858 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4604 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4605 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860 glClear GL_COLOR_BUFFER_BIT; 4606 glClear GL_COLOR_BUFFER_BIT;
3861 4607
3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4610 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865 glMatrixMode GL_MODELVIEW; 4611 glMatrixMode GL_MODELVIEW;
3866 glLoadIdentity; 4612 glLoadIdentity;
3867 4613
3868 { 4614 {
3869 package CFClient::UI::Base; 4615 package DC::UI::Base;
3870 4616
3871 ($draw_x, $draw_y, $draw_w, $draw_h) = 4617 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h}); 4618 (0, 0, $self->{w}, $self->{h});
3873 }
3874 4619
3875 $self->_draw; 4620 $self->_draw;
4621 }
3876} 4622}
3877 4623
3878############################################################################# 4624#############################################################################
3879 4625
3880package CFClient::UI; 4626package DC::UI;
3881 4627
3882$ROOT = new CFClient::UI::Root; 4628$ROOT = new DC::UI::Root;
3883$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
3884 4630
38851 46311
3886

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines