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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 61 }
42 62
43 return; 63 return;
44 } 64 }
45 } 65 }
49 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
61} 81}
62 82
63sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
64 my ($ev) = @_; 84 my ($ev) = @_;
73 check_tooltip; 93 check_tooltip;
74 } 94 }
75 95
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 97
78 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 100}
83 101
84sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
85 my ($ev) = @_; 103 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
87 105
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 107
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 109
92 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 112
97 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 115 $grab->update if $grab;
100 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 133
118 check_tooltip; 134 check_tooltip;
119 } 135 }
120 136
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 138 if $HOVER;
125} 139}
126 140
127# convert position array to integers 141# convert position array to integers
128sub harmonize { 142sub harmonize {
129 my ($vals) = @_; 143 my ($vals) = @_;
135 $rem += $_ - $i; 149 $rem += $_ - $i;
136 $_ = $i; 150 $_ = $i;
137 } 151 }
138} 152}
139 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
140############################################################################# 195#############################################################################
141 196
142package CFClient::UI::Base; 197package CFClient::UI::Base;
143 198
144use strict; 199use strict;
147 202
148sub new { 203sub new {
149 my $class = shift; 204 my $class = shift;
150 205
151 my $self = bless { 206 my $self = bless {
152 x => 0, 207 x => "center",
153 y => 0, 208 y => "center",
154 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
155 can_events => 1, 212 can_events => 1,
156 @_ 213 @_
157 }, $class; 214 }, $class;
158 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
159 for (keys %$self) { 218 for (keys %$self) {
160 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
162 } 221 }
163 } 222 }
164 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
165 $self 236 $self
166} 237}
167 238
168sub destroy { 239sub destroy {
169 my ($self) = @_; 240 my ($self) = @_;
178 return if $self->{parent}; 249 return if $self->{parent};
179 250
180 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
181} 252}
182 253
183sub hide { 254sub set_visible {
184 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
185 278
186 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
188 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
240 } 368 }
241} 369}
242 370
243sub size_allocate { 371sub size_allocate {
244 # nothing to be done 372 # nothing to be done
245} 373}
246 374
247sub children { 375sub children {
248} 376}
249 377
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
262sub set_max_size { 378sub set_max_size {
263 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
264 380
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
267} 399}
268 400
269# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
270sub coord2local { 402sub coord2local {
271 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
286 return if $FOCUS == $self; 418 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
288 420
289 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
290 422
291 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
292 424
293 $focus->update if $focus; 425 $focus->update if $focus;
294 $FOCUS->update; 426 $FOCUS->update;
295} 427}
296 428
299 431
300 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
301 433
302 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
303 435
304 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
305 437
306 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
307} 442}
308 443
309sub mouse_motion { } 444sub mouse_motion { }
310sub button_up { } 445sub button_up { }
311sub key_down { } 446sub key_down { }
312sub key_up { } 447sub key_up { }
313 448
314sub button_down { 449sub button_down {
315 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
316 451
317 $self->focus_in; 452 $self->focus_in;
318} 453}
319 454
320sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
321sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
322sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
323sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
324sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
325 528
326sub draw { 529sub draw {
327 my ($self) = @_; 530 my ($self) = @_;
328 531
329 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
330 543
331 glPushMatrix; 544 glPushMatrix;
332 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
333 $self->_draw; 546 $self->_draw;
334 glPopMatrix; 547 glPopMatrix;
346 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
347 glEnd; 560 glEnd;
348 glDisable GL_BLEND; 561 glDisable GL_BLEND;
349 } 562 }
350 563
351 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
352 glPushMatrix; 565 glPushMatrix;
353 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0; 569 glVertex 0 , 0;
357 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
358 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
359 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
360 glEnd; 573 glEnd;
361 glPopMatrix; 574 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 576 }
364} 577}
365 578
366sub _draw { 579sub _draw {
367 my ($self) = @_; 580 my ($self) = @_;
368 581
369 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
370} 583}
371 584
372sub find_widget {
373 my ($self, $x, $y) = @_;
374
375 return () unless $self->{can_events};
376
377 return $self
378 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
379 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
380
381 ()
382}
383
384sub set_parent {
385 my ($self, $parent) = @_;
386
387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 585sub DESTROY {
420 my ($self) = @_; 586 my ($self) = @_;
421 587
588 delete $WIDGET{$self+0};
422 #$self->deactivate; 589 #$self->deactivate;
423} 590}
424 591
425############################################################################# 592#############################################################################
426 593
435 my $class = shift; 602 my $class = shift;
436 603
437 # range [value, low, high, page] 604 # range [value, low, high, page]
438 605
439 $class->SUPER::new ( 606 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
442 @_ 609 @_
443 ) 610 )
444} 611}
445 612
446sub _draw { 613sub _draw {
447 my ($self) = @_; 614 my ($self) = @_;
448 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
450 622
451 glEnable GL_BLEND; 623 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
454 626
455 glBegin GL_QUADS; 627 glBegin GL_QUADS;
456 glVertex 0 , 0; 628 glVertex 0 , 0;
457 glVertex 0 , $h; 629 glVertex 0 , $h;
458 glVertex $w, $h; 630 glVertex $w, $h;
459 glVertex $w, 0; 631 glVertex $w, 0;
460 glEnd; 632 glEnd;
461 633
462 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
463} 636}
464 637
465############################################################################# 638#############################################################################
466 639
467package CFClient::UI::Empty; 640package CFClient::UI::Empty;
472 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
474} 647}
475 648
476sub size_request { 649sub size_request {
477 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
478} 653}
479 654
480sub draw { } 655sub draw { }
481 656
482############################################################################# 657#############################################################################
511 $self->{children} = [ 686 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
514 ]; 689 ];
515 690
516 $self->check_size (1); 691 $self->realloc;
517 $self->update;
518} 692}
519 693
520sub children { 694sub children {
521 @{ $_[0]{children} } 695 @{ $_[0]{children} }
522} 696}
527 delete $child->{parent}; 701 delete $child->{parent};
528 $child->hide; 702 $child->hide;
529 703
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 705
532 $self->check_size; 706 $self->realloc;
533 $self->update;
534} 707}
535 708
536sub clear { 709sub clear {
537 my ($self) = @_; 710 my ($self) = @_;
538 711
542 for (@$children) { 715 for (@$children) {
543 delete $_->{parent}; 716 delete $_->{parent};
544 $_->hide; 717 $_->hide;
545 } 718 }
546 719
547 $self->check_size; 720 $self->realloc;
548 $self->update;
549} 721}
550 722
551sub find_widget { 723sub find_widget {
552 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
553 725
628} 800}
629 801
630sub update { 802sub update {
631 my ($self) = @_; 803 my ($self) = @_;
632 804
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 806 $self->SUPER::update;
635} 807}
636 808
637sub size_allocate { 809sub size_allocate {
638 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
640 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 813 $self->update;
642} 814}
643 815
644sub _render { 816sub _render {
817 my ($self) = @_;
818
645 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
646} 820}
647 821
648sub render_child { 822sub render_child {
649 my ($self) = @_; 823 my ($self) = @_;
650 824
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
654 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
655 $self->_render; 836 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 837 };
664} 838}
665 839
666sub _draw { 840sub _draw {
667 my ($self) = @_; 841 my ($self) = @_;
668 842
669 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
670 844
671 my $tex = $self->{texture} 845 my $tex = $self->{texture}
672 or return; 846 or return;
673 847
674 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
677 851
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 853
680 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
681} 855}
684 858
685package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
686 860
687our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
688 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
689sub size_request { 873sub size_request {
690 my ($self) = @_; 874 my ($self) = @_;
691 875
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 877
695 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
696} 882}
697 883
698sub size_allocate { 884sub size_allocate {
699 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
700 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
701 $self->update; 893 $self->update;
702} 894}
703 895
704sub set_offset { 896sub set_offset {
705 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
739} 931}
740 932
741sub _render { 933sub _render {
742 my ($self) = @_; 934 my ($self) = @_;
743 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 940
746 $self->SUPER::_render; 941 $self->SUPER::_render;
747} 942}
748 943
756 my $class = shift; 951 my $class = shift;
757 952
758 my $self; 953 my $self;
759 954
760 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
761 vertical => 1, 956 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 958 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
765 }, 960 },
766 ; 961 ;
767 962
768 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 965 slider => $slider,
771 @_, 966 @_,
772 ); 967 );
773 968
774 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
777 972
778 $self 973 $self
779} 974}
780 975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
781#TODO# update range on size_allocate depeneing on child 995#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 996# update viewport offset on scroll
783 997
784############################################################################# 998#############################################################################
785 999
786package CFClient::UI::Frame; 1000package CFClient::UI::Frame;
787 1001
788our @ISA = CFClient::UI::Bin::; 1002our @ISA = CFClient::UI::Bin::;
789 1003
790use CFClient::OpenGL; 1004use CFClient::OpenGL;
791
792#############################################################################
793
794package CFClient::UI::FancyFrame;
795
796our @ISA = CFClient::UI::Bin::;
797
798use CFClient::OpenGL;
799
800my @tex =
801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
802 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803 1005
804sub new { 1006sub new {
805 my $class = shift; 1007 my $class = shift;
806 1008
807 # TODO: user_x, user_y, overwrite moveto? 1009 $class->SUPER::new (
1010 bg => undef,
1011 @_,
1012 )
1013}
1014
1015sub _draw {
1016 my ($self) = @_;
1017
1018 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)};
1020
1021 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} };
1024
1025 glBegin GL_QUADS;
1026 glVertex 0 , 0;
1027 glVertex 0 , $h;
1028 glVertex $w, $h;
1029 glVertex $w, 0;
1030 glEnd;
1031
1032 glDisable GL_BLEND;
1033 }
1034
1035 $self->SUPER::_draw;
1036}
1037
1038#############################################################################
1039
1040package CFClient::UI::FancyFrame;
1041
1042our @ISA = CFClient::UI::Bin::;
1043
1044use CFClient::OpenGL;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053
1054sub new {
1055 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
808 1058
809 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
812 border => 0.6, 1062 border => 0.6,
813 can_events => 1, 1063 can_events => 1,
814 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
815 ); 1067 );
816 1068
817 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
818 align => 0, 1070 align => 0,
819 valign => 1, 1071 valign => 1,
820 text => $self->{title}, 1072 text => $title,
821 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
822 1075
823 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
824} 1084}
825 1085
826sub border { 1086sub border {
827 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
828} 1088}
829 1089
830sub size_request { 1090sub size_request {
831 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
832 1095
833 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
834 1097
835 ( 1098 (
836 $w + $self->border * 2, 1099 $w + $self->border * 2,
839} 1102}
840 1103
841sub size_allocate { 1104sub size_allocate {
842 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
843 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
844 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
846 1117
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
848 if $self->{title};
849
850 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
851} 1119}
852 1120
853sub button_down { 1121sub button_down {
854 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
855 1123
871 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
872 1140
873 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
875 1143
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size;
880 }; 1149 };
881 1150
882 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
886 $self->{motion} = sub { 1155 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
888 1157
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
890 1159
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update;
893 }; 1161 };
894 } 1162 }
895} 1163}
896 1164
897sub button_up { 1165sub button_up {
907} 1175}
908 1176
909sub _draw { 1177sub _draw {
910 my ($self) = @_; 1178 my ($self) = @_;
911 1179
1180 my $child = $self->{children}[0];
1181
912 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
914 1184
915 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1187
918 my $border = $self->border; 1188 my $border = $self->border;
919 1189
920 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1195
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
928 1198
929 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
932
933 glColor @{ $self->{bg} };
934
935 $bg->{s} = $rep_x;
936 $bg->{t} = $rep_y;
937 $bg->{wrap_mode} = 1;
938 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1204 }
940 1205
941 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
942 1207
943 $self->{title}->draw if $self->{title};
944
945 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
946} 1214}
947 1215
948############################################################################# 1216#############################################################################
949 1217
950package CFClient::UI::Table; 1218package CFClient::UI::Table;
958sub new { 1226sub new {
959 my $class = shift; 1227 my $class = shift;
960 1228
961 $class->SUPER::new ( 1229 $class->SUPER::new (
962 col_expand => [], 1230 col_expand => [],
963 @_ 1231 @_,
964 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
965} 1237}
966 1238
967sub add { 1239sub add {
968 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
969 1241
970 $child->set_parent ($self); 1242 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
972 1244
973 $child->check_size; 1245 $self->realloc;
974} 1246}
975 1247
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
980# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
981sub clear { 1249sub clear {
982 my ($self) = @_; 1250 my ($self) = @_;
983 1251
984 my @children = $self->children; 1252 my @children = $self->children;
985 delete $self->{children}; 1253 delete $self->{children};
987 for (@children) { 1255 for (@children) {
988 delete $_->{parent}; 1256 delete $_->{parent};
989 $_->hide; 1257 $_->hide;
990 } 1258 }
991 1259
992 $self->update; 1260 $self->realloc;
993} 1261}
994 1262
995sub get_wh { 1263sub get_wh {
996 my ($self) = @_; 1264 my ($self) = @_;
997 1265
1028sub size_allocate { 1296sub size_allocate {
1029 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1030 1298
1031 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1032 1300
1033 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1035 1303
1036 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1037 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
1093 } 1361 }
1094} 1362}
1095 1363
1096############################################################################# 1364#############################################################################
1097 1365
1098package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1099
1100# TODO: wrap into common Box base class
1101 1367
1102our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1103 1369
1104sub size_request { 1370sub size_request {
1105 my ($self) = @_; 1371 my ($self) = @_;
1106 1372
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1108 1374 ? (
1109 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1110 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111 (List::Util::max map $_->[1], @alloc), 1377 )
1112 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1113} 1382}
1114 1383
1115sub size_allocate { 1384sub size_allocate {
1116 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1117 1386
1118 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1119
1120 my $children = $self->{children}; 1388 my $children = $self->{children};
1121 1389
1122 my @h = map $_->{req_w}, @$children; 1390 my @req;
1123 1391
1124 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1125 1393 @req = ($space / (@$children || 1)) x @$children;
1126 if ($req_h > $h) {
1127 # ah well, not enough space
1128 $_ *= $h / $req_h for @h;
1129 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1130 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131 $exp ||= 1;
1132 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1133 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1134 my $child = $children->[$_];
1135
1136 my $alloc_h = $h[$_];
1137 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138 $h[$_] = $alloc_h;
1139 } 1408 }
1140 } 1409 }
1141 1410
1142 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1143 1412
1144 my $y = 0; 1413 my $pos = 0;
1145 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1148 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149 1417
1150 $y += $h; 1418 $pos += $alloc;
1151 } 1419 }
1152 1420
1153 1 1421 1
1154} 1422}
1155 1423
1156############################################################################# 1424#############################################################################
1157 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1158package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1159 1442
1160# TODO: wrap into common Box base class
1161
1162our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1163 1444
1164sub size_request { 1445sub new {
1165 my ($self) = @_; 1446 my $class = shift;
1166 1447
1167 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1168 1449 vertical => 1,
1169 ( 1450 @_,
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1451 )
1173} 1452}
1174 1453
1175sub size_allocate {
1176 my ($self, $w, $h) = @_;
1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180 my $children = $self->{children};
1181
1182 my @h = map $_->{req_h}, @$children;
1183
1184 my $req_h = List::Util::sum @h;
1185
1186 if ($req_h > $h) {
1187 # ah well, not enough space
1188 $_ *= $h / $req_h for @h;
1189 } else {
1190 my $exp = List::Util::sum map $_->{expand}, @$children;
1191 $exp ||= 1;
1192
1193 for (0 .. $#$children) {
1194 my $child = $children->[$_];
1195
1196 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197 }
1198 }
1199
1200 CFClient::UI::harmonize \@h;
1201
1202 my $y = 0;
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205 my $h = $h[$_];
1206 $child->configure (0, $y, $w, $h);
1207
1208 $y += $h;
1209 }
1210
1211 1
1212}
1213
1214############################################################################# 1454#############################################################################
1215 1455
1216package CFClient::UI::Label; 1456package CFClient::UI::Label;
1217 1457
1218our @ISA = CFClient::UI::Base::; 1458our @ISA = CFClient::UI::DrawBG::;
1219 1459
1220use CFClient::OpenGL; 1460use CFClient::OpenGL;
1221 1461
1222sub new { 1462sub new {
1223 my ($class, %arg) = @_; 1463 my ($class, %arg) = @_;
1224 1464
1225 my $self = $class->SUPER::new ( 1465 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1466 fg => [1, 1, 1],
1467 #bg => none
1468 #active_bg => none
1227 #font => default_font 1469 #font => default_font
1228 #text => initial text 1470 #text => initial text
1229 #markup => initial narkup 1471 #markup => initial narkup
1472 #max_w => maximum pixel width
1473 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1231 fontsize => 1, 1475 fontsize => 1,
1232 align => -1, 1476 align => -1,
1233 valign => -1, 1477 valign => -1,
1234 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1235 can_events => 0, 1480 can_events => 0,
1236 %arg 1481 %arg
1237 ); 1482 );
1238 1483
1239 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
1249 } 1494 }
1250 1495
1251 $self 1496 $self
1252} 1497}
1253 1498
1254sub escape { 1499sub escape($) {
1255 local $_ = $_[1]; 1500 local $_ = $_[0];
1256 1501
1257 s/&/&amp;/g; 1502 s/&/&amp;/g;
1258 s/>/&gt;/g; 1503 s/>/&gt;/g;
1259 s/</&lt;/g; 1504 s/</&lt;/g;
1260 1505
1261 $_[1] 1506 $_
1262} 1507}
1263 1508
1264sub update { 1509sub update {
1265 my ($self) = @_; 1510 my ($self) = @_;
1266 1511
1275 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1276 1521
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1279 1524
1525 $self->realloc;
1280 $self->update; 1526 $self->update;
1281 $self->check_size;
1282} 1527}
1283 1528
1284sub set_markup { 1529sub set_markup {
1285 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1286 1531
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1536
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1293 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1294 1539
1540 $self->realloc;
1295 $self->update; 1541 $self->update;
1296 $self->check_size;
1297} 1542}
1298 1543
1299sub size_request { 1544sub size_request {
1300 my ($self) = @_; 1545 my ($self) = @_;
1301 1546
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1548 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1552
1306 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1307 1554
1308 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
1313 1560
1314 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1316 } 1563 }
1317 1564
1318 ( 1565 ($w, $h)
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 1566}
1323 1567
1324sub size_allocate { 1568sub size_allocate {
1325 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1326 1570
1571 delete $self->{ox};
1572
1327 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1328} 1575}
1329 1576
1330sub set_fontsize { 1577sub set_fontsize {
1331 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1332 1579
1333 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1334 delete $self->{texture}; 1581 delete $self->{texture};
1335 1582
1336 $self->update; 1583 $self->realloc;
1337 $self->check_size;
1338} 1584}
1339 1585
1340sub _draw { 1586sub _draw {
1341 my ($self) = @_; 1587 my ($self) = @_;
1588
1589 $self->SUPER::_draw; # draw background, if applicable
1342 1590
1343 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1592 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1598
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1350 1601
1602 unless (exists $self->{ox}) {
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1605 : ($self->{w} - $tex->{w}) * 0.5);
1354 1606
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1609 : ($self->{h} - $tex->{h}) * 0.5);
1358
1359 $tex
1360 }; 1610 };
1361 1611
1362 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1364 1614
1390 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1391 can_hover => 1, 1641 can_hover => 1,
1392 can_focus => 1, 1642 can_focus => 1,
1393 valign => 0, 1643 valign => 0,
1394 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1395 @_ 1646 @_
1396 ) 1647 )
1397} 1648}
1398 1649
1399sub _set_text { 1650sub _set_text {
1409 $self->{text} = $text; 1660 $self->{text} = $text;
1410 1661
1411 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1413 1664
1414 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1415} 1666}
1416 1667
1417sub set_text { 1668sub set_text {
1418 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1419 1670
1420 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1672 $self->_set_text ($text);
1422 $self->check_size; 1673
1423 $self->update; 1674 $self->realloc;
1424} 1675}
1425 1676
1426sub get_text { 1677sub get_text {
1427 $_[0]{text} 1678 $_[0]{text}
1428} 1679}
1431 my ($self) = @_; 1682 my ($self) = @_;
1432 1683
1433 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1434 1685
1435 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1436}
1437
1438sub size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442} 1687}
1443 1688
1444sub key_down { 1689sub key_down {
1445 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1446 1691
1448 my $sym = $ev->{sym}; 1693 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1694 my $uni = $ev->{unicode};
1450 1695
1451 my $text = $self->get_text; 1696 my $text = $self->get_text;
1452 1697
1453 if ($sym == 8) { 1698 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1700 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1701 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1702 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1703 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1704 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1705 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1710 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1711 $self->_emit ('escape');
1467 } elsif ($uni) { 1712 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1714 }
1470 1715
1471 $self->_set_text ($text); 1716 $self->_set_text ($text);
1472 $self->update; 1717
1718 $self->realloc;
1473} 1719}
1474 1720
1475sub focus_in { 1721sub focus_in {
1476 my ($self) = @_; 1722 my ($self) = @_;
1477 1723
1557 if ($sym == 13) { 1803 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1563 $self->update; 1809 $self->update;
1564 1810
1565 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
1604 1850
1605sub new { 1851sub new {
1606 my $class = shift; 1852 my $class = shift;
1607 1853
1608 $class->SUPER::new ( 1854 $class->SUPER::new (
1609 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1610 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1613 can_hover => 1, 1859 can_hover => 1,
1614 align => 0, 1860 align => 0,
1615 valign => 0, 1861 valign => 0,
1616 can_events => 1, 1862 can_events => 1,
1617 @_ 1863 @_
1618 ) 1864 )
1619} 1865}
1620 1866
1867sub activate { }
1868
1621sub button_up { 1869sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1623 1871
1872 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate");
1627 }
1628} 1875}
1629 1876
1630sub _draw { 1877sub _draw {
1631 my ($self) = @_; 1878 my ($self) = @_;
1632 1879
1661 1908
1662sub new { 1909sub new {
1663 my $class = shift; 1910 my $class = shift;
1664 1911
1665 $class->SUPER::new ( 1912 $class->SUPER::new (
1666 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1667 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1917 bg => [0, 0, 0, 0.2],
1918 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1919 state => 0,
1670 can_hover => 1, 1920 can_hover => 1,
1671 @_ 1921 @_
1672 ) 1922 )
1673} 1923}
1674 1924
1675sub size_request { 1925sub size_request {
1676 my ($self) = @_; 1926 my ($self) = @_;
1677 1927
1678 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1679} 1929}
1680 1930
1681sub button_down { 1931sub button_down {
1682 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1683 1933
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1688 } 1938 }
1689} 1939}
1690 1940
1691sub _draw { 1941sub _draw {
1692 my ($self) = @_; 1942 my ($self) = @_;
1693 1943
1694 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1695 1945
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 1947
1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1699 1951
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 1953
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 1955
1957 qw(s1_slider.png s1_slider_bg.png); 2209 qw(s1_slider.png s1_slider_bg.png);
1958 2210
1959sub new { 2211sub new {
1960 my $class = shift; 2212 my $class = shift;
1961 2213
1962 # range [value, low, high, page] 2214 # range [value, low, high, page, unit]
1963 2215
1964 # TODO: 0-width page 2216 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2217 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2218 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2222 bg => [0, 0, 0, 0.2],
2223 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
1973 vertical => 0, 2227 vertical => 0,
1974 can_hover => 1, 2228 can_hover => 1,
1975 inner_pad => 5, 2229 inner_pad => 0.02,
1976 @_ 2230 @_
1977 ); 2231 );
1978 2232
2233 $self->set_value ($self->{range}[0]);
2234 $self->update;
2235
1979 $self 2236 $self
1980} 2237}
1981 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2250sub set_value {
2251 my ($self, $value) = @_;
2252
2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2254
2255 $hi = $lo + 1 if $hi <= $lo;
2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2259 $value = $lo if $value < $lo;
2260 $value = $hi - $page if $value > $hi - $page;
2261
2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2263 if $unit;
2264
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266
2267 if ($value != $old_value) {
2268 $self->_emit (changed => $value);
2269 $self->update;
2270 }
2271}
2272
1982sub size_request { 2273sub size_request {
1983 my ($self) = @_; 2274 my ($self) = @_;
1984 2275
1985 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2277}
1990 2278
1991sub button_down { 2279sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
1993 2281
1994 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
1995 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
1996} 2287}
1997 2288
1998sub mouse_motion { 2289sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
2000 2291
2001 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294
2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2300 }
2301}
2302
2303sub update {
2304 my ($self) = @_;
2305
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2307 $self->set_value ($self->{range}[0]);
2308
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2003 2311
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2313
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2316
2009 $x -= $inner_pad_px; # substract the padding 2317 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2318 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2319
2015 $self->emit (changed => $x); 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2321 $self->{knob_w} = $knob_w;
2017 } 2322 });
2018}
2019 2323
2020# the inner_* stuff is for generating a padding for the slider handle, 2324 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2325}
2027 2326
2028sub _draw { 2327sub _draw {
2029 my ($self) = @_; 2328 my ($self) = @_;
2030 2329
2031 $self->SUPER::_draw (); 2330 $self->SUPER::_draw ();
2032 2331
2033 my ($w, $h) = @$self{qw(w h)}; 2332 glScale $self->{w}, $self->{h};
2034 2333
2035 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
2037 2336
2337 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2339 }
2043 2340
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2343
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2344 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2346
2068 # draw background 2347 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2348 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2349
2071 # draw handle 2350 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2352
2074 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2075} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2076 2396
2077############################################################################# 2397#############################################################################
2078 2398
2079package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2080 2400
2110 2430
2111 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2432 $self->reflow;
2113} 2433}
2114 2434
2115sub text_height {
2116 my ($self, $text) = @_;
2117
2118 my $layout = $self->{layout};
2119
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w});
2122 $layout->set_markup ($text);
2123
2124 ($layout->size)[1]
2125}
2126
2127sub reflow {
2128 my ($self) = @_;
2129
2130 $self->{need_reflow}++;
2131 $self->update;
2132}
2133
2134sub size_allocate { 2435sub size_allocate {
2135 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2136 2437
2137 $self->SUPER::size_allocate ($w, $h); 2438 $self->SUPER::size_allocate ($w, $h);
2138 2439
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2443
2143 $self->reflow; 2444 $self->reflow;
2144} 2445}
2145 2446
2447sub text_size {
2448 my ($self, $text, $indent) = @_;
2449
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2454 $layout->set_markup ($text);
2455
2456 $layout->size
2457}
2458
2459sub reflow {
2460 my ($self) = @_;
2461
2462 $self->{need_reflow}++;
2463 $self->update;
2464}
2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2146sub add_paragraph { 2481sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2148 2483
2149 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2150 2485 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2154 2489
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158 $self->{children}[1]->update;
2159} 2491}
2160 2492
2161sub update { 2493sub update {
2162 my ($self) = @_; 2494 my ($self) = @_;
2163 2495
2165 2497
2166 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2167 2499
2168 delete $self->{texture}; 2500 delete $self->{texture};
2169 2501
2170 $ROOT->on_refresh ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2171 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2506 my $height = 0;
2173 2507
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2175 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2176 2523
2177 $self->{height} = $height; 2524 $self->{height} = $height;
2178 2525
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2527
2181 delete $self->{texture}; 2528 delete $self->{texture};
2182 } 2529 }
2183 2530
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185 glClearColor 0, 0, 0, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2187 2534
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191 my $top = int $self->{children}[1]{range}[0]; 2535 my $top = int $self->{children}[1]{range}[0];
2192 2536
2193 my $y0 = $top; 2537 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2538 my $y1 = $top + $H;
2195 2539
2196 my $y = 0; 2540 my $y = 0;
2197 2541
2198 my $layout = $self->{layout}; 2542 my $layout = $self->{layout};
2199 2543
2200 $layout->set_font ($self->{font}) if $self->{font}; 2544 $layout->set_font ($self->{font}) if $self->{font};
2201 2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2202 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2551 my $h = $par->[1];
2204 2552
2205 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2208 2557
2209 my ($W, $H) = $layout->size; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2559
2560 glRasterPos $par->[3], $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211 } 2562 }
2212 2563
2213 $y += $h; 2564 $y += $h;
2214 } 2565 }
2215 2566
2216 glDisable GL_TEXTURE_2D; 2567 glDisable GL_BLEND;
2217 }; 2568 };
2218 }); 2569 });
2219} 2570}
2220 2571
2221sub _draw { 2572sub _draw {
2222 my ($self) = @_; 2573 my ($self) = @_;
2223 2574
2224 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2229 2580
2230 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2231 2582
2232} 2583}
2281 2632
2282sub new { 2633sub new {
2283 my $class = shift; 2634 my $class = shift;
2284 2635
2285 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2286 state => 0, 2637 state => 0,
2287 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2288 @_ 2639 @_
2289 ); 2640 );
2290 2641
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2642 $self
2297} 2643}
2298 2644
2299sub toggle_flopper { 2645sub toggle_flopper {
2300 my ($self) = @_; 2646 my ($self) = @_;
2301 2647
2302 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2649}
2314 2650
2315############################################################################# 2651#############################################################################
2316 2652
2317package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
2330} 2666}
2331 2667
2332sub set_tooltip_from { 2668sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2334 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2335 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2683 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2685 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2687 );
2342} 2688}
2343 2689
2344sub size_request { 2690sub size_request {
2345 my ($self) = @_; 2691 my ($self) = @_;
2351 2697
2352sub size_allocate { 2698sub size_allocate {
2353 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2354 2700
2355 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2702}
2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2356} 2720}
2357 2721
2358sub _draw { 2722sub _draw {
2359 my ($self) = @_; 2723 my ($self) = @_;
2360 2724
2377 glVertex $w, $h; 2741 glVertex $w, $h;
2378 glVertex $w, 0; 2742 glVertex $w, 0;
2379 glEnd; 2743 glEnd;
2380 2744
2381 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2382 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2383} 2748}
2384 2749
2385############################################################################# 2750#############################################################################
2386 2751
2391use CFClient::OpenGL; 2756use CFClient::OpenGL;
2392 2757
2393sub new { 2758sub new {
2394 my $class = shift; 2759 my $class = shift;
2395 2760
2396 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2397 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2398 @_, 2764 @_,
2399 ) 2765 );
2766
2767 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self);
2769
2770 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1,
2773 interval => $self->{animspeed},
2774 cb => sub {
2775 ++$widget->{frame};
2776 $widget->update;
2777 },
2778 );
2779 }
2780
2781 $self
2400} 2782}
2401 2783
2402sub size_request { 2784sub size_request {
2403 (32, 8) 2785 (32, 8)
2404} 2786}
2405 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2406sub _draw { 2796sub _draw {
2407 my ($self) = @_; 2797 my ($self) = @_;
2408 2798
2409 return unless $::CONN;#d# manage and cache textures differently 2799 return unless $::CONN;
2800
2801 my $face;
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2811
2412 # TODO animation
2413 if ($tex) { 2812 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2419 } 2818 }
2420} 2819}
2421 2820
2422############################################################################# 2821sub DESTROY {
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_; 2822 my ($self) = @_;
2507 2823
2508 $self->{scrolled}->clear; 2824 $self->{timer}->cancel
2509 return unless $items; 2825 if $self->{timer};
2510 2826
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2827 $self->SUPER::DESTROY;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529} 2828}
2530 2829
2531############################################################################# 2830#############################################################################
2532 2831
2533package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
2568 2867
2569# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2570sub popup { 2869sub popup {
2571 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2572 2871
2573 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2574 2873
2575 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2875 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2578 2877
2579 $self->show; 2878 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581} 2880}
2582 2881
2583sub mouse_motion { 2882sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2585 2884
2593 2892
2594 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2894 undef $GRAB;
2596 $self->hide; 2895 $self->hide;
2597 2896
2598 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2600 } 2899 }
2601} 2900}
2602 2901
2603############################################################################# 2902#############################################################################
2604 2903
2605package CFClient::UI::Statusbox; 2904package CFClient::UI::Statusbox;
2606 2905
2607our @ISA = CFClient::UI::VBox::; 2906our @ISA = CFClient::UI::VBox::;
2907
2908sub new {
2909 my $class = shift;
2910
2911 $class->SUPER::new (
2912 fontsize => 0.8,
2913 @_,
2914 )
2915}
2608 2916
2609sub reorder { 2917sub reorder {
2610 my ($self) = @_; 2918 my ($self) = @_;
2611 my $NOW = time; 2919 my $NOW = time;
2612 2920
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2939 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2940 : $item->{text};
2633 2941
2634 for ($short) { 2942 for ($short) {
2635 s/^\s+//; 2943 s/^\s+//;
2636 s/\012.*/…/s; 2944 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2945 }
2640 2946
2641 new CFClient::UI::Label 2947 new CFClient::UI::Label
2642 markup => $short, 2948 markup => $short,
2643 tooltip => $item->{tooltip}, 2949 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2950 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2951 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2952 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2954 fg => $item->{fg},
2648 can_events => 1, 2955 can_events => 1,
2649 can_hover => 1 2956 can_hover => 1
2650 }; 2957 };
2651 } 2958 }
2652 2959
2654 $self->SUPER::add (reverse @widgets); 2961 $self->SUPER::add (reverse @widgets);
2655} 2962}
2656 2963
2657sub add { 2964sub add {
2658 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2966
2967 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2659 2971
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2973
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2975
2666 $item->{count}++; 2978 $item->{count}++;
2667 } else { 2979 } else {
2668 $item->{count} = 1; 2980 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2981 $item->{text} = $item->{tooltip} = $text;
2670 } 2982 }
2983 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2984 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2985 delete $item->{label};
2673 } else { 2986 } else {
2674 $self->{item}{$group} = { 2987 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2988 id => ++$self->{id},
2676 text => $text, 2989 text => $text,
2677 timeout => $timeout, 2990 timeout => $timeout,
2678 tooltip => $text, 2991 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2992 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2993 pri => 0,
2682 count => 1, 2994 count => 1,
2683 %arg, 2995 %arg,
2684 }; 2996 };
2685 } 2997 }
2686 2998
2687 $self->reorder; 2999 $self->reorder;
2688} 3000}
2689 3001
3002sub reconfigure {
3003 my ($self) = @_;
3004
3005 delete $_->{label}
3006 for values %{ $self->{item} || {} };
3007
3008 $self->reorder;
3009 $self->SUPER::reconfigure;
3010}
3011
2690############################################################################# 3012#############################################################################
2691 3013
2692package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
2693 3015
2694our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696use CFClient::OpenGL;
2697 3017
2698sub new { 3018sub new {
2699 my $class = shift; 3019 my $class = shift;
2700 3020
2701 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2702 @_, 3023 @_,
2703 ) 3024 );
2704}
2705 3025
2706sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
2707 my ($self, $x, $y, $w, $h) = @_; 3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2708 3180
2709 $self->{w} = $w; 3181 $self->clear_command_list;
2710 $self->{h} = $h; 3182 $self->{recording} = 0;
2711} 3183 $self->{rec_btn}->set_text ("start recording");
2712 3184
2713sub check_size { 3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
2714 my ($self) = @_; 3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
2715 3203
2716 $self->size_allocate ($self->{w}, $self->{h}) 3204sub update_binding_widgets {
2717 if $self->{w}; 3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
3310package CFClient::UI::Root;
3311
3312our @ISA = CFClient::UI::Container::;
3313
3314use CFClient::OpenGL;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 visible => 1,
3321 @_,
3322 );
3323
3324 Scalar::Util::weaken ($self->{root} = $self);
3325
3326 $self
2718} 3327}
2719 3328
2720sub size_request { 3329sub size_request {
2721 my ($self) = @_; 3330 my ($self) = @_;
2722 3331
2723 ($self->{w}, $self->{h}) 3332 ($self->{w}, $self->{h})
3333}
3334
3335sub _to_pixel {
3336 my ($coord, $size, $max) = @_;
3337
3338 $coord =
3339 $coord eq "center" ? ($max - $size) * 0.5
3340 : $coord eq "max" ? $max
3341 : $coord;
3342
3343 $coord = 0 if $coord < 0;
3344 $coord = $max - $size if $coord > $max - $size;
3345
3346 int $coord + 0.5
2724} 3347}
2725 3348
2726sub size_allocate { 3349sub size_allocate {
2727 my ($self, $w, $h) = @_; 3350 my ($self, $w, $h) = @_;
2728 3351
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2745 for my $child ($self->children) { 3352 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 3354
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3355 $X = $child->{force_x} if exists $child->{force_x};
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3356 $Y = $child->{force_y} if exists $child->{force_y};
3357
3358 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h};
3360
2750 $child->configure ($X, $Y, $W, $H); 3361 $child->configure ($X, $Y, $W, $H);
2751 } 3362 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3363}
2756 3364
2757sub coord2local { 3365sub coord2local {
2758 my ($self, $x, $y) = @_; 3366 my ($self, $x, $y) = @_;
2759 3367
2767} 3375}
2768 3376
2769sub update { 3377sub update {
2770 my ($self) = @_; 3378 my ($self) = @_;
2771 3379
2772 $self->check_size;
2773 $::WANT_REFRESH++; 3380 $::WANT_REFRESH++;
2774} 3381}
2775 3382
2776sub add { 3383sub add {
2777 my ($self, $child) = @_; 3384 my ($self, @children) = @_;
2778 3385
2779 # integerise window positions 3386 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 3387 for @children;
2781 $child->{y} = int $child->{y};
2782 3388
2783 $self->SUPER::add ($child); 3389 $self->SUPER::add (@children);
3390}
3391
3392sub remove {
3393 my ($self, @children) = @_;
3394
3395 $self->SUPER::remove (@children);
3396
3397 delete $self->{is_toplevel}
3398 for @children;
3399
3400 while (@children) {
3401 my $w = pop @children;
3402 push @children, $w->children;
3403 $w->set_invisible;
3404 }
2784} 3405}
2785 3406
2786sub on_refresh { 3407sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3408 my ($self, $id, $cb) = @_;
2788 3409
2789 $self->{refresh_hook}{$id} = $cb; 3410 $self->{refresh_hook}{$id} = $cb;
2790} 3411}
2791 3412
3413sub on_post_alloc {
3414 my ($self, $id, $cb) = @_;
3415
3416 $self->{post_alloc_hook}{$id} = $cb;
3417}
3418
2792sub draw { 3419sub draw {
2793 my ($self) = @_; 3420 my ($self) = @_;
2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839 3421
2840 while ($self->{refresh_hook}) { 3422 while ($self->{refresh_hook}) {
2841 $_->() 3423 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3424 for values %{delete $self->{refresh_hook}};
2843 } 3425 }
2844 3426
3427 if ($self->{realloc}) {
3428 my %queue;
3429 my @queue;
3430 my $widget;
3431
3432 outer:
3433 while () {
3434 if (my $realloc = delete $self->{realloc}) {
3435 for $widget (values %$realloc) {
3436 $widget->{visible} or next; # do not resize invisible widgets
3437
3438 $queue{$widget+0}++ and next; # duplicates are common
3439
3440 push @{ $queue[$widget->{visible}] }, $widget;
3441 }
3442 }
3443
3444 while () {
3445 @queue or last outer;
3446
3447 $widget = pop @{ $queue[-1] || [] }
3448 and last;
3449
3450 pop @queue;
3451 }
3452
3453 delete $queue{$widget+0};
3454
3455 my ($w, $h) = $widget->size_request;
3456
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3459
3460 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h};
3462
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3464 || delete $widget->{force_realloc}) {
3465 $widget->{req_w} = $w;
3466 $widget->{req_h} = $h;
3467
3468 $self->{size_alloc}{$widget+0} = $widget;
3469
3470 if (my $parent = $widget->{parent}) {
3471 $self->{realloc}{$parent+0} = $parent
3472 unless $queue{$parent+0};
3473
3474 $parent->{force_size_alloc} = 1;
3475 $self->{size_alloc}{$parent+0} = $parent;
3476 }
3477 }
3478
3479 delete $self->{realloc}{$widget+0};
3480 }
3481 }
3482
3483 while (my $size_alloc = delete $self->{size_alloc}) {
3484 my @queue = sort { $b->{visible} <=> $a->{visible} }
3485 values %$size_alloc;
3486
3487 while () {
3488 my $widget = pop @queue || last;
3489
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491
3492 $w = 0 if $w < 0;
3493 $h = 0 if $h < 0;
3494
3495 $w = int $w + 0.5;
3496 $h = int $h + 0.5;
3497
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3499 $widget->{old_w} = $widget->{w};
3500 $widget->{old_h} = $widget->{h};
3501
3502 $widget->{w} = $w;
3503 $widget->{h} = $h;
3504
3505 $widget->emit (size_allocate => $w, $h);
3506 }
3507 }
3508 }
3509
3510 while ($self->{post_alloc_hook}) {
3511 $_->()
3512 for values %{delete $self->{post_alloc_hook}};
3513 }
3514
3515
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3516 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3518 glClear GL_COLOR_BUFFER_BIT;
2848 3519
2849 glMatrixMode GL_PROJECTION; 3520 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3521 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3523 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3524 glLoadIdentity;
2854 3525
3526 {
3527 package CFClient::UI::Base;
3528
3529 ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h});
3531 }
3532
2855 $self->_draw; 3533 $self->_draw;
2856} 3534}
2857 3535
2858############################################################################# 3536#############################################################################
2859 3537
2860package CFClient::UI; 3538package CFClient::UI;
2861 3539
2862$ROOT = new CFClient::UI::Root; 3540$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3541$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3542
28651 35431
2866 3544

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines