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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.274 by root, Sat Jun 3 22:20:52 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})
… …
650 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
651} 795}
652 796
653############################################################################# 797#############################################################################
654 798
799# back-buffered drawing area
800
655package CFClient::UI::Window; 801package CFClient::UI::Window;
656 802
657our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
658 804
659use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
677 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 824 $self->update;
679} 825}
680 826
681sub _render { 827sub _render {
828 my ($self) = @_;
829
682 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
683} 831}
684 832
685sub render_child { 833sub render_child {
686 my ($self) = @_; 834 my ($self) = @_;
687 835
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
691 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
692 $self->_render; 847 $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 }; 848 };
701} 849}
702 850
703sub _draw { 851sub _draw {
704 my ($self) = @_; 852 my ($self) = @_;
705 853
706 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
707 855
708 my $tex = $self->{texture} 856 my $tex = $self->{texture}
709 or return; 857 or return;
710 858
711 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
714 862
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 864
717 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
718} 866}
… …
721 869
722package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
723 871
724our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
725 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
726sub size_request { 884sub size_request {
727 my ($self) = @_; 885 my ($self) = @_;
728 886
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 888
732 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
733} 893}
734 894
735sub size_allocate { 895sub size_allocate {
736 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
737 897
898 my $child = $self->child;
899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
903 $self->child->configure (0, 0, $w, $h);
738 $self->update; 904 $self->update;
739} 905}
740 906
741sub set_offset { 907sub set_offset {
742 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
776} 942}
777 943
778sub _render { 944sub _render {
779 my ($self) = @_; 945 my ($self) = @_;
780 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 951
783 $self->SUPER::_render; 952 $self->SUPER::_render;
784} 953}
785 954
… …
788package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
789 958
790our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
791 960
792sub new { 961sub new {
793 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
794 965
795 my $self; 966 my $self;
796 967
797 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
798 vertical => 1, 969 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 971 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
802 }, 973 },
803 ; 974 ;
804 975
805 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 977 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 978 slider => $slider,
808 @_, 979 %arg,
809 ); 980 );
810 981
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
814 984
815 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($w, $h);
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 1011}
817 1012
818#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1014# update viewport offset on scroll
820 1015
… …
864 1059
865our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
866 1061
867use CFClient::OpenGL; 1062use CFClient::OpenGL;
868 1063
869my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1071
873sub new { 1072sub new {
874 my $class = shift; 1073 my ($class, %arg) = @_;
875 1074
876 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
877 1076
878 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1080 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1081 can_events => 1,
884 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
885 ); 1085 );
886 1086
887 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
888 align => 0, 1088 align => 0,
889 valign => 1, 1089 valign => 1,
890 text => $self->{title}, 1090 text => $title,
891 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
892 1093
893 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
894} 1102}
895 1103
896sub border { 1104sub border {
897 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
898} 1106}
899 1107
900sub size_request { 1108sub size_request {
901 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
902 1113
903 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
904 1115
905 ( 1116 (
906 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
909} 1120}
910 1121
911sub size_allocate { 1122sub size_allocate {
912 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
913 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
914 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
916 1135
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); 1136 $self->child->configure ($border, $border, $w, $h);
921} 1137}
922 1138
923sub button_down { 1139sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
925 1141
… …
941 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
942 1158
943 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
945 1161
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1167 };
951 1168
952 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1173 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
958 1175
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
960 1177
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
964 } 1184 1
965} 1185}
966 1186
967sub button_up { 1187sub button_up {
968 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
969 1189
970 delete $self->{motion}; 1190 !!delete $self->{motion}
971} 1191}
972 1192
973sub mouse_motion { 1193sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
975 1195
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
977} 1199}
978 1200
979sub _draw { 1201sub _draw {
980 my ($self) = @_; 1202 my ($self) = @_;
981 1203
1204 my $child = $self->{children}[0];
1205
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1208
985 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1211
988 my $border = $self->border; 1212 my $border = $self->border;
989 1213
990 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1219
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
998 1222
999 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1226 $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); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1228 }
1010 1229
1011 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1012 1231
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1016} 1238}
1017 1239
1018############################################################################# 1240#############################################################################
1019 1241
1020package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1028sub new { 1250sub new {
1029 my $class = shift; 1251 my $class = shift;
1030 1252
1031 $class->SUPER::new ( 1253 $class->SUPER::new (
1032 col_expand => [], 1254 col_expand => [],
1033 @_ 1255 @_,
1034 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1261}
1036 1262
1037sub add { 1263sub add {
1038 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1039 1265
1040 $child->set_parent ($self); 1266 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1042 1268
1043 $child->check_size; 1269 $self->realloc;
1044} 1270}
1045 1271
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1273sub clear {
1052 my ($self) = @_; 1274 my ($self) = @_;
1053 1275
1054 my @children = $self->children; 1276 my @children = $self->children;
1055 delete $self->{children}; 1277 delete $self->{children};
… …
1057 for (@children) { 1279 for (@children) {
1058 delete $_->{parent}; 1280 delete $_->{parent};
1059 $_->hide; 1281 $_->hide;
1060 } 1282 }
1061 1283
1062 $self->update; 1284 $self->realloc;
1063} 1285}
1064 1286
1065sub get_wh { 1287sub get_wh {
1066 my ($self) = @_; 1288 my ($self) = @_;
1067 1289
… …
1098sub size_allocate { 1320sub size_allocate {
1099 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1100 1322
1101 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1102 1324
1103 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1105 1327
1106 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1385 }
1164} 1386}
1165 1387
1166############################################################################# 1388#############################################################################
1167 1389
1168package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1391
1172our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1173 1393
1174sub size_request { 1394sub size_request {
1175 my ($self) = @_; 1395 my ($self) = @_;
1176 1396
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1178 1398 ? (
1179 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1401 )
1182 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1183} 1406}
1184 1407
1185sub size_allocate { 1408sub size_allocate {
1186 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1187 1410
1188 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1412 my $children = $self->{children};
1191 1413
1192 my @h = map $_->{req_w}, @$children; 1414 my @req;
1193 1415
1194 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1195 1417 @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 { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1431 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 } 1432 }
1210 } 1433 }
1211 1434
1212 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1213 1436
1214 my $y = 0; 1437 my $pos = 0;
1215 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1441
1220 $y += $h; 1442 $pos += $alloc;
1221 } 1443 }
1222 1444
1223 1 1445 1
1224} 1446}
1225 1447
1226############################################################################# 1448#############################################################################
1227 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1228package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1229 1466
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1233 1468
1234sub size_request { 1469sub new {
1235 my ($self) = @_; 1470 my $class = shift;
1236 1471
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1238 1473 vertical => 1,
1239 ( 1474 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1475 )
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} 1476}
1283 1477
1284############################################################################# 1478#############################################################################
1285 1479
1286package CFClient::UI::Label; 1480package CFClient::UI::Label;
… …
1297 #bg => none 1491 #bg => none
1298 #active_bg => none 1492 #active_bg => none
1299 #font => default_font 1493 #font => default_font
1300 #text => initial text 1494 #text => initial text
1301 #markup => initial narkup 1495 #markup => initial narkup
1496 #max_w => maximum pixel width
1497 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1303 fontsize => 1, 1499 fontsize => 1,
1304 align => -1, 1500 align => -1,
1305 valign => -1, 1501 valign => -1,
1306 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1307 can_events => 0, 1504 can_events => 0,
1308 %arg 1505 %arg
1309 ); 1506 );
1310 1507
1311 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1348 1545
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1351 1548
1549 $self->realloc;
1352 $self->update; 1550 $self->update;
1353 $self->check_size;
1354} 1551}
1355 1552
1356sub set_markup { 1553sub set_markup {
1357 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1358 1555
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1560
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1366 1563
1564 $self->realloc;
1367 $self->update; 1565 $self->update;
1368 $self->check_size;
1369} 1566}
1370 1567
1371sub size_request { 1568sub size_request {
1372 my ($self) = @_; 1569 my ($self) = @_;
1373 1570
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1572 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1576
1378 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1379 1578
1380 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1385 1584
1386 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1388 } 1587 }
1389 1588
1390 ( 1589 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1590}
1395 1591
1396sub size_allocate { 1592sub size_allocate {
1397 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1398 1594
1595 delete $self->{ox};
1596
1399 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1599}
1401 1600
1402sub set_fontsize { 1601sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1404 1603
1405 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1605 delete $self->{texture};
1407 1606
1408 $self->update; 1607 $self->realloc;
1409 $self->check_size;
1410} 1608}
1411 1609
1412sub _draw { 1610sub _draw {
1413 my ($self) = @_; 1611 my ($self) = @_;
1414 1612
… …
1416 1614
1417 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1616 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1622
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1424 1625
1626 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1428 1630
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1634 };
1435 1635
1436 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1638
… …
1464 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1465 can_hover => 1, 1665 can_hover => 1,
1466 can_focus => 1, 1666 can_focus => 1,
1467 valign => 0, 1667 valign => 0,
1468 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1469 @_ 1670 @_
1470 ) 1671 )
1471} 1672}
1472 1673
1473sub _set_text { 1674sub _set_text {
… …
1483 $self->{text} = $text; 1684 $self->{text} = $text;
1484 1685
1485 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1487 1688
1488 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1489} 1690}
1490 1691
1491sub set_text { 1692sub set_text {
1492 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1493 1694
1494 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1696 $self->_set_text ($text);
1496 $self->update; 1697
1497 $self->check_size; 1698 $self->realloc;
1498} 1699}
1499 1700
1500sub get_text { 1701sub get_text {
1501 $_[0]{text} 1702 $_[0]{text}
1502} 1703}
… …
1505 my ($self) = @_; 1706 my ($self) = @_;
1506 1707
1507 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1508 1709
1509 ($w + 1, $h) # add 1 for cursor 1710 ($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} 1711}
1517 1712
1518sub key_down { 1713sub key_down {
1519 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1520 1715
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1735 $self->_emit ('escape');
1541 } elsif ($uni) { 1736 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1543 } 1740 }
1544 1741
1545 $self->_set_text ($text); 1742 $self->_set_text ($text);
1546 $self->update; 1743
1547 $self->check_size; 1744 $self->realloc;
1745
1746 1
1548} 1747}
1549 1748
1550sub focus_in { 1749sub focus_in {
1551 my ($self) = @_; 1750 my ($self) = @_;
1552 1751
… …
1567 utf8::encode $text; 1766 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1569 1768
1570 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1571 $self->update; 1770 $self->update;
1771
1772 1
1572} 1773}
1573 1774
1574sub mouse_motion { 1775sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1576# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1577} 1780}
1578 1781
1579sub _draw { 1782sub _draw {
1580 my ($self) = @_; 1783 my ($self) = @_;
1581 1784
… …
1632 if ($sym == 13) { 1835 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1638 $self->update; 1841 $self->update;
1639 1842
1640 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1861 } else {
1659 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1660 } 1863 }
1661 1864
1662 } else { 1865 } else {
1663 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1664 } 1869 1
1665
1666} 1870}
1667 1871
1668############################################################################# 1872#############################################################################
1669 1873
1670package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1679 1883
1680sub new { 1884sub new {
1681 my $class = shift; 1885 my $class = shift;
1682 1886
1683 $class->SUPER::new ( 1887 $class->SUPER::new (
1684 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1685 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1687 can_hover => 1, 1892 can_hover => 1,
1688 align => 0, 1893 align => 0,
1689 valign => 0, 1894 valign => 0,
1690 can_events => 1, 1895 can_events => 1,
1691 @_ 1896 @_
1692 ) 1897 )
1693} 1898}
1694 1899
1900sub activate { }
1901
1695sub button_up { 1902sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1697 1904
1905 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1908
1701 } 1909 1
1702} 1910}
1703 1911
1704sub _draw { 1912sub _draw {
1705 my ($self) = @_; 1913 my ($self) = @_;
1706 1914
… …
1735 1943
1736sub new { 1944sub new {
1737 my $class = shift; 1945 my $class = shift;
1738 1946
1739 $class->SUPER::new ( 1947 $class->SUPER::new (
1740 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1741 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1952 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1953 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1954 state => 0,
… …
1749} 1958}
1750 1959
1751sub size_request { 1960sub size_request {
1752 my ($self) = @_; 1961 my ($self) = @_;
1753 1962
1754 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1755} 1964}
1756 1965
1757sub button_down { 1966sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1759 1968
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1764 } 1977 1
1765} 1978}
1766 1979
1767sub _draw { 1980sub _draw {
1768 my ($self) = @_; 1981 my ($self) = @_;
1769 1982
1770 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1771 1984
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1986
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1990
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1992
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1994
… …
2043 my $self = $class->SUPER::new ( 2258 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2261 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2262 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2263 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2051 vertical => 0, 2266 vertical => 0,
2052 can_hover => 1, 2267 can_hover => 1,
2053 inner_pad => .05, 2268 inner_pad => 0.02,
2054 @_ 2269 @_
2055 ); 2270 );
2056 2271
2057 $self->set_value ($self->{range}[0]); 2272 $self->set_value ($self->{range}[0]);
2058 $self->update; 2273 $self->update;
2059 2274
2060 $self 2275 $self
2061} 2276}
2062 2277
2278sub changed { }
2279
2280sub set_range {
2281 my ($self, $range) = @_;
2282
2283 ($range, $self->{range}) = ($self->{range}, $range);
2284
2285 $self->update
2286 if "@$range" ne "@{$self->{range}}";
2287}
2288
2063sub set_value { 2289sub set_value {
2064 my ($self, $value) = @_; 2290 my ($self, $value) = @_;
2065 2291
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2292 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2293
2068 $hi = $lo + 1 if $hi <= $lo; 2294 $hi = $lo + 1 if $hi <= $lo;
2069 2295
2296 $page = $hi - $lo if $page > $hi - $lo;
2297
2070 $value = $lo if $value < $lo; 2298 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2299 $value = $hi - $page if $value > $hi - $page;
2072 2300
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2301 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2302 if $unit;
2075 2303
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2304 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2305
2080 if ($value != $old_value) { 2306 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2307 $self->_emit (changed => $value);
2082 $self->update; 2308 $self->update;
2083 } 2309 }
2084} 2310}
2085 2311
2086sub size_request { 2312sub size_request {
2087 my ($self) = @_; 2313 my ($self) = @_;
2088 2314
2089 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2316}
2094 2317
2095sub button_down { 2318sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2097 2320
2098 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2322
2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2324
2099 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2100} 2326}
2101 2327
2102sub mouse_motion { 2328sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2104 2330
2105 if ($GRAB == $self) { 2331 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2332 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2333
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2335
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2337
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2113 } 2343 1
2114} 2344}
2115 2345
2116sub update { 2346sub update {
2117 my ($self) = @_; 2347 my ($self) = @_;
2118 2348
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2350 $self->set_value ($self->{range}[0]);
2121 2351
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2352 my ($value, $lo, $hi, $page) = @{$self->{range}};
2353 my $range = ($hi - $page - $lo) || 1e-100;
2123 2354
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2355 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2356
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2357 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2358 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2359
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2360 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2361 $value = $value * $self->{scale} + $self->{offset};
2130 2362
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; 2363 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2364 $self->{knob_w} = $knob_w;
2138 }); 2365 });
2139 2366
2140 $self->SUPER::update; 2367 $self->SUPER::update;
2141} 2368}
2142 2369
… …
2148 glScale $self->{w}, $self->{h}; 2375 glScale $self->{w}, $self->{h};
2149 2376
2150 if ($self->{vertical}) { 2377 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2378 # draw a vertical slider like a rotated horizontal slider
2152 2379
2380 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2381 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2382 }
2156 2383
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2384 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2385 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2386
… …
2166 # draw handle 2393 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2394 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2395
2169 glDisable GL_TEXTURE_2D; 2396 glDisable GL_TEXTURE_2D;
2170} 2397}
2398
2399#############################################################################
2400
2401package CFClient::UI::ValSlider;
2402
2403our @ISA = CFClient::UI::HBox::;
2404
2405sub new {
2406 my ($class, %arg) = @_;
2407
2408 my $range = delete $arg{range};
2409
2410 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift },
2414 from_value => sub { shift },
2415 %arg,
2416 );
2417
2418 $self->{slider}->connect (changed => sub {
2419 my ($self, $value) = @_;
2420 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2421 $self->{parent}->emit (changed => $value);
2422 });
2423
2424# $self->{entry}->connect (changed => sub {
2425# my ($self, $value) = @_;
2426# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2427# $self->{parent}->emit (changed => $value);
2428# });
2429
2430 $self->add ($self->{slider}, $self->{entry});
2431
2432 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2433
2434 $self
2435}
2436
2437sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) }
2171 2439
2172############################################################################# 2440#############################################################################
2173 2441
2174package CFClient::UI::TextView; 2442package CFClient::UI::TextView;
2175 2443
… …
2205 2473
2206 $self->{fontsize} = $fontsize; 2474 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2475 $self->reflow;
2208} 2476}
2209 2477
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 { 2478sub size_allocate {
2230 my ($self, $w, $h) = @_; 2479 my ($self, $w, $h) = @_;
2231 2480
2232 $self->SUPER::size_allocate ($w, $h); 2481 $self->SUPER::size_allocate ($w, $h);
2233 2482
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2485 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2486
2238 $self->reflow; 2487 $self->reflow;
2239} 2488}
2240 2489
2490sub text_size {
2491 my ($self, $text, $indent) = @_;
2492
2493 my $layout = $self->{layout};
2494
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent);
2497 $layout->set_markup ($text);
2498
2499 $layout->size
2500}
2501
2502sub reflow {
2503 my ($self) = @_;
2504
2505 $self->{need_reflow}++;
2506 $self->update;
2507}
2508
2509sub set_offset {
2510 my ($self, $offset) = @_;
2511
2512 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset);
2514}
2515
2516sub clear {
2517 my ($self) = @_;
2518
2519 $self->{par} = [];
2520 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522}
2523
2241sub add_paragraph { 2524sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2525 my ($self, $color, $text, $indent) = @_;
2243 2526
2244 #TODO: intelligently "reformat" paragraph 2527 for my $line (split /\n/, $text) {
2245 2528 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2529 $self->{height} += $h;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2531 }
2249 2532
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2534}
2255 2535
2256sub update { 2536sub update {
2257 my ($self) = @_; 2537 my ($self) = @_;
2258 2538
… …
2261 return unless $self->{h} > 0; 2541 return unless $self->{h} > 0;
2262 2542
2263 delete $self->{texture}; 2543 delete $self->{texture};
2264 2544
2265 $ROOT->on_post_alloc ($self, sub { 2545 $ROOT->on_post_alloc ($self, sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547
2266 if (delete $self->{need_reflow}) { 2548 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2549 my $height = 0;
2268 2550
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2270 for @{$self->{par}}; 2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2271 2566
2272 $self->{height} = $height; 2567 $self->{height} = $height;
2273 2568
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2570
2276 delete $self->{texture}; 2571 delete $self->{texture};
2277 } 2572 }
2278 2573
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2575 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2576 glClear GL_COLOR_BUFFER_BIT;
2282 2577
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]; 2578 my $top = int $self->{children}[1]{range}[0];
2287 2579
2288 my $y0 = $top; 2580 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2581 my $y1 = $top + $H;
2290 2582
2291 my $y = 0; 2583 my $y = 0;
2292 2584
2293 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2294 2586
2295 $layout->set_font ($self->{font}) if $self->{font}; 2587 $layout->set_font ($self->{font}) if $self->{font};
2296 2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2297 for my $par (@{$self->{par}}) { 2593 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2594 my $h = $par->[1];
2299 2595
2300 if ($y0 < $y + $h && $y < $y1) { 2596 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2599 $layout->set_markup ($par->[4]);
2303 2600
2304 my ($W, $H) = $layout->size; 2601 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2602
2603 glRasterPos $par->[3], $y - $y0;
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2605 }
2307 2606
2308 $y += $h; 2607 $y += $h;
2309 } 2608 }
2310 2609
2311 glDisable GL_TEXTURE_2D; 2610 glDisable GL_BLEND;
2312 }; 2611 };
2313 }); 2612 });
2314} 2613}
2315 2614
2316sub _draw { 2615sub _draw {
2317 my ($self) = @_; 2616 my ($self) = @_;
2318 2617
2319 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2620 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2622 glDisable GL_TEXTURE_2D;
2324 2623
2325 $self->{children}[1]->draw; 2624 $self->{children}[1]->draw;
2326 2625
2327} 2626}
… …
2376 2675
2377sub new { 2676sub new {
2378 my $class = shift; 2677 my $class = shift;
2379 2678
2380 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2381 state => 0, 2680 state => 0,
2382 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2383 @_ 2682 @_
2384 ); 2683 );
2385 2684
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2685 $self
2392} 2686}
2393 2687
2394sub toggle_flopper { 2688sub toggle_flopper {
2395 my ($self) = @_; 2689 my ($self) = @_;
2396 2690
2397 # TODO: use animation 2691 $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} 2692}
2409 2693
2410############################################################################# 2694#############################################################################
2411 2695
2412package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2425} 2709}
2426 2710
2427sub set_tooltip_from { 2711sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2712 my ($self, $widget) = @_;
2429 2713
2714 my $tooltip = $widget->{tooltip};
2715
2716 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}";
2721 }
2722
2430 $self->add (new CFClient::UI::Label 2723 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2724 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2726 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2727 fg => [0, 0, 0, 1],
2728 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2729 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2730 );
2437} 2731}
2438 2732
2439sub size_request { 2733sub size_request {
2440 my ($self) = @_; 2734 my ($self) = @_;
… …
2446 2740
2447sub size_allocate { 2741sub size_allocate {
2448 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2449 2743
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2744 $self->SUPER::size_allocate ($w - 4, $h - 4);
2745}
2746
2747sub visibility_change {
2748 my ($self, $visible) = @_;
2749
2750 return unless $visible;
2751
2752 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner}
2754 or return;
2755
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH;
2760
2761 $self->move_abs ($x, $y);
2762 });
2451} 2763}
2452 2764
2453sub _draw { 2765sub _draw {
2454 my ($self) = @_; 2766 my ($self) = @_;
2455 2767
… …
2472 glVertex $w, $h; 2784 glVertex $w, $h;
2473 glVertex $w, 0; 2785 glVertex $w, 0;
2474 glEnd; 2786 glEnd;
2475 2787
2476 glTranslate 2 - 0.375, 2 - 0.375; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2789
2477 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2478} 2791}
2479 2792
2480############################################################################# 2793#############################################################################
2481 2794
… …
2486use CFClient::OpenGL; 2799use CFClient::OpenGL;
2487 2800
2488sub new { 2801sub new {
2489 my $class = shift; 2802 my $class = shift;
2490 2803
2491 $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2492 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2493 @_, 2807 @_,
2494 ) 2808 );
2809
2810 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self);
2812
2813 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1,
2816 interval => $self->{animspeed},
2817 cb => sub {
2818 ++$widget->{frame};
2819 $widget->update;
2820 },
2821 );
2822 }
2823
2824 $self
2495} 2825}
2496 2826
2497sub size_request { 2827sub size_request {
2498 (32, 8) 2828 (32, 8)
2499} 2829}
2500 2830
2831sub update {
2832 my ($self) = @_;
2833
2834 return unless $self->{visible};
2835
2836 $self->SUPER::update;
2837}
2838
2501sub _draw { 2839sub _draw {
2502 my ($self) = @_; 2840 my ($self) = @_;
2503 2841
2504 return unless $::CONN;#d# manage and cache textures differently 2842 return unless $::CONN;
2843
2844 my $face;
2845
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}];
2848
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2854
2507 # TODO animation
2508 if ($tex) { 2855 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2856 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2858 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2860 glDisable GL_TEXTURE_2D;
2514 } 2861 }
2515} 2862}
2516 2863
2864sub DESTROY {
2865 my ($self) = @_;
2866
2867 $self->{timer}->cancel
2868 if $self->{timer};
2869
2870 $self->SUPER::DESTROY;
2871}
2872
2517############################################################################# 2873#############################################################################
2518 2874
2519package CFClient::UI::InventoryItem; 2875package CFClient::UI::Buttonbar;
2520 2876
2521our @ISA = CFClient::UI::HBox::; 2877our @ISA = CFClient::UI::HBox::;
2522 2878
2523sub _item_to_desc { 2879# TODO: should actualyl wrap buttons and other goodies.
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666 2880
2667############################################################################# 2881#############################################################################
2668 2882
2669package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2670 2884
… …
2704 2918
2705# popup given the event (must be a mouse button down event currently) 2919# popup given the event (must be a mouse button down event currently)
2706sub popup { 2920sub popup {
2707 my ($self, $ev) = @_; 2921 my ($self, $ev) = @_;
2708 2922
2709 $self->emit ("popdown"); 2923 $self->_emit ("popdown");
2710 2924
2711 # maybe save $GRAB? must be careful about events... 2925 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2926 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2927 $self->{button} = $ev->{button};
2714 2928
2715 $self->show; 2929 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2931}
2718 2932
2719sub mouse_motion { 2933sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2721 2935
2722 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2725} 2941}
2726 2942
2727sub button_up { 2943sub button_up {
2728 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2729 2945
2730 if ($ev->{button} == $self->{button}) { 2946 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2947 undef $GRAB;
2732 $self->hide; 2948 $self->hide;
2733 2949
2734 $self->emit ("popdown"); 2950 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2956 1
2957}
2958
2959#############################################################################
2960
2961package CFClient::UI::Multiplexer;
2962
2963our @ISA = CFClient::UI::Container::;
2964
2965sub new {
2966 my $class = shift;
2967
2968 my $self = $class->SUPER::new (
2969 @_,
2970 );
2971
2972 $self->{current} = $self->{children}[0]
2973 if @{ $self->{children} };
2974
2975 $self
2976}
2977
2978sub add {
2979 my ($self, @widgets) = @_;
2980
2981 $self->SUPER::add (@widgets);
2982
2983 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} };
2985}
2986
2987sub set_current_page {
2988 my ($self, $page_or_widget) = @_;
2989
2990 my $widget = ref $page_or_widget
2991 ? $page_or_widget
2992 : $self->{children}[$page_or_widget];
2993
2994 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996
2997 $self->_emit (page_changed => $self->{current});
2998
2999 $self->realloc;
3000}
3001
3002sub visible_children {
3003 $_[0]{current}
3004}
3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 $self->{current}->size_request
3010}
3011
3012sub size_allocate {
3013 my ($self, $w, $h) = @_;
3014
3015 $self->{current}->configure (0, 0, $w, $h);
3016}
3017
3018sub _draw {
3019 my ($self) = @_;
3020
3021 $self->{current}->draw;
3022}
3023
3024#############################################################################
3025
3026package CFClient::UI::Notebook;
3027
3028our @ISA = CFClient::UI::VBox::;
3029
3030sub new {
3031 my $class = shift;
3032
3033 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3037 @_,
3038 );
2736 } 3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042
3043 $self
3044}
3045
3046sub add {
3047 my ($self, $title, $widget, $tooltip) = @_;
3048
3049 Scalar::Util::weaken $self;
3050
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget);
3058}
3059
3060sub set_current_page {
3061 my ($self, $page) = @_;
3062
3063 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current});
2737} 3065}
2738 3066
2739############################################################################# 3067#############################################################################
2740 3068
2741package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
… …
2774 # TODO: doesn't handle markup well (read as: at all) 3102 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 3103 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 3104 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 3105 : $item->{text};
2778 3106
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 3107 for ($short) {
2782 s/^\s+//; 3108 s/^\s+//;
2783 s/\s+/ /g; 3109 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 3110 }
2787 3111
2788 new CFClient::UI::Label 3112 new CFClient::UI::Label
2789 markup => $short, 3113 markup => $short,
2790 tooltip => $item->{tooltip}, 3114 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 3115 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 3116 tooltip_width => 0.67,
2793 fontsize => $fontsize, 3117 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3119 fg => $item->{fg},
2795 can_events => 1, 3120 can_events => 1,
2796 can_hover => 1 3121 can_hover => 1
2797 }; 3122 };
2798 } 3123 }
… …
2804sub add { 3129sub add {
2805 my ($self, $text, %arg) = @_; 3130 my ($self, $text, %arg) = @_;
2806 3131
2807 $text =~ s/^\s+//; 3132 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3133 $text =~ s/\s+$//;
3134
3135 return unless $text;
2809 3136
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3137 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 3138
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3140
… …
2835 } 3162 }
2836 3163
2837 $self->reorder; 3164 $self->reorder;
2838} 3165}
2839 3166
3167sub reconfigure {
3168 my ($self) = @_;
3169
3170 delete $_->{label}
3171 for values %{ $self->{item} || {} };
3172
3173 $self->reorder;
3174 $self->SUPER::reconfigure;
3175}
3176
2840############################################################################# 3177#############################################################################
2841 3178
2842package CFClient::UI::Root; 3179package CFClient::UI::Inventory;
2843 3180
2844our @ISA = CFClient::UI::Container::; 3181our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 3182
2848sub new { 3183sub new {
2849 my $class = shift; 3184 my $class = shift;
2850 3185
2851 $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
2852 @_, 3428 @_,
2853 ) 3429 )
2854} 3430}
2855 3431
2856sub configure { 3432# XXX: Do sorting? Argl...
2857 my ($self, $x, $y, $w, $h) = @_; 3433sub add_spell {
2858
2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2862
2863sub check_size {
2864 my ($self) = @_; 3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
2865 3436
2866 $self->size_allocate ($self->{w}, $self->{h}) 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2867 if $self->{w}; 3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root;
3475
3476our @ISA = CFClient::UI::Container::;
3477
3478use CFClient::OpenGL;
3479
3480sub new {
3481 my $class = shift;
3482
3483 my $self = $class->SUPER::new (
3484 visible => 1,
3485 @_,
3486 );
3487
3488 Scalar::Util::weaken ($self->{root} = $self);
3489
3490 $self
2868} 3491}
2869 3492
2870sub size_request { 3493sub size_request {
2871 my ($self) = @_; 3494 my ($self) = @_;
2872 3495
2873 ($self->{w}, $self->{h}) 3496 ($self->{w}, $self->{h})
3497}
3498
3499sub _to_pixel {
3500 my ($coord, $size, $max) = @_;
3501
3502 $coord =
3503 $coord eq "center" ? ($max - $size) * 0.5
3504 : $coord eq "max" ? $max
3505 : $coord;
3506
3507 $coord = 0 if $coord < 0;
3508 $coord = $max - $size if $coord > $max - $size;
3509
3510 int $coord + 0.5
2874} 3511}
2875 3512
2876sub size_allocate { 3513sub size_allocate {
2877 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
2878 3515
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 3516 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3518
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3519 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3520 $Y = $child->{force_y} if exists $child->{force_y};
2890 3521
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3522 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3523 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3524
2897 $child->configure ($X, $Y, $W, $H); 3525 $child->configure ($X, $Y, $W, $H);
2898 } 3526 }
2899} 3527}
2900 3528
… …
2911} 3539}
2912 3540
2913sub update { 3541sub update {
2914 my ($self) = @_; 3542 my ($self) = @_;
2915 3543
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3544 $::WANT_REFRESH++;
2918} 3545}
2919 3546
2920sub add { 3547sub add {
2921 my ($self, @children) = @_; 3548 my ($self, @children) = @_;
2922 3549
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3550 $_->{is_toplevel} = 1
2925 3551 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3552
2931 $self->SUPER::add (@children); 3553 $self->SUPER::add (@children);
3554}
3555
3556sub remove {
3557 my ($self, @children) = @_;
3558
3559 $self->SUPER::remove (@children);
3560
3561 delete $self->{is_toplevel}
3562 for @children;
3563
3564 while (@children) {
3565 my $w = pop @children;
3566 push @children, $w->children;
3567 $w->set_invisible;
3568 }
2932} 3569}
2933 3570
2934sub on_refresh { 3571sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3572 my ($self, $id, $cb) = @_;
2936 3573
… …
2949 while ($self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
2950 $_->() 3587 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3588 for values %{delete $self->{refresh_hook}};
2952 } 3589 }
2953 3590
2954 if ($self->{check_size}) { 3591 if ($self->{realloc}) {
2955 my @queue = ([], []); 3592 my %queue;
3593 my @queue;
3594 my $widget;
2956 3595
2957 for (;;) { 3596 outer:
2958 if ($self->{check_size}) { 3597 while () {
2959 # heuristic: check containers last 3598 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3599 for $widget (values %$realloc) {
2961 for values %{delete $self->{check_size}} 3600 $widget->{visible} or next; # do not resize invisible widgets
3601
3602 $queue{$widget+0}++ and next; # duplicates are common
3603
3604 push @{ $queue[$widget->{visible}] }, $widget;
3605 }
2962 } 3606 }
2963 3607
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3608 while () {
3609 @queue or last outer;
2965 3610
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3611 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3612 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 3613
3614 pop @queue;
3615 }
3616
3617 delete $queue{$widget+0};
3618
3619 my ($w, $h) = $widget->size_request;
3620
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3623
3624 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h};
3626
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3628 || delete $widget->{force_realloc}) {
2974 $widget->{req_w} = $w; 3629 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3630 $widget->{req_h} = $h;
2976 3631
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3632 $self->{size_alloc}{$widget+0} = $widget;
2978 3633
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3634 if (my $parent = $widget->{parent}) {
3635 $self->{realloc}{$parent+0} = $parent
3636 unless $queue{$parent+0};
3637
3638 $parent->{force_size_alloc} = 1;
3639 $self->{size_alloc}{$parent+0} = $parent;
3640 }
2981 } 3641 }
3642
3643 delete $self->{realloc}{$widget+0};
2982 } 3644 }
2983 } 3645 }
2984 3646
2985 while ($self->{size_alloc}) { 3647 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3648 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3649 values %$size_alloc;
3650
3651 while () {
3652 my $widget = pop @queue || last;
3653
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3655
2989 $w = 0 if $w < 0; 3656 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3657 $h = 0 if $h < 0;
2991 3658
3659 $w = int $w + 0.5;
3660 $h = int $h + 0.5;
3661
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h};
3665
2992 $widget->{w} = $w; 3666 $widget->{w} = $w;
2993 $widget->{h} = $h; 3667 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3668
2995 $widget->emit (size_allocate => $w, $h); 3669 $widget->emit (size_allocate => $w, $h);
3670 }
2996 } 3671 }
2997 } 3672 }
2998 3673
2999 while ($self->{post_alloc_hook}) { 3674 while ($self->{post_alloc_hook}) {
3000 $_->() 3675 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3676 for values %{delete $self->{post_alloc_hook}};
3002 } 3677 }
3003 3678
3679
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
3007 3683
3008 glMatrixMode GL_PROJECTION; 3684 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3685 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3688 glLoadIdentity;
3013 3689
3690 {
3691 package CFClient::UI::Base;
3692
3693 ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h});
3695 }
3696
3014 $self->_draw; 3697 $self->_draw;
3015} 3698}
3016 3699
3017############################################################################# 3700#############################################################################
3018 3701
3019package CFClient::UI; 3702package CFClient::UI;
3020 3703
3021$ROOT = new CFClient::UI::Root; 3704$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3705$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3706
30241 37071
3025 3708

Diff Legend

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