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

Diff Legend

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