ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.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 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 61 }
42 62
43 return; 63 return;
44 } 64 }
45 } 65 }
… …
49 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
61} 81}
62 82
63sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
64 my ($ev) = @_; 84 my ($ev) = @_;
… …
73 check_tooltip; 93 check_tooltip;
74 } 94 }
75 95
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 97
78 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 100}
83 101
84sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
85 my ($ev) = @_; 103 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
87 105
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 107
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 109
92 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 112
97 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 115 $grab->update if $grab;
100 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 133
118 check_tooltip; 134 check_tooltip;
119 } 135 }
120 136
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 138 if $HOVER;
125} 139}
126 140
127# convert position array to integers 141# convert position array to integers
128sub harmonize { 142sub harmonize {
129 my ($vals) = @_; 143 my ($vals) = @_;
… …
135 $rem += $_ - $i; 149 $rem += $_ - $i;
136 $_ = $i; 150 $_ = $i;
137 } 151 }
138} 152}
139 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $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
140############################################################################# 195#############################################################################
141 196
142package CFClient::UI::Base; 197package CFClient::UI::Base;
143 198
144use strict; 199use strict;
… …
147 202
148sub new { 203sub new {
149 my $class = shift; 204 my $class = shift;
150 205
151 my $self = bless { 206 my $self = bless {
152 x => 0, 207 x => "center",
153 y => 0, 208 y => "center",
154 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
155 can_events => 1, 212 can_events => 1,
156 @_ 213 @_
157 }, $class; 214 }, $class;
158 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
159 for (keys %$self) { 218 for (keys %$self) {
160 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
162 } 221 }
163 } 222 }
164 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
165 $self 236 $self
166} 237}
167 238
168sub destroy { 239sub destroy {
169 my ($self) = @_; 240 my ($self) = @_;
… …
178 return if $self->{parent}; 249 return if $self->{parent};
179 250
180 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
181} 252}
182 253
183sub hide { 254sub set_visible {
184 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
185 278
186 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
188 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
240 } 368 }
241} 369}
242 370
243sub size_allocate { 371sub size_allocate {
244 # nothing to be done 372 # nothing to be done
245} 373}
246 374
247sub children { 375sub children {
248} 376}
249 377
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
262sub set_max_size { 378sub set_max_size {
263 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
264 380
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
267} 399}
268 400
269# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
270sub coord2local { 402sub coord2local {
271 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
286 return if $FOCUS == $self; 418 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
288 420
289 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
290 422
291 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
292 424
293 $focus->update if $focus; 425 $focus->update if $focus;
294 $FOCUS->update; 426 $FOCUS->update;
295} 427}
296 428
… …
299 431
300 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
301 433
302 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
303 435
304 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
305 437
306 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
307} 442}
308 443
309sub mouse_motion { } 444sub mouse_motion { }
310sub button_up { } 445sub button_up { }
311sub key_down { } 446sub key_down { }
312sub key_up { } 447sub key_up { }
313 448
314sub button_down { 449sub button_down {
315 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
316 451
317 $self->focus_in; 452 $self->focus_in;
318} 453}
319 454
320sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
321sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
322sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
323sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
324sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
325 528
326sub draw { 529sub draw {
327 my ($self) = @_; 530 my ($self) = @_;
328 531
329 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 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;
330 541
331 glPushMatrix; 542 glPushMatrix;
332 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
333 $self->_draw; 544 $self->_draw;
334 glPopMatrix; 545 glPopMatrix;
… …
346 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
347 glEnd; 558 glEnd;
348 glDisable GL_BLEND; 559 glDisable GL_BLEND;
349 } 560 }
350 561
351 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
352 glPushMatrix; 563 glPushMatrix;
353 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0; 567 glVertex 0 , 0;
357 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
358 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
359 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
360 glEnd; 571 glEnd;
361 glPopMatrix; 572 glPopMatrix;
362 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;
363 } 574 }
364} 575}
365 576
366sub _draw { 577sub _draw {
367 my ($self) = @_; 578 my ($self) = @_;
368 579
369 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
370} 581}
371 582
372sub find_widget {
373 my ($self, $x, $y) = @_;
374
375 return () unless $self->{can_events};
376
377 return $self
378 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
379 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
380
381 ()
382}
383
384sub set_parent {
385 my ($self, $parent) = @_;
386
387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 583sub DESTROY {
420 my ($self) = @_; 584 my ($self) = @_;
421 585
586 delete $WIDGET{$self+0};
422 #$self->deactivate; 587 #$self->deactivate;
423} 588}
424 589
425############################################################################# 590#############################################################################
426 591
… …
435 my $class = shift; 600 my $class = shift;
436 601
437 # range [value, low, high, page] 602 # range [value, low, high, page]
438 603
439 $class->SUPER::new ( 604 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
442 @_ 607 @_
443 ) 608 )
444} 609}
445 610
446sub _draw { 611sub _draw {
447 my ($self) = @_; 612 my ($self) = @_;
448 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
450 620
451 glEnable GL_BLEND; 621 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
454 624
455 glBegin GL_QUADS; 625 glBegin GL_QUADS;
456 glVertex 0 , 0; 626 glVertex 0 , 0;
457 glVertex 0 , $h; 627 glVertex 0 , $h;
458 glVertex $w, $h; 628 glVertex $w, $h;
459 glVertex $w, 0; 629 glVertex $w, 0;
460 glEnd; 630 glEnd;
461 631
462 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
463} 634}
464 635
465############################################################################# 636#############################################################################
466 637
467package CFClient::UI::Empty; 638package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
474} 645}
475 646
476sub size_request { 647sub size_request {
477 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
478} 651}
479 652
480sub draw { } 653sub draw { }
481 654
482############################################################################# 655#############################################################################
… …
511 $self->{children} = [ 684 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
514 ]; 687 ];
515 688
516 $self->check_size (1); 689 $self->realloc;
517 $self->update;
518} 690}
519 691
520sub children { 692sub children {
521 @{ $_[0]{children} } 693 @{ $_[0]{children} }
522} 694}
… …
527 delete $child->{parent}; 699 delete $child->{parent};
528 $child->hide; 700 $child->hide;
529 701
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 703
532 $self->check_size; 704 $self->realloc;
533 $self->update;
534} 705}
535 706
536sub clear { 707sub clear {
537 my ($self) = @_; 708 my ($self) = @_;
538 709
… …
542 for (@$children) { 713 for (@$children) {
543 delete $_->{parent}; 714 delete $_->{parent};
544 $_->hide; 715 $_->hide;
545 } 716 }
546 717
547 $self->check_size; 718 $self->realloc;
548 $self->update;
549} 719}
550 720
551sub find_widget { 721sub find_widget {
552 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
553 723
… …
628} 798}
629 799
630sub update { 800sub update {
631 my ($self) = @_; 801 my ($self) = @_;
632 802
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 803 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 804 $self->SUPER::update;
635} 805}
636 806
637sub size_allocate { 807sub size_allocate {
638 my ($self, $w, $h) = @_; 808 my ($self, $w, $h) = @_;
… …
640 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 811 $self->update;
642} 812}
643 813
644sub _render { 814sub _render {
815 my ($self) = @_;
816
645 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
646} 818}
647 819
648sub render_child { 820sub render_child {
649 my ($self) = @_; 821 my ($self) = @_;
650 822
651 $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 {
652 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
654 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
655 $self->_render; 834 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 835 };
664} 836}
665 837
666sub _draw { 838sub _draw {
667 my ($self) = @_; 839 my ($self) = @_;
668 840
669 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
670 842
671 my $tex = $self->{texture} 843 my $tex = $self->{texture}
672 or return; 844 or return;
673 845
674 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 848 glColor 1, 1, 1, 1;
677 849
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 851
680 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
681} 853}
… …
684 856
685package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
686 858
687our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
688 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
689sub size_request { 871sub size_request {
690 my ($self) = @_; 872 my ($self) = @_;
691 873
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 875
695 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
696} 880}
697 881
698sub size_allocate { 882sub size_allocate {
699 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 891 $self->update;
702} 892}
703 893
704sub set_offset { 894sub set_offset {
705 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
739} 929}
740 930
741sub _render { 931sub _render {
742 my ($self) = @_; 932 my ($self) = @_;
743 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
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 938
746 $self->SUPER::_render; 939 $self->SUPER::_render;
747} 940}
748 941
… …
756 my $class = shift; 949 my $class = shift;
757 950
758 my $self; 951 my $self;
759 952
760 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
761 vertical => 1, 954 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 956 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
765 }, 958 },
766 ; 959 ;
767 960
768 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 963 slider => $slider,
771 @_, 964 @_,
772 ); 965 );
773 966
774 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
777 970
778 $self 971 $self
779} 972}
780 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
781#TODO# update range on size_allocate depeneing on child 993#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 994# update viewport offset on scroll
783 995
784############################################################################# 996#############################################################################
785 997
786package CFClient::UI::Frame; 998package CFClient::UI::Frame;
787 999
788our @ISA = CFClient::UI::Bin::; 1000our @ISA = CFClient::UI::Bin::;
789 1001
790use CFClient::OpenGL; 1002use CFClient::OpenGL;
791
792#############################################################################
793
794package CFClient::UI::FancyFrame;
795
796our @ISA = CFClient::UI::Bin::;
797
798use CFClient::OpenGL;
799
800my @tex =
801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
802 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803 1003
804sub new { 1004sub new {
805 my $class = shift; 1005 my $class = shift;
806 1006
807 # TODO: user_x, user_y, overwrite moveto? 1007 $class->SUPER::new (
1008 bg => undef,
1009 @_,
1010 )
1011}
1012
1013sub _draw {
1014 my ($self) = @_;
1015
1016 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)};
1018
1019 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} };
1022
1023 glBegin GL_QUADS;
1024 glVertex 0 , 0;
1025 glVertex 0 , $h;
1026 glVertex $w, $h;
1027 glVertex $w, 0;
1028 glEnd;
1029
1030 glDisable GL_BLEND;
1031 }
1032
1033 $self->SUPER::_draw;
1034}
1035
1036#############################################################################
1037
1038package CFClient::UI::FancyFrame;
1039
1040our @ISA = CFClient::UI::Bin::;
1041
1042use CFClient::OpenGL;
1043
1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051
1052sub new {
1053 my $class = shift;
808 1054
809 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
812 border => 0.6, 1058 border => 0.6,
813 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
814 @_ 1062 @_
815 ); 1063 );
816 1064
817 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
818 align => 0, 1066 align => 0,
… …
842 my ($self, $w, $h) = @_; 1090 my ($self, $w, $h) = @_;
843 1091
844 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
846 1094
847 $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)
848 if $self->{title}; 1096 if $self->{title};
849 1097
850 $self->child->configure ($self->border, $self->border, $w, $h); 1098 $self->child->configure ($self->border, $self->border, $w, $h);
851} 1099}
852 1100
… …
871 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
872 1120
873 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
875 1123
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size;
880 }; 1129 };
881 1130
882 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
886 $self->{motion} = sub { 1135 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
888 1137
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
890 1139
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update;
893 }; 1141 };
894 } 1142 }
895} 1143}
896 1144
897sub button_up { 1145sub button_up {
… …
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1165
918 my $border = $self->border; 1166 my $border = $self->border;
919 1167
920 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1173
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
928 1176
929 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
932
933 glColor @{ $self->{bg} };
934
935 $bg->{s} = $rep_x;
936 $bg->{t} = $rep_y;
937 $bg->{wrap_mode} = 1;
938 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1182 }
940 1183
941 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
942 1185
… …
958sub new { 1201sub new {
959 my $class = shift; 1202 my $class = shift;
960 1203
961 $class->SUPER::new ( 1204 $class->SUPER::new (
962 col_expand => [], 1205 col_expand => [],
963 @_ 1206 @_,
964 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
965} 1212}
966 1213
967sub add { 1214sub add {
968 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
969 1216
970 $child->set_parent ($self); 1217 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
972 1219
973 $child->check_size; 1220 $self->realloc;
974} 1221}
975 1222
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
980# 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?
981sub clear { 1224sub clear {
982 my ($self) = @_; 1225 my ($self) = @_;
983 1226
984 my @children = $self->children; 1227 my @children = $self->children;
985 delete $self->{children}; 1228 delete $self->{children};
… …
987 for (@children) { 1230 for (@children) {
988 delete $_->{parent}; 1231 delete $_->{parent};
989 $_->hide; 1232 $_->hide;
990 } 1233 }
991 1234
992 $self->update; 1235 $self->realloc;
993} 1236}
994 1237
995sub get_wh { 1238sub get_wh {
996 my ($self) = @_; 1239 my ($self) = @_;
997 1240
… …
1028sub size_allocate { 1271sub size_allocate {
1029 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1030 1273
1031 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1032 1275
1033 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1035 1278
1036 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1037 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1093 } 1336 }
1094} 1337}
1095 1338
1096############################################################################# 1339#############################################################################
1097 1340
1098package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1099
1100# TODO: wrap into common Box base class
1101 1342
1102our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1103 1344
1104sub size_request { 1345sub size_request {
1105 my ($self) = @_; 1346 my ($self) = @_;
1106 1347
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1108 1349 ? (
1109 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1110 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111 (List::Util::max map $_->[1], @alloc), 1352 )
1112 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1113} 1357}
1114 1358
1115sub size_allocate { 1359sub size_allocate {
1116 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1117 1361
1118 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1119
1120 my $children = $self->{children}; 1363 my $children = $self->{children};
1121 1364
1122 my @h = map $_->{req_w}, @$children; 1365 my @req;
1123 1366
1124 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1125 1368 @req = ($space / (@$children || 1)) x @$children;
1126 if ($req_h > $h) {
1127 # ah well, not enough space
1128 $_ *= $h / $req_h for @h;
1129 } else { 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 {
1130 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131 $exp ||= 1;
1132 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1133 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1134 my $child = $children->[$_];
1135
1136 my $alloc_h = $h[$_];
1137 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138 $h[$_] = $alloc_h;
1139 } 1383 }
1140 } 1384 }
1141 1385
1142 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1143 1387
1144 my $y = 0; 1388 my $pos = 0;
1145 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1148 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149 1392
1150 $y += $h; 1393 $pos += $alloc;
1151 } 1394 }
1152 1395
1153 1 1396 1
1154} 1397}
1155 1398
1156############################################################################# 1399#############################################################################
1157 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
1158package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1159 1417
1160# TODO: wrap into common Box base class
1161
1162our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1163 1419
1164sub size_request { 1420sub new {
1165 my ($self) = @_; 1421 my $class = shift;
1166 1422
1167 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1168 1424 vertical => 1,
1169 ( 1425 @_,
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1426 )
1173} 1427}
1174 1428
1175sub size_allocate {
1176 my ($self, $w, $h) = @_;
1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180 my $children = $self->{children};
1181
1182 my @h = map $_->{req_h}, @$children;
1183
1184 my $req_h = List::Util::sum @h;
1185
1186 if ($req_h > $h) {
1187 # ah well, not enough space
1188 $_ *= $h / $req_h for @h;
1189 } else {
1190 my $exp = List::Util::sum map $_->{expand}, @$children;
1191 $exp ||= 1;
1192
1193 for (0 .. $#$children) {
1194 my $child = $children->[$_];
1195
1196 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197 }
1198 }
1199
1200 CFClient::UI::harmonize \@h;
1201
1202 my $y = 0;
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205 my $h = $h[$_];
1206 $child->configure (0, $y, $w, $h);
1207
1208 $y += $h;
1209 }
1210
1211 1
1212}
1213
1214############################################################################# 1429#############################################################################
1215 1430
1216package CFClient::UI::Label; 1431package CFClient::UI::Label;
1217 1432
1218our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1219 1434
1220use CFClient::OpenGL; 1435use CFClient::OpenGL;
1221 1436
1222sub new { 1437sub new {
1223 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1224 1439
1225 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1442 #bg => none
1443 #active_bg => none
1227 #font => default_font 1444 #font => default_font
1228 #text => initial text 1445 #text => initial text
1229 #markup => initial narkup 1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1231 fontsize => 1, 1450 fontsize => 1,
1232 align => -1, 1451 align => -1,
1233 valign => -1, 1452 valign => -1,
1234 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1235 can_events => 0, 1455 can_events => 0,
1236 %arg 1456 %arg
1237 ); 1457 );
1238 1458
1239 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1249 } 1469 }
1250 1470
1251 $self 1471 $self
1252} 1472}
1253 1473
1254sub escape { 1474sub escape($) {
1255 local $_ = $_[1]; 1475 local $_ = $_[0];
1256 1476
1257 s/&/&amp;/g; 1477 s/&/&amp;/g;
1258 s/>/&gt;/g; 1478 s/>/&gt;/g;
1259 s/</&lt;/g; 1479 s/</&lt;/g;
1260 1480
1261 $_[1] 1481 $_
1262} 1482}
1263 1483
1264sub update { 1484sub update {
1265 my ($self) = @_; 1485 my ($self) = @_;
1266 1486
… …
1275 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1276 1496
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1279 1499
1500 $self->realloc;
1280 $self->update; 1501 $self->update;
1281 $self->check_size;
1282} 1502}
1283 1503
1284sub set_markup { 1504sub set_markup {
1285 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1286 1506
… …
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1511
1292 $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;
1293 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1294 1514
1515 $self->realloc;
1295 $self->update; 1516 $self->update;
1296 $self->check_size;
1297} 1517}
1298 1518
1299sub size_request { 1519sub size_request {
1300 my ($self) = @_; 1520 my ($self) = @_;
1301 1521
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1527
1306 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1307 1529
1308 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1313 1535
1314 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1316 } 1538 }
1317 1539
1318 ( 1540 ($w, $h)
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 1541}
1323 1542
1324sub size_allocate { 1543sub size_allocate {
1325 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1326 1545
1327 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1328} 1548}
1329 1549
1330sub set_fontsize { 1550sub set_fontsize {
1331 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1332 1552
1333 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1334 delete $self->{texture}; 1554 delete $self->{texture};
1335 1555
1336 $self->update; 1556 $self->realloc;
1337 $self->check_size;
1338} 1557}
1339 1558
1340sub _draw { 1559sub _draw {
1341 my ($self) = @_; 1560 my ($self) = @_;
1561
1562 $self->SUPER::_draw; # draw background, if applicable
1342 1563
1343 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1565 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $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});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1571
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1573
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1576 : ($self->{w} - $tex->{w}) * 0.5);
1354 1577
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1580 : ($self->{h} - $tex->{h}) * 0.5);
1358 1581
1359 $tex 1582 $tex
1360 }; 1583 };
1361 1584
1362 glEnable GL_TEXTURE_2D; 1585 glEnable GL_TEXTURE_2D;
… …
1390 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1391 can_hover => 1, 1614 can_hover => 1,
1392 can_focus => 1, 1615 can_focus => 1,
1393 valign => 0, 1616 valign => 0,
1394 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1395 @_ 1619 @_
1396 ) 1620 )
1397} 1621}
1398 1622
1399sub _set_text { 1623sub _set_text {
… …
1409 $self->{text} = $text; 1633 $self->{text} = $text;
1410 1634
1411 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1413 1637
1414 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1415} 1639}
1416 1640
1417sub set_text { 1641sub set_text {
1418 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1419 1643
1420 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1645 $self->_set_text ($text);
1422 $self->check_size; 1646
1423 $self->update; 1647 $self->realloc;
1424} 1648}
1425 1649
1426sub get_text { 1650sub get_text {
1427 $_[0]{text} 1651 $_[0]{text}
1428} 1652}
… …
1431 my ($self) = @_; 1655 my ($self) = @_;
1432 1656
1433 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1434 1658
1435 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1436}
1437
1438sub size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442} 1660}
1443 1661
1444sub key_down { 1662sub key_down {
1445 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1446 1664
… …
1448 my $sym = $ev->{sym}; 1666 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1667 my $uni = $ev->{unicode};
1450 1668
1451 my $text = $self->get_text; 1669 my $text = $self->get_text;
1452 1670
1453 if ($sym == 8) { 1671 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1672 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1673 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1674 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1675 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1676 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1677 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1678 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1683 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1684 $self->_emit ('escape');
1467 } elsif ($uni) { 1685 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1687 }
1470 1688
1471 $self->_set_text ($text); 1689 $self->_set_text ($text);
1472 $self->update; 1690
1691 $self->realloc;
1473} 1692}
1474 1693
1475sub focus_in { 1694sub focus_in {
1476 my ($self) = @_; 1695 my ($self) = @_;
1477 1696
… …
1557 if ($sym == 13) { 1776 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1563 $self->update; 1782 $self->update;
1564 1783
1565 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1604 1823
1605sub new { 1824sub new {
1606 my $class = shift; 1825 my $class = shift;
1607 1826
1608 $class->SUPER::new ( 1827 $class->SUPER::new (
1609 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1610 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1613 can_hover => 1, 1832 can_hover => 1,
1614 align => 0, 1833 align => 0,
1615 valign => 0, 1834 valign => 0,
1616 can_events => 1, 1835 can_events => 1,
1617 @_ 1836 @_
1618 ) 1837 )
1619} 1838}
1620 1839
1840sub activate { }
1841
1621sub button_up { 1842sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1623 1844
1845 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate");
1627 }
1628} 1848}
1629 1849
1630sub _draw { 1850sub _draw {
1631 my ($self) = @_; 1851 my ($self) = @_;
1632 1852
… …
1661 1881
1662sub new { 1882sub new {
1663 my $class = shift; 1883 my $class = shift;
1664 1884
1665 $class->SUPER::new ( 1885 $class->SUPER::new (
1666 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1667 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1668 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],
1669 state => 0, 1892 state => 0,
1670 can_hover => 1, 1893 can_hover => 1,
1671 @_ 1894 @_
1672 ) 1895 )
1673} 1896}
1674 1897
1675sub size_request { 1898sub size_request {
1676 my ($self) = @_; 1899 my ($self) = @_;
1677 1900
1678 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1679} 1902}
1680 1903
1681sub button_down { 1904sub button_down {
1682 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1683 1906
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1688 } 1911 }
1689} 1912}
1690 1913
1691sub _draw { 1914sub _draw {
1692 my ($self) = @_; 1915 my ($self) = @_;
1693 1916
1694 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1695 1918
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 1920
1698 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;
1699 1924
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 1926
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 1928
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2182 qw(s1_slider.png s1_slider_bg.png);
1958 2183
1959sub new { 2184sub new {
1960 my $class = shift; 2185 my $class = shift;
1961 2186
1962 # range [value, low, high, page] 2187 # range [value, low, high, page, unit]
1963 2188
1964 # TODO: 0-width page 2189 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2191 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
1969 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],
1970 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
1973 vertical => 0, 2200 vertical => 0,
1974 can_hover => 1, 2201 can_hover => 1,
1975 inner_pad => 5, 2202 inner_pad => 0.02,
1976 @_ 2203 @_
1977 ); 2204 );
1978 2205
2206 $self->set_value ($self->{range}[0]);
2207 $self->update;
2208
1979 $self 2209 $self
1980} 2210}
1981 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
1982sub size_request { 2246sub size_request {
1983 my ($self) = @_; 2247 my ($self) = @_;
1984 2248
1985 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2250}
1990 2251
1991sub button_down { 2252sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
1993 2254
1994 $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
1995 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
1996} 2260}
1997 2261
1998sub mouse_motion { 2262sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
2000 2264
2001 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
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2003 2284
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2286
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2289
2009 $x -= $inner_pad_px; # substract the padding 2290 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2291 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2292
2015 $self->emit (changed => $x); 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2294 $self->{knob_w} = $knob_w;
2017 } 2295 });
2018}
2019 2296
2020# the inner_* stuff is for generating a padding for the slider handle, 2297 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2298}
2027 2299
2028sub _draw { 2300sub _draw {
2029 my ($self) = @_; 2301 my ($self) = @_;
2030 2302
2031 $self->SUPER::_draw (); 2303 $self->SUPER::_draw ();
2032 2304
2033 my ($w, $h) = @$self{qw(w h)}; 2305 glScale $self->{w}, $self->{h};
2034 2306
2035 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
2037 2309
2310 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2312 }
2043 2313
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2316
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2317 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2319
2068 # draw background 2320 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2321 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2322
2071 # draw handle 2323 # draw handle
2072 $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);
2073 2325
2074 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2075} 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 (@_) }
2076 2369
2077############################################################################# 2370#############################################################################
2078 2371
2079package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2080 2373
… …
2110 2403
2111 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2405 $self->reflow;
2113} 2406}
2114 2407
2115sub text_height {
2116 my ($self, $text) = @_;
2117
2118 my $layout = $self->{layout};
2119
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w});
2122 $layout->set_markup ($text);
2123
2124 ($layout->size)[1]
2125}
2126
2127sub reflow {
2128 my ($self) = @_;
2129
2130 $self->{need_reflow}++;
2131 $self->update;
2132}
2133
2134sub size_allocate { 2408sub size_allocate {
2135 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2136 2410
2137 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2138 2412
… …
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2416
2143 $self->reflow; 2417 $self->reflow;
2144} 2418}
2145 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
2146sub add_paragraph { 2454sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2148 2456
2149 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2150 2458 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2154 2462
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $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]);
2158 $self->{children}[1]->update;
2159} 2464}
2160 2465
2161sub update { 2466sub update {
2162 my ($self) = @_; 2467 my ($self) = @_;
2163 2468
… …
2165 2470
2166 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2167 2472
2168 delete $self->{texture}; 2473 delete $self->{texture};
2169 2474
2170 $ROOT->on_refresh ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2171 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2479 my $height = 0;
2173 2480
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2175 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 }
2176 2496
2177 $self->{height} = $height; 2497 $self->{height} = $height;
2178 2498
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2500
2181 delete $self->{texture}; 2501 delete $self->{texture};
2182 } 2502 }
2183 2503
2184 $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 {
2185 glClearColor 0, 0, 0, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2187 2507
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191 my $top = int $self->{children}[1]{range}[0]; 2508 my $top = int $self->{children}[1]{range}[0];
2192 2509
2193 my $y0 = $top; 2510 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2195 2512
2196 my $y = 0; 2513 my $y = 0;
2197 2514
2198 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2199 2516
2200 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2201 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
2202 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2524 my $h = $par->[1];
2204 2525
2205 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2208 2530
2209 my ($W, $H) = $layout->size; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 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;
2211 } 2535 }
2212 2536
2213 $y += $h; 2537 $y += $h;
2214 } 2538 }
2215 2539
2216 glDisable GL_TEXTURE_2D; 2540 glDisable GL_BLEND;
2217 }; 2541 };
2218 }); 2542 });
2219} 2543}
2220 2544
2221sub _draw { 2545sub _draw {
2222 my ($self) = @_; 2546 my ($self) = @_;
2223 2547
2224 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2227 $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});
2228 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2229 2553
2230 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2231 2555
2232} 2556}
… …
2281 2605
2282sub new { 2606sub new {
2283 my $class = shift; 2607 my $class = shift;
2284 2608
2285 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2286 state => 0, 2610 state => 0,
2287 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2288 @_ 2612 @_
2289 ); 2613 );
2290 2614
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2615 $self
2297} 2616}
2298 2617
2299sub toggle_flopper { 2618sub toggle_flopper {
2300 my ($self) = @_; 2619 my ($self) = @_;
2301 2620
2302 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2622}
2314 2623
2315############################################################################# 2624#############################################################################
2316 2625
2317package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2330} 2639}
2331 2640
2332sub set_tooltip_from { 2641sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2334 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
2335 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2656 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2660 );
2342} 2661}
2343 2662
2344sub size_request { 2663sub size_request {
2345 my ($self) = @_; 2664 my ($self) = @_;
… …
2351 2670
2352sub size_allocate { 2671sub size_allocate {
2353 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2354 2673
2355 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
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 });
2356} 2693}
2357 2694
2358sub _draw { 2695sub _draw {
2359 my ($self) = @_; 2696 my ($self) = @_;
2360 2697
… …
2377 glVertex $w, $h; 2714 glVertex $w, $h;
2378 glVertex $w, 0; 2715 glVertex $w, 0;
2379 glEnd; 2716 glEnd;
2380 2717
2381 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2382 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2383} 2721}
2384 2722
2385############################################################################# 2723#############################################################################
2386 2724
… …
2391use CFClient::OpenGL; 2729use CFClient::OpenGL;
2392 2730
2393sub new { 2731sub new {
2394 my $class = shift; 2732 my $class = shift;
2395 2733
2396 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2397 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2398 @_, 2737 @_,
2399 ) 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
2400} 2755}
2401 2756
2402sub size_request { 2757sub size_request {
2403 (32, 8) 2758 (32, 8)
2404} 2759}
2405 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2406sub _draw { 2769sub _draw {
2407 my ($self) = @_; 2770 my ($self) = @_;
2408 2771
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2784
2412 # TODO animation
2413 if ($tex) { 2785 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2419 } 2791 }
2420} 2792}
2421 2793
2422############################################################################# 2794sub DESTROY {
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_; 2795 my ($self) = @_;
2507 2796
2508 $self->{scrolled}->clear; 2797 $self->{timer}->cancel
2509 return unless $items; 2798 if $self->{timer};
2510 2799
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2800 $self->SUPER::DESTROY;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529} 2801}
2530 2802
2531############################################################################# 2803#############################################################################
2532 2804
2533package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2568 2840
2569# 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)
2570sub popup { 2842sub popup {
2571 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2572 2844
2573 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2574 2846
2575 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2848 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2578 2850
2579 $self->show; 2851 $self->show;
2580 $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);
2581} 2853}
2582 2854
2583sub mouse_motion { 2855sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2585 2857
… …
2593 2865
2594 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2867 undef $GRAB;
2596 $self->hide; 2868 $self->hide;
2597 2869
2598 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2600 } 2872 }
2601} 2873}
2602 2874
2603############################################################################# 2875#############################################################################
2604 2876
2605package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2606 2878
2607our @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}
2608 2889
2609sub reorder { 2890sub reorder {
2610 my ($self) = @_; 2891 my ($self) = @_;
2611 my $NOW = time; 2892 my $NOW = time;
2612 2893
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2912 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2913 : $item->{text};
2633 2914
2634 for ($short) { 2915 for ($short) {
2635 s/^\s+//; 2916 s/^\s+//;
2636 s/\012.*/…/s; 2917 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2918 }
2640 2919
2641 new CFClient::UI::Label 2920 new CFClient::UI::Label
2642 markup => $short, 2921 markup => $short,
2643 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2927 fg => $item->{fg},
2648 can_events => 1, 2928 can_events => 1,
2649 can_hover => 1 2929 can_hover => 1
2650 }; 2930 };
2651 } 2931 }
2652 2932
… …
2654 $self->SUPER::add (reverse @widgets); 2934 $self->SUPER::add (reverse @widgets);
2655} 2935}
2656 2936
2657sub add { 2937sub add {
2658 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2659 2944
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2946
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2948
… …
2666 $item->{count}++; 2951 $item->{count}++;
2667 } else { 2952 } else {
2668 $item->{count} = 1; 2953 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2954 $item->{text} = $item->{tooltip} = $text;
2670 } 2955 }
2956 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2957 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2958 delete $item->{label};
2673 } else { 2959 } else {
2674 $self->{item}{$group} = { 2960 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2961 id => ++$self->{id},
2676 text => $text, 2962 text => $text,
2677 timeout => $timeout, 2963 timeout => $timeout,
2678 tooltip => $text, 2964 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2965 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2966 pri => 0,
2682 count => 1, 2967 count => 1,
2683 %arg, 2968 %arg,
2684 }; 2969 };
2685 } 2970 }
2686 2971
2687 $self->reorder; 2972 $self->reorder;
2688} 2973}
2689 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
2690############################################################################# 2985#############################################################################
2691 2986
2692package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2693 2988
2694our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696use CFClient::OpenGL;
2697 2990
2698sub new { 2991sub new {
2699 my $class = shift; 2992 my $class = shift;
2700 2993
2701 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2702 @_, 2996 @_,
2703 ) 2997 );
2704}
2705 2998
2706sub 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 {
2707 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2708 3148
2709 $self->{w} = $w; 3149 $self->clear_command_list;
2710 $self->{h} = $h; 3150 $self->{recording} = 0;
2711} 3151 $self->{rec_btn}->set_text ("start recording");
2712 3152
2713sub 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 {
2714 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}
2715 3171
2716 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2717 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
2718} 3295}
2719 3296
2720sub size_request { 3297sub size_request {
2721 my ($self) = @_; 3298 my ($self) = @_;
2722 3299
2723 ($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
2724} 3315}
2725 3316
2726sub size_allocate { 3317sub size_allocate {
2727 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2728 3319
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2745 for my $child ($self->children) { 3320 for my $child ($self->children) {
2746 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)};
2747 3322
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3323 $X = $child->{force_x} if exists $child->{force_x};
2749 $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
2750 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2751 } 3330 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3331}
2756 3332
2757sub coord2local { 3333sub coord2local {
2758 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2759 3335
… …
2767} 3343}
2768 3344
2769sub update { 3345sub update {
2770 my ($self) = @_; 3346 my ($self) = @_;
2771 3347
2772 $self->check_size;
2773 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2774} 3349}
2775 3350
2776sub add { 3351sub add {
2777 my ($self, $child) = @_; 3352 my ($self, @children) = @_;
2778 3353
2779 # integerise window positions 3354 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 3355 for @children;
2781 $child->{y} = int $child->{y};
2782 3356
2783 $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 }
2784} 3373}
2785 3374
2786sub on_refresh { 3375sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2788 3377
2789 $self->{refresh_hook}{$id} = $cb; 3378 $self->{refresh_hook}{$id} = $cb;
2790} 3379}
2791 3380
3381sub on_post_alloc {
3382 my ($self, $id, $cb) = @_;
3383
3384 $self->{post_alloc_hook}{$id} = $cb;
3385}
3386
2792sub draw { 3387sub draw {
2793 my ($self) = @_; 3388 my ($self) = @_;
2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839 3389
2840 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2841 $_->() 3391 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2843 } 3393 }
2844 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
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2848 3487
2849 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3489 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3492 glLoadIdentity;
2854 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
2855 $self->_draw; 3501 $self->_draw;
2856} 3502}
2857 3503
2858############################################################################# 3504#############################################################################
2859 3505
2860package CFClient::UI; 3506package CFClient::UI;
2861 3507
2862$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3510
28651 35111
2866 3512

Diff Legend

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