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

Diff Legend

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