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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

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

Diff Legend

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