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

Diff Legend

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