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

Diff Legend

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