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.209 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 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 {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 388}
286 389
287sub set_tooltip { 390sub set_tooltip {
288 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
289 397
290 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
291 399
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 423 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
317 425
318 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
319 427
320 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
321 429
322 $focus->update if $focus; 430 $focus->update if $focus;
323 $FOCUS->update; 431 $FOCUS->update;
324} 432}
325 433
… …
328 436
329 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
330 438
331 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
332 440
333 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
334 442
335 $focus->update if $focus; #? 443 $focus->update if $focus; #?
336}
337 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
338sub mouse_motion { } 449sub mouse_motion { 0 }
339sub button_up { } 450sub button_up { 0 }
340sub key_down { } 451sub key_down { 0 }
341sub key_up { } 452sub key_up { 0 }
342 453
343sub button_down { 454sub button_down {
344 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
345 456
346 $self->focus_in; 457 $self->focus_in;
347}
348 458
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
354 535
355sub draw { 536sub draw {
356 my ($self) = @_; 537 my ($self) = @_;
357 538
358 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
359 550
360 glPushMatrix; 551 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw; 553 $self->_draw;
363 glPopMatrix; 554 glPopMatrix;
… …
375 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
376 glEnd; 567 glEnd;
377 glDisable GL_BLEND; 568 glDisable GL_BLEND;
378 } 569 }
379 570
380 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
381 glPushMatrix; 572 glPushMatrix;
382 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 576 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
389 glEnd; 580 glEnd;
390 glPopMatrix; 581 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 583 }
393} 584}
394 585
395sub _draw { 586sub _draw {
396 my ($self) = @_; 587 my ($self) = @_;
397 588
398 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 590}
448 591
449sub DESTROY { 592sub DESTROY {
450 my ($self) = @_; 593 my ($self) = @_;
451 594
… …
509 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
511} 654}
512 655
513sub size_request { 656sub size_request {
514 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
515} 660}
516 661
517sub draw { } 662sub draw { }
518 663
519############################################################################# 664#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
524 669
525sub new { 670sub new {
526 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
527 672
528 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
529 674
530 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
531 children => [], 676 children => [],
532 can_events => 0, 677 can_events => 0,
533 %arg, 678 %arg,
534 ); 679 );
680
535 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
536 683
537 $self 684 $self
538} 685}
539 686
540sub add { 687sub add {
… …
548 $self->{children} = [ 695 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
551 ]; 698 ];
552 699
553 $self->check_size (1); 700 $self->realloc;
554 $self->update;
555} 701}
556 702
557sub children { 703sub children {
558 @{ $_[0]{children} } 704 @{ $_[0]{children} }
559} 705}
… …
564 delete $child->{parent}; 710 delete $child->{parent};
565 $child->hide; 711 $child->hide;
566 712
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 714
569 $self->check_size; 715 $self->realloc;
570 $self->update;
571} 716}
572 717
573sub clear { 718sub clear {
574 my ($self) = @_; 719 my ($self) = @_;
575 720
… …
579 for (@$children) { 724 for (@$children) {
580 delete $_->{parent}; 725 delete $_->{parent};
581 $_->hide; 726 $_->hide;
582 } 727 }
583 728
584 $self->check_size; 729 $self->realloc;
585 $self->update;
586} 730}
587 731
588sub find_widget { 732sub find_widget {
589 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
590 734
591 $x -= $self->{x}; 735 $x -= $self->{x};
592 $y -= $self->{y}; 736 $y -= $self->{y};
593 737
594 my $res; 738 my $res;
595 739
596 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
598 and return $res; 742 and return $res;
599 } 743 }
600 744
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
677 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 822 $self->update;
679} 823}
680 824
681sub _render { 825sub _render {
826 my ($self) = @_;
827
682 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
683} 829}
684 830
685sub render_child { 831sub render_child {
686 my ($self) = @_; 832 my ($self) = @_;
687 833
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
691 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
692 $self->_render; 845 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 846 };
701} 847}
702 848
703sub _draw { 849sub _draw {
704 my ($self) = @_; 850 my ($self) = @_;
705 851
706 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
707 853
708 my $tex = $self->{texture} 854 my $tex = $self->{texture}
709 or return; 855 or return;
710 856
711 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 859 glColor 1, 1, 1, 1;
714 860
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 862
717 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
718} 864}
… …
721 867
722package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
723 869
724our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
725 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
726sub size_request { 882sub size_request {
727 my ($self) = @_; 883 my ($self) = @_;
728 884
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 886
732 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
733} 891}
734 892
735sub size_allocate { 893sub size_allocate {
736 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
737 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
738 $self->update; 902 $self->update;
739} 903}
740 904
741sub set_offset { 905sub set_offset {
742 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
776} 940}
777 941
778sub _render { 942sub _render {
779 my ($self) = @_; 943 my ($self) = @_;
780 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 949
783 $self->SUPER::_render; 950 $self->SUPER::_render;
784} 951}
785 952
… …
793 my $class = shift; 960 my $class = shift;
794 961
795 my $self; 962 my $self;
796 963
797 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
798 vertical => 1, 965 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 967 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 968 $self->{vp}->set_offset (0, $_[1]);
802 }, 969 },
803 ; 970 ;
804 971
805 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 973 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 974 slider => $slider,
808 @_, 975 @_,
809 ); 976 );
810 977
811 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
814 981
815 $self 982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 1002}
817 1003
818#TODO# update range on size_allocate depending on child 1004#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1005# update viewport offset on scroll
820 1006
… …
864 1050
865our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
866 1052
867use CFClient::OpenGL; 1053use CFClient::OpenGL;
868 1054
869my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1062
873sub new { 1063sub new {
874 my $class = shift; 1064 my ($class, %arg) = @_;
875 1065
876 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
877 1067
878 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1071 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1072 can_events => 1,
884 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
885 ); 1076 );
886 1077
887 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
888 align => 0, 1079 align => 0,
889 valign => 1, 1080 valign => 1,
890 text => $self->{title}, 1081 text => $title,
891 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
892 1084
893 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
894} 1093}
895 1094
896sub border { 1095sub border {
897 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
898} 1097}
899 1098
900sub size_request { 1099sub size_request {
901 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
902 1104
903 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
904 1106
905 ( 1107 (
906 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
909} 1111}
910 1112
911sub size_allocate { 1113sub size_allocate {
912 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
913 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
914 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
916 1126
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
921} 1128}
922 1129
923sub button_down { 1130sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
925 1132
… …
941 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
942 1149
943 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
945 1152
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1158 };
951 1159
952 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1164 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
958 1166
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
960 1168
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
964 } 1175 1
965} 1176}
966 1177
967sub button_up { 1178sub button_up {
968 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
969 1180
970 delete $self->{motion}; 1181 !!delete $self->{motion}
971} 1182}
972 1183
973sub mouse_motion { 1184sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
975 1186
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
977} 1190}
978 1191
979sub _draw { 1192sub _draw {
980 my ($self) = @_; 1193 my ($self) = @_;
981 1194
1195 my $child = $self->{children}[0];
1196
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1199
985 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1202
988 my $border = $self->border; 1203 my $border = $self->border;
989 1204
990 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1210
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
998 1213
999 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1219 }
1010 1220
1011 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1012 1222
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1016} 1229}
1017 1230
1018############################################################################# 1231#############################################################################
1019 1232
1020package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1028sub new { 1241sub new {
1029 my $class = shift; 1242 my $class = shift;
1030 1243
1031 $class->SUPER::new ( 1244 $class->SUPER::new (
1032 col_expand => [], 1245 col_expand => [],
1033 @_ 1246 @_,
1034 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1252}
1036 1253
1037sub add { 1254sub add {
1038 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1039 1256
1040 $child->set_parent ($self); 1257 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1042 1259
1043 $child->check_size; 1260 $self->realloc;
1044} 1261}
1045 1262
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1264sub clear {
1052 my ($self) = @_; 1265 my ($self) = @_;
1053 1266
1054 my @children = $self->children; 1267 my @children = $self->children;
1055 delete $self->{children}; 1268 delete $self->{children};
… …
1057 for (@children) { 1270 for (@children) {
1058 delete $_->{parent}; 1271 delete $_->{parent};
1059 $_->hide; 1272 $_->hide;
1060 } 1273 }
1061 1274
1062 $self->update; 1275 $self->realloc;
1063} 1276}
1064 1277
1065sub get_wh { 1278sub get_wh {
1066 my ($self) = @_; 1279 my ($self) = @_;
1067 1280
… …
1098sub size_allocate { 1311sub size_allocate {
1099 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1100 1313
1101 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1102 1315
1103 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1105 1318
1106 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1376 }
1164} 1377}
1165 1378
1166############################################################################# 1379#############################################################################
1167 1380
1168package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1382
1172our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1173 1384
1174sub size_request { 1385sub size_request {
1175 my ($self) = @_; 1386 my ($self) = @_;
1176 1387
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1178 1389 ? (
1179 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1392 )
1182 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1183} 1397}
1184 1398
1185sub size_allocate { 1399sub size_allocate {
1186 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1187 1401
1188 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1403 my $children = $self->{children};
1191 1404
1192 my @h = map $_->{req_w}, @$children; 1405 my @req;
1193 1406
1194 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1195 1408 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1422 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1423 }
1210 } 1424 }
1211 1425
1212 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1213 1427
1214 my $y = 0; 1428 my $pos = 0;
1215 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1432
1220 $y += $h; 1433 $pos += $alloc;
1221 } 1434 }
1222 1435
1223 1 1436 1
1224} 1437}
1225 1438
1226############################################################################# 1439#############################################################################
1227 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1228package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1229 1457
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1233 1459
1234sub size_request { 1460sub new {
1235 my ($self) = @_; 1461 my $class = shift;
1236 1462
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1238 1464 vertical => 1,
1239 ( 1465 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1466 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1467}
1283 1468
1284############################################################################# 1469#############################################################################
1285 1470
1286package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1297 #bg => none 1482 #bg => none
1298 #active_bg => none 1483 #active_bg => none
1299 #font => default_font 1484 #font => default_font
1300 #text => initial text 1485 #text => initial text
1301 #markup => initial narkup 1486 #markup => initial narkup
1487 #max_w => maximum pixel width
1488 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1303 fontsize => 1, 1490 fontsize => 1,
1304 align => -1, 1491 align => -1,
1305 valign => -1, 1492 valign => -1,
1306 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1307 can_events => 0, 1495 can_events => 0,
1308 %arg 1496 %arg
1309 ); 1497 );
1310 1498
1311 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1348 1536
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1351 1539
1540 $self->realloc;
1352 $self->update; 1541 $self->update;
1353 $self->check_size;
1354} 1542}
1355 1543
1356sub set_markup { 1544sub set_markup {
1357 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1358 1546
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1551
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1366 1554
1555 $self->realloc;
1367 $self->update; 1556 $self->update;
1368 $self->check_size;
1369} 1557}
1370 1558
1371sub size_request { 1559sub size_request {
1372 my ($self) = @_; 1560 my ($self) = @_;
1373 1561
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1562 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1563 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1567
1378 my ($w, $h) = $self->{layout}->size; 1568 my ($w, $h) = $self->{layout}->size;
1379 1569
1380 if (exists $self->{template}) { 1570 if (exists $self->{template}) {
… …
1385 1575
1386 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1388 } 1578 }
1389 1579
1390 ( 1580 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1581}
1395 1582
1396sub size_allocate { 1583sub size_allocate {
1397 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1398 1585
1586 delete $self->{ox};
1587
1399 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1590}
1401 1591
1402sub set_fontsize { 1592sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1404 1594
1405 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1596 delete $self->{texture};
1407 1597
1408 $self->update; 1598 $self->realloc;
1409 $self->check_size;
1410} 1599}
1411 1600
1412sub _draw { 1601sub _draw {
1413 my ($self) = @_; 1602 my ($self) = @_;
1414 1603
… …
1416 1605
1417 my $tex = $self->{texture} ||= do { 1606 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1607 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1608 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1613
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1424 1616
1617 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1428 1621
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1625 };
1435 1626
1436 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1629
… …
1464 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1465 can_hover => 1, 1656 can_hover => 1,
1466 can_focus => 1, 1657 can_focus => 1,
1467 valign => 0, 1658 valign => 0,
1468 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1469 @_ 1661 @_
1470 ) 1662 )
1471} 1663}
1472 1664
1473sub _set_text { 1665sub _set_text {
… …
1483 $self->{text} = $text; 1675 $self->{text} = $text;
1484 1676
1485 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1487 1679
1488 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1489} 1681}
1490 1682
1491sub set_text { 1683sub set_text {
1492 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1493 1685
1494 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1687 $self->_set_text ($text);
1496 $self->update; 1688
1497 $self->check_size; 1689 $self->realloc;
1498} 1690}
1499 1691
1500sub get_text { 1692sub get_text {
1501 $_[0]{text} 1693 $_[0]{text}
1502} 1694}
… …
1505 my ($self) = @_; 1697 my ($self) = @_;
1506 1698
1507 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1508 1700
1509 ($w + 1, $h) # add 1 for cursor 1701 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1702}
1517 1703
1518sub key_down { 1704sub key_down {
1519 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1520 1706
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1726 $self->_emit ('escape');
1541 } elsif ($uni) { 1727 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1543 } 1731 }
1544 1732
1545 $self->_set_text ($text); 1733 $self->_set_text ($text);
1546 $self->update; 1734
1547 $self->check_size; 1735 $self->realloc;
1736
1737 1
1548} 1738}
1549 1739
1550sub focus_in { 1740sub focus_in {
1551 my ($self) = @_; 1741 my ($self) = @_;
1552 1742
… …
1567 utf8::encode $text; 1757 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1569 1759
1570 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1571 $self->update; 1761 $self->update;
1762
1763 1
1572} 1764}
1573 1765
1574sub mouse_motion { 1766sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1576# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1577} 1771}
1578 1772
1579sub _draw { 1773sub _draw {
1580 my ($self) = @_; 1774 my ($self) = @_;
1581 1775
… …
1632 if ($sym == 13) { 1826 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1827 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1828 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1829 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1830 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1831 $self->_emit (activate => $txt);
1638 $self->update; 1832 $self->update;
1639 1833
1640 } elsif ($sym == CFClient::SDLK_UP) { 1834 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1835 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1836 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1852 } else {
1659 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1660 } 1854 }
1661 1855
1662 } else { 1856 } else {
1663 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1664 } 1860 1
1665
1666} 1861}
1667 1862
1668############################################################################# 1863#############################################################################
1669 1864
1670package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1679 1874
1680sub new { 1875sub new {
1681 my $class = shift; 1876 my $class = shift;
1682 1877
1683 $class->SUPER::new ( 1878 $class->SUPER::new (
1684 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1685 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1687 can_hover => 1, 1883 can_hover => 1,
1688 align => 0, 1884 align => 0,
1689 valign => 0, 1885 valign => 0,
1690 can_events => 1, 1886 can_events => 1,
1691 @_ 1887 @_
1692 ) 1888 )
1693} 1889}
1694 1890
1891sub activate { }
1892
1695sub button_up { 1893sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1697 1895
1896 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1899
1701 } 1900 1
1702} 1901}
1703 1902
1704sub _draw { 1903sub _draw {
1705 my ($self) = @_; 1904 my ($self) = @_;
1706 1905
… …
1735 1934
1736sub new { 1935sub new {
1737 my $class = shift; 1936 my $class = shift;
1738 1937
1739 $class->SUPER::new ( 1938 $class->SUPER::new (
1740 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1741 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1945 state => 0,
… …
1749} 1949}
1750 1950
1751sub size_request { 1951sub size_request {
1752 my ($self) = @_; 1952 my ($self) = @_;
1753 1953
1754 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1755} 1955}
1756 1956
1757sub button_down { 1957sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1759 1959
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1764 } 1968 1
1765} 1969}
1766 1970
1767sub _draw { 1971sub _draw {
1768 my ($self) = @_; 1972 my ($self) = @_;
1769 1973
1770 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1771 1975
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1977
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1981
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1983
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1985
… …
2043 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2051 vertical => 0, 2257 vertical => 0,
2052 can_hover => 1, 2258 can_hover => 1,
2053 inner_pad => .05, 2259 inner_pad => 0.02,
2054 @_ 2260 @_
2055 ); 2261 );
2056 2262
2057 $self->set_value ($self->{range}[0]); 2263 $self->set_value ($self->{range}[0]);
2058 $self->update; 2264 $self->update;
2059 2265
2060 $self 2266 $self
2061} 2267}
2062 2268
2269sub changed { }
2270
2271sub set_range {
2272 my ($self, $range) = @_;
2273
2274 ($range, $self->{range}) = ($self->{range}, $range);
2275
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2278}
2279
2063sub set_value { 2280sub set_value {
2064 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2065 2282
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2283 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2284
2068 $hi = $lo + 1 if $hi <= $lo; 2285 $hi = $lo + 1 if $hi <= $lo;
2069 2286
2287 $page = $hi - $lo if $page > $hi - $lo;
2288
2070 $value = $lo if $value < $lo; 2289 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2290 $value = $hi - $page if $value > $hi - $page;
2072 2291
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2292 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2293 if $unit;
2075 2294
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2296
2080 if ($value != $old_value) { 2297 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2298 $self->_emit (changed => $value);
2082 $self->update; 2299 $self->update;
2083 } 2300 }
2084} 2301}
2085 2302
2086sub size_request { 2303sub size_request {
2087 my ($self) = @_; 2304 my ($self) = @_;
2088 2305
2089 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2307}
2094 2308
2095sub button_down { 2309sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2097 2311
2098 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2313
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315
2099 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2100} 2317}
2101 2318
2102sub mouse_motion { 2319sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2104 2321
2105 if ($GRAB == $self) { 2322 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2324
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2326
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2328
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2113 } 2334 1
2114} 2335}
2115 2336
2116sub update { 2337sub update {
2117 my ($self) = @_; 2338 my ($self) = @_;
2118 2339
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2341 $self->set_value ($self->{range}[0]);
2121 2342
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
2123 2345
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2347
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2348 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2349 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2350
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2351 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2352 $value = $value * $self->{scale} + $self->{offset};
2130 2353
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2354 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2355 $self->{knob_w} = $knob_w;
2138 }); 2356 });
2139 2357
2140 $self->SUPER::update; 2358 $self->SUPER::update;
2141} 2359}
2142 2360
… …
2148 glScale $self->{w}, $self->{h}; 2366 glScale $self->{w}, $self->{h};
2149 2367
2150 if ($self->{vertical}) { 2368 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2369 # draw a vertical slider like a rotated horizontal slider
2152 2370
2371 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2372 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2373 }
2156 2374
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2377
… …
2166 # draw handle 2384 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2385 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2386
2169 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
2170} 2388}
2389
2390#############################################################################
2391
2392package CFClient::UI::ValSlider;
2393
2394our @ISA = CFClient::UI::HBox::;
2395
2396sub new {
2397 my ($class, %arg) = @_;
2398
2399 my $range = delete $arg{range};
2400
2401 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift },
2405 from_value => sub { shift },
2406 %arg,
2407 );
2408
2409 $self->{slider}->connect (changed => sub {
2410 my ($self, $value) = @_;
2411 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2412 $self->{parent}->emit (changed => $value);
2413 });
2414
2415# $self->{entry}->connect (changed => sub {
2416# my ($self, $value) = @_;
2417# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2418# $self->{parent}->emit (changed => $value);
2419# });
2420
2421 $self->add ($self->{slider}, $self->{entry});
2422
2423 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2424
2425 $self
2426}
2427
2428sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) }
2171 2430
2172############################################################################# 2431#############################################################################
2173 2432
2174package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
2175 2434
… …
2205 2464
2206 $self->{fontsize} = $fontsize; 2465 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2466 $self->reflow;
2208} 2467}
2209 2468
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2469sub size_allocate {
2230 my ($self, $w, $h) = @_; 2470 my ($self, $w, $h) = @_;
2231 2471
2232 $self->SUPER::size_allocate ($w, $h); 2472 $self->SUPER::size_allocate ($w, $h);
2233 2473
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2476 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2477
2238 $self->reflow; 2478 $self->reflow;
2239} 2479}
2240 2480
2481sub text_size {
2482 my ($self, $text, $indent) = @_;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent);
2488 $layout->set_markup ($text);
2489
2490 $layout->size
2491}
2492
2493sub reflow {
2494 my ($self) = @_;
2495
2496 $self->{need_reflow}++;
2497 $self->update;
2498}
2499
2500sub set_offset {
2501 my ($self, $offset) = @_;
2502
2503 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset);
2505}
2506
2507sub clear {
2508 my ($self) = @_;
2509
2510 $self->{par} = [];
2511 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513}
2514
2241sub add_paragraph { 2515sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2516 my ($self, $color, $text, $indent) = @_;
2243 2517
2244 #TODO: intelligently "reformat" paragraph 2518 for my $line (split /\n/, $text) {
2245 2519 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2520 $self->{height} += $h;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2522 }
2249 2523
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2525}
2255 2526
2256sub update { 2527sub update {
2257 my ($self) = @_; 2528 my ($self) = @_;
2258 2529
… …
2261 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
2262 2533
2263 delete $self->{texture}; 2534 delete $self->{texture};
2264 2535
2265 $ROOT->on_post_alloc ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
2266 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2540 my $height = 0;
2268 2541
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2270 for @{$self->{par}}; 2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2271 2557
2272 $self->{height} = $height; 2558 $self->{height} = $height;
2273 2559
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2561
2276 delete $self->{texture}; 2562 delete $self->{texture};
2277 } 2563 }
2278 2564
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2282 2568
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2569 my $top = int $self->{children}[1]{range}[0];
2287 2570
2288 my $y0 = $top; 2571 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2572 my $y1 = $top + $H;
2290 2573
2291 my $y = 0; 2574 my $y = 0;
2292 2575
2293 my $layout = $self->{layout}; 2576 my $layout = $self->{layout};
2294 2577
2295 $layout->set_font ($self->{font}) if $self->{font}; 2578 $layout->set_font ($self->{font}) if $self->{font};
2296 2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2297 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2585 my $h = $par->[1];
2299 2586
2300 if ($y0 < $y + $h && $y < $y1) { 2587 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2590 $layout->set_markup ($par->[4]);
2303 2591
2304 my ($W, $H) = $layout->size; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2593
2594 glRasterPos $par->[3], $y - $y0;
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2596 }
2307 2597
2308 $y += $h; 2598 $y += $h;
2309 } 2599 }
2310 2600
2311 glDisable GL_TEXTURE_2D; 2601 glDisable GL_BLEND;
2312 }; 2602 };
2313 }); 2603 });
2314} 2604}
2315 2605
2316sub _draw { 2606sub _draw {
2317 my ($self) = @_; 2607 my ($self) = @_;
2318 2608
2319 glEnable GL_TEXTURE_2D; 2609 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2611 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2324 2614
2325 $self->{children}[1]->draw; 2615 $self->{children}[1]->draw;
2326 2616
2327} 2617}
… …
2376 2666
2377sub new { 2667sub new {
2378 my $class = shift; 2668 my $class = shift;
2379 2669
2380 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2381 state => 0, 2671 state => 0,
2382 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2383 @_ 2673 @_
2384 ); 2674 );
2385 2675
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2676 $self
2392} 2677}
2393 2678
2394sub toggle_flopper { 2679sub toggle_flopper {
2395 my ($self) = @_; 2680 my ($self) = @_;
2396 2681
2397 # TODO: use animation 2682 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2683}
2409 2684
2410############################################################################# 2685#############################################################################
2411 2686
2412package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2425} 2700}
2426 2701
2427sub set_tooltip_from { 2702sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2429 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2430 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2717 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2719 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2721 );
2437} 2722}
2438 2723
2439sub size_request { 2724sub size_request {
2440 my ($self) = @_; 2725 my ($self) = @_;
… …
2446 2731
2447sub size_allocate { 2732sub size_allocate {
2448 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2449 2734
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2451} 2754}
2452 2755
2453sub _draw { 2756sub _draw {
2454 my ($self) = @_; 2757 my ($self) = @_;
2455 2758
… …
2472 glVertex $w, $h; 2775 glVertex $w, $h;
2473 glVertex $w, 0; 2776 glVertex $w, 0;
2474 glEnd; 2777 glEnd;
2475 2778
2476 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2477 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2478} 2782}
2479 2783
2480############################################################################# 2784#############################################################################
2481 2785
… …
2486use CFClient::OpenGL; 2790use CFClient::OpenGL;
2487 2791
2488sub new { 2792sub new {
2489 my $class = shift; 2793 my $class = shift;
2490 2794
2491 $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2492 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2493 @_, 2798 @_,
2494 ) 2799 );
2800
2801 if ($self->{anim} && $self->{animspeed}) {
2802 Scalar::Util::weaken (my $widget = $self);
2803
2804 $self->{timer} = Event->timer (
2805 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2806 hard => 1,
2807 interval => $self->{animspeed},
2808 cb => sub {
2809 ++$widget->{frame};
2810 $widget->update;
2811 },
2812 );
2813 }
2814
2815 $self
2495} 2816}
2496 2817
2497sub size_request { 2818sub size_request {
2498 (32, 8) 2819 (32, 8)
2499} 2820}
2500 2821
2822sub update {
2823 my ($self) = @_;
2824
2825 return unless $self->{visible};
2826
2827 $self->SUPER::update;
2828}
2829
2501sub _draw { 2830sub _draw {
2502 my ($self) = @_; 2831 my ($self) = @_;
2503 2832
2504 return unless $::CONN;#d# manage and cache textures differently 2833 return unless $::CONN;
2834
2835 my $face;
2836
2837 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}];
2839
2840 $face = $anim->[ $self->{frame} % @$anim ]
2841 if $anim && @$anim;
2842 }
2843
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2845
2507 # TODO animation
2508 if ($tex) { 2846 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2847 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2849 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2514 } 2852 }
2515} 2853}
2516 2854
2517############################################################################# 2855sub DESTROY {
2856 my ($self) = @_;
2518 2857
2858 $self->{timer}->cancel
2859 if $self->{timer};
2860
2861 $self->SUPER::DESTROY;
2862}
2863
2864#############################################################################
2865
2519package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2520 2867
2521our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2522 2869
2523sub new { 2870# TODO: should actualyl wrap buttons and other goodies.
2524 my $class = shift;
2525
2526 my %args = @_;
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 my $self = $class->SUPER::new (
2550 can_hover => 1,
2551 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_;
2556
2557 # todo: maybe put examine on 1? but should just be a tooltip :(
2558 if ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) {
2563 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ],
2572 );
2573
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 }
2576
2577 1
2578 },
2579 %args
2580 );
2581
2582 $self->add (new CFClient::UI::Face
2583 can_events => 0,
2584 face => $item->{face},
2585 anim => $item->{anim},
2586 animspeed => $item->{animspeed},
2587 );
2588
2589 $self->add (new CFClient::UI::Label
2590 can_events => 0,
2591 text => $desc,
2592 );
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_,
2609 );
2610
2611 $self
2612}
2613
2614sub set_items {
2615 my ($self, $items) = @_;
2616
2617 $self->{scrolled}->clear;
2618 return unless $items;
2619
2620 my @items = sort {
2621 ($a->{type} <=> $b->{type})
2622 or ($a->{name} cmp $b->{name})
2623 } @$items;
2624
2625 $self->{real_items} = \@items;
2626
2627 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2633 }
2634
2635 $self->{scrolled}->add (@items);
2636
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638}
2639
2640sub size_request {
2641 my ($self) = @_;
2642 ($self->{req_w}, $self->{req_h});
2643}
2644 2871
2645############################################################################# 2872#############################################################################
2646 2873
2647package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2648 2875
… …
2682 2909
2683# popup given the event (must be a mouse button down event currently) 2910# popup given the event (must be a mouse button down event currently)
2684sub popup { 2911sub popup {
2685 my ($self, $ev) = @_; 2912 my ($self, $ev) = @_;
2686 2913
2687 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2688 2915
2689 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self; 2917 $GRAB = $self;
2691 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2692 2919
2693 $self->show; 2920 $self->show;
2694 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2695} 2922}
2696 2923
2697sub mouse_motion { 2924sub mouse_motion {
2698 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2699 2926
2700 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2701 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2702 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2703} 2932}
2704 2933
2705sub button_up { 2934sub button_up {
2706 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2707 2936
2708 if ($ev->{button} == $self->{button}) { 2937 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB; 2938 undef $GRAB;
2710 $self->hide; 2939 $self->hide;
2711 2940
2712 $self->emit ("popdown"); 2941 $self->_emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2714 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2715} 3054}
2716 3055
2717############################################################################# 3056#############################################################################
2718 3057
2719package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
2720 3059
2721our @ISA = CFClient::UI::VBox::; 3060our @ISA = CFClient::UI::VBox::;
3061
3062sub new {
3063 my $class = shift;
3064
3065 $class->SUPER::new (
3066 fontsize => 0.8,
3067 @_,
3068 )
3069}
2722 3070
2723sub reorder { 3071sub reorder {
2724 my ($self) = @_; 3072 my ($self) = @_;
2725 my $NOW = time; 3073 my $NOW = time;
2726 3074
… …
2746 : $item->{text}; 3094 : $item->{text};
2747 3095
2748 for ($short) { 3096 for ($short) {
2749 s/^\s+//; 3097 s/^\s+//;
2750 s/\s+/ /g; 3098 s/\s+/ /g;
2751 my $len = int 40 / $item->{fontsize};
2752 substr $_, $len, length, "…" if $len < length;
2753 } 3099 }
2754 3100
2755 new CFClient::UI::Label 3101 new CFClient::UI::Label
2756 markup => $short, 3102 markup => $short,
2757 tooltip => $item->{tooltip}, 3103 tooltip => $item->{tooltip},
2758 tooltip_font => $::FONT_PROP, 3104 tooltip_font => $::FONT_PROP,
2759 tooltip_width => 0.67, 3105 tooltip_width => 0.67,
2760 fontsize => $item->{fontsize}, 3106 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44,
2761 fg => $item->{fg}, 3108 fg => $item->{fg},
2762 can_events => 1, 3109 can_events => 1,
2763 can_hover => 1 3110 can_hover => 1
2764 }; 3111 };
2765 } 3112 }
… …
2771sub add { 3118sub add {
2772 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2773 3120
2774 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2775 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2776 3125
2777 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2778 3127
2779 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2780 3129
… …
2792 $self->{item}{$group} = { 3141 $self->{item}{$group} = {
2793 id => ++$self->{id}, 3142 id => ++$self->{id},
2794 text => $text, 3143 text => $text,
2795 timeout => $timeout, 3144 timeout => $timeout,
2796 tooltip => $text, 3145 tooltip => $text,
2797 fontsize => 0.8,
2798 fg => [0.8, 0.8, 0.8, 0.8], 3146 fg => [0.8, 0.8, 0.8, 0.8],
2799 pri => 0, 3147 pri => 0,
2800 count => 1, 3148 count => 1,
2801 %arg, 3149 %arg,
2802 }; 3150 };
2803 } 3151 }
2804 3152
2805 $self->reorder; 3153 $self->reorder;
2806} 3154}
2807 3155
2808############################################################################# 3156sub reconfigure {
3157 my ($self) = @_;
2809 3158
3159 delete $_->{label}
3160 for values %{ $self->{item} || {} };
3161
3162 $self->reorder;
3163 $self->SUPER::reconfigure;
3164}
3165
3166#############################################################################
3167
2810package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2811 3169
2812our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2813
2814use CFClient::OpenGL;
2815 3171
2816sub new { 3172sub new {
2817 my $class = shift; 3173 my $class = shift;
2818 3174
2819 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
2820 @_, 3418 @_,
2821 ) 3419 )
2822} 3420}
2823 3421
2824sub configure { 3422# XXX: Do sorting? Argl...
2825 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
2826
2827 $self->{w} = $w;
2828 $self->{h} = $h;
2829}
2830
2831sub check_size {
2832 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
2833 3426
2834 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2835 if $self->{w}; 3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
2836} 3481}
2837 3482
2838sub size_request { 3483sub size_request {
2839 my ($self) = @_; 3484 my ($self) = @_;
2840 3485
2841 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
2842} 3501}
2843 3502
2844sub size_allocate { 3503sub size_allocate {
2845 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2846 3505
2847 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2848 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2849
2850 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2851 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2852
2853 for my $child ($self->children) { 3506 for my $child ($self->children) {
2854 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2855 3508
2856 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
2857 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
2858 3511
2859 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
2860 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
2861
2862 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2863 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2864 3514
2865 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
2866 } 3516 }
2867} 3517}
2868 3518
… …
2879} 3529}
2880 3530
2881sub update { 3531sub update {
2882 my ($self) = @_; 3532 my ($self) = @_;
2883 3533
2884 $self->check_size;
2885 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
2886} 3535}
2887 3536
2888sub add { 3537sub add {
2889 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
2890 3539
2891 for my $child (@children) {
2892 $child->{toplevel} = 1; 3540 $_->{is_toplevel} = 1
2893 3541 for @children;
2894 # integerise window positions
2895 $child->{x} = int $child->{x};
2896 $child->{y} = int $child->{y};
2897 }
2898 3542
2899 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3544}
3545
3546sub remove {
3547 my ($self, @children) = @_;
3548
3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3553
3554 while (@children) {
3555 my $w = pop @children;
3556 push @children, $w->children;
3557 $w->set_invisible;
3558 }
2900} 3559}
2901 3560
2902sub on_refresh { 3561sub on_refresh {
2903 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
2904 3563
… …
2917 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
2918 $_->() 3577 $_->()
2919 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
2920 } 3579 }
2921 3580
2922 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
2923 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
2924 3585
2925 for (;;) { 3586 outer:
2926 if ($self->{check_size}) { 3587 while () {
2927 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
2928 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
2929 for values %{delete $self->{check_size}} 3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
2930 } 3596 }
2931 3597
2932 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
2933 3600
2934 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
2935 ? @$widget{qw(user_w user_h)} 3602 and last;
2936 : $widget->size_request;
2937
2938 if (delete $widget->{force_alloc}
2939 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2940 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2941 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
2942 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
2943 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
2944 3621
2945 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
2946 3623
2947 $widget->{parent}->check_size
2948 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
2949 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
2950 } 3634 }
2951 } 3635 }
2952 3636
2953 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
2954 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
2955 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2956 3645
2957 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
2958 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
2959 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
2960 $widget->{w} = $w; 3656 $widget->{w} = $w;
2961 $widget->{h} = $h; 3657 $widget->{h} = $h;
2962 $widget->size_allocate ($w, $h); 3658
2963 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
2964 } 3661 }
2965 } 3662 }
2966 3663
2967 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
2968 $_->() 3665 $_->()
2969 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
2970 } 3667 }
2971 3668
3669
2972 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2973 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2974 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
2975 3673
2976 glMatrixMode GL_PROJECTION; 3674 glMatrixMode GL_PROJECTION;
2977 glLoadIdentity; 3675 glLoadIdentity;
2978 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2979 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
2980 glLoadIdentity; 3678 glLoadIdentity;
2981 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
2982 $self->_draw; 3687 $self->_draw;
2983} 3688}
2984 3689
2985############################################################################# 3690#############################################################################
2986 3691
2987package CFClient::UI; 3692package CFClient::UI;
2988 3693
2989$ROOT = new CFClient::UI::Root; 3694$ROOT = new CFClient::UI::Root;
2990$TOOLTIP = new CFClient::UI::Tooltip; 3695$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2991 3696
29921 36971
2993 3698

Diff Legend

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