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.206 by root, Mon May 15 17:45:29 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

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

Diff Legend

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