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

Diff Legend

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