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.213 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21: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 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 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 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 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};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
281} 381}
282 382
283sub set_max_size { 383sub set_max_size {
284 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
285 385
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 388}
289 389
290sub set_tooltip { 390sub set_tooltip {
291 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
292 397
293 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
294 399
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 423 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
320 425
321 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
322 427
323 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
324 429
325 $focus->update if $focus; 430 $focus->update if $focus;
326 $FOCUS->update; 431 $FOCUS->update;
327} 432}
328 433
… …
331 436
332 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
333 438
334 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
335 440
336 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
337 442
338 $focus->update if $focus; #? 443 $focus->update if $focus; #?
339}
340 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
341sub mouse_motion { } 449sub mouse_motion { 0 }
342sub button_up { } 450sub button_up { 0 }
343sub key_down { } 451sub key_down { 0 }
344sub key_up { } 452sub key_up { 0 }
345 453
346sub button_down { 454sub button_down {
347 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
348 456
349 $self->focus_in; 457 $self->focus_in;
350}
351 458
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
356sub 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
357 535
358sub draw { 536sub draw {
359 my ($self) = @_; 537 my ($self) = @_;
360 538
361 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);
362 550
363 glPushMatrix; 551 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 553 $self->_draw;
366 glPopMatrix; 554 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
379 glEnd; 567 glEnd;
380 glDisable GL_BLEND; 568 glDisable GL_BLEND;
381 } 569 }
382 570
383 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 572 glPushMatrix;
385 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 576 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
392 glEnd; 580 glEnd;
393 glPopMatrix; 581 glPopMatrix;
394 #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;
395 } 583 }
396} 584}
397 585
398sub _draw { 586sub _draw {
399 my ($self) = @_; 587 my ($self) = @_;
400 588
401 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 590}
451 591
452sub DESTROY { 592sub DESTROY {
453 my ($self) = @_; 593 my ($self) = @_;
454 594
… …
512 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
514} 654}
515 655
516sub size_request { 656sub size_request {
517 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
518} 660}
519 661
520sub draw { } 662sub draw { }
521 663
522############################################################################# 664#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
527 669
528sub new { 670sub new {
529 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
530 672
531 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
532 674
533 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
534 children => [], 676 children => [],
535 can_events => 0, 677 can_events => 0,
536 %arg, 678 %arg,
537 ); 679 );
680
538 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
539 683
540 $self 684 $self
541} 685}
542 686
543sub add { 687sub add {
… …
551 $self->{children} = [ 695 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
554 ]; 698 ];
555 699
556 $self->check_size (1); 700 $self->realloc;
557 $self->update;
558} 701}
559 702
560sub children { 703sub children {
561 @{ $_[0]{children} } 704 @{ $_[0]{children} }
562} 705}
… …
567 delete $child->{parent}; 710 delete $child->{parent};
568 $child->hide; 711 $child->hide;
569 712
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 714
572 $self->check_size; 715 $self->realloc;
573 $self->update;
574} 716}
575 717
576sub clear { 718sub clear {
577 my ($self) = @_; 719 my ($self) = @_;
578 720
… …
582 for (@$children) { 724 for (@$children) {
583 delete $_->{parent}; 725 delete $_->{parent};
584 $_->hide; 726 $_->hide;
585 } 727 }
586 728
587 $self->check_size; 729 $self->realloc;
588 $self->update;
589} 730}
590 731
591sub find_widget { 732sub find_widget {
592 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
593 734
594 $x -= $self->{x}; 735 $x -= $self->{x};
595 $y -= $self->{y}; 736 $y -= $self->{y};
596 737
597 my $res; 738 my $res;
598 739
599 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
601 and return $res; 742 and return $res;
602 } 743 }
603 744
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
653 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
654} 795}
655 796
656############################################################################# 797#############################################################################
657 798
799# back-buffered drawing area
800
658package CFClient::UI::Window; 801package CFClient::UI::Window;
659 802
660our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
661 804
662use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
680 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 824 $self->update;
682} 825}
683 826
684sub _render { 827sub _render {
828 my ($self) = @_;
829
685 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
686} 831}
687 832
688sub render_child { 833sub render_child {
689 my ($self) = @_; 834 my ($self) = @_;
690 835
691 $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 {
692 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 847 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 848 };
704} 849}
705 850
706sub _draw { 851sub _draw {
707 my ($self) = @_; 852 my ($self) = @_;
708 853
709 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
710 855
711 my $tex = $self->{texture} 856 my $tex = $self->{texture}
712 or return; 857 or return;
713 858
714 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
717 862
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 864
720 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
721} 866}
… …
724 869
725package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
726 871
727our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
728 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
729sub size_request { 884sub size_request {
730 my ($self) = @_; 885 my ($self) = @_;
731 886
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 888
735 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
736} 893}
737 894
738sub size_allocate { 895sub size_allocate {
739 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
740 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);
741 $self->update; 904 $self->update;
742} 905}
743 906
744sub set_offset { 907sub set_offset {
745 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
779} 942}
780 943
781sub _render { 944sub _render {
782 my ($self) = @_; 945 my ($self) = @_;
783 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
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 951
786 $self->SUPER::_render; 952 $self->SUPER::_render;
787} 953}
788 954
… …
791package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
792 958
793our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
794 960
795sub new { 961sub new {
796 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
797 965
798 my $self; 966 my $self;
799 967
800 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
801 vertical => 1, 969 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 971 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
805 }, 973 },
806 ; 974 ;
807 975
808 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 977 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 978 slider => $slider,
811 @_, 979 %arg,
812 ); 980 );
813 981
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
817 984
818 $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]);
819} 1011}
820 1012
821#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 1014# update viewport offset on scroll
823 1015
… …
867 1059
868our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
869 1061
870use CFClient::OpenGL; 1062use CFClient::OpenGL;
871 1063
872my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 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);
875 1071
876sub new { 1072sub new {
877 my $class = shift; 1073 my ($class, %arg) = @_;
878 1074
879 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
880 1076
881 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1080 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1081 can_events => 1,
887 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
888 ); 1085 );
889 1086
890 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
891 align => 0, 1088 align => 0,
892 valign => 1, 1089 valign => 1,
893 text => $self->{title}, 1090 text => $title,
894 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
895 1093
896 $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};
897} 1102}
898 1103
899sub border { 1104sub border {
900 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
901} 1106}
902 1107
903sub size_request { 1108sub size_request {
904 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
905 1113
906 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
907 1115
908 ( 1116 (
909 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
912} 1120}
913 1121
914sub size_allocate { 1122sub size_allocate {
915 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
916 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
917 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
919 1135
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
921 if $self->{title};
922
923 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
924} 1137}
925 1138
926sub button_down { 1139sub button_down {
927 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
928 1141
… …
944 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
945 1158
946 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
948 1161
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size; 1166 $self->realloc;
953 }; 1167 };
954 1168
955 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1173 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
961 1175
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
963 1177
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
966 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
967 } 1186 1
968} 1187}
969 1188
970sub button_up { 1189sub button_up {
971 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
972 1191
973 delete $self->{motion}; 1192 !!delete $self->{motion}
974} 1193}
975 1194
976sub mouse_motion { 1195sub mouse_motion {
977 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
978 1197
979 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
980} 1201}
981 1202
982sub _draw { 1203sub _draw {
983 my ($self) = @_; 1204 my ($self) = @_;
984 1205
1206 my $child = $self->{children}[0];
1207
985 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
987 1210
988 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1213
991 my $border = $self->border; 1214 my $border = $self->border;
992 1215
993 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1221
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1001 1224
1002 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1230 }
1013 1231
1014 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1015 1233
1016 $self->{title}->draw if $self->{title};
1017
1018 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1019} 1240}
1020 1241
1021############################################################################# 1242#############################################################################
1022 1243
1023package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1031sub new { 1252sub new {
1032 my $class = shift; 1253 my $class = shift;
1033 1254
1034 $class->SUPER::new ( 1255 $class->SUPER::new (
1035 col_expand => [], 1256 col_expand => [],
1036 @_ 1257 @_,
1037 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1263}
1039 1264
1040sub add { 1265sub add {
1041 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1042 1267
1043 $child->set_parent ($self); 1268 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1045 1270
1046 $child->check_size; 1271 $self->realloc;
1047} 1272}
1048 1273
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1054sub clear { 1275sub clear {
1055 my ($self) = @_; 1276 my ($self) = @_;
1056 1277
1057 my @children = $self->children; 1278 my @children = $self->children;
1058 delete $self->{children}; 1279 delete $self->{children};
… …
1060 for (@children) { 1281 for (@children) {
1061 delete $_->{parent}; 1282 delete $_->{parent};
1062 $_->hide; 1283 $_->hide;
1063 } 1284 }
1064 1285
1065 $self->update; 1286 $self->realloc;
1066} 1287}
1067 1288
1068sub get_wh { 1289sub get_wh {
1069 my ($self) = @_; 1290 my ($self) = @_;
1070 1291
… …
1101sub size_allocate { 1322sub size_allocate {
1102 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1103 1324
1104 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1105 1326
1106 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1108 1329
1109 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1387 }
1167} 1388}
1168 1389
1169############################################################################# 1390#############################################################################
1170 1391
1171package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1393
1175our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1176 1395
1177sub size_request { 1396sub size_request {
1178 my ($self) = @_; 1397 my ($self) = @_;
1179 1398
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1181 1400 ? (
1182 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1403 )
1185 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1186} 1408}
1187 1409
1188sub size_allocate { 1410sub size_allocate {
1189 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1190 1412
1191 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1414 my $children = $self->{children};
1194 1415
1195 my @h = map $_->{req_w}, @$children; 1416 my @req;
1196 1417
1197 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1198 1419 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } else { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1433 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1434 }
1213 } 1435 }
1214 1436
1215 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1216 1438
1217 my $y = 0; 1439 my $pos = 0;
1218 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1443
1223 $y += $h; 1444 $pos += $alloc;
1224 } 1445 }
1225 1446
1226 1 1447 1
1227} 1448}
1228 1449
1229############################################################################# 1450#############################################################################
1230 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1231package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1232 1468
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1236 1470
1237sub size_request { 1471sub new {
1238 my ($self) = @_; 1472 my $class = shift;
1239 1473
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1241 1475 vertical => 1,
1242 ( 1476 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1477 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1478}
1286 1479
1287############################################################################# 1480#############################################################################
1288 1481
1289package CFClient::UI::Label; 1482package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1499 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1308 fontsize => 1, 1501 fontsize => 1,
1309 align => -1, 1502 align => -1,
1310 valign => -1, 1503 valign => -1,
1311 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1312 can_events => 0, 1506 can_events => 0,
1313 %arg 1507 %arg
1314 ); 1508 );
1315 1509
1316 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1353 1547
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1356 1550
1551 $self->realloc;
1357 $self->update; 1552 $self->update;
1358 $self->check_size;
1359} 1553}
1360 1554
1361sub set_markup { 1555sub set_markup {
1362 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1363 1557
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1562
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1371 1565
1566 $self->realloc;
1372 $self->update; 1567 $self->update;
1373 $self->check_size;
1374} 1568}
1375 1569
1376sub size_request { 1570sub size_request {
1377 my ($self) = @_; 1571 my ($self) = @_;
1378 1572
… …
1392 1586
1393 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1395 } 1589 }
1396 1590
1397 ( 1591 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1592}
1402 1593
1403sub size_allocate { 1594sub size_allocate {
1404 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1405 1596
1597 delete $self->{ox};
1598
1406 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1601}
1408 1602
1409sub set_fontsize { 1603sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1411 1605
1412 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1607 delete $self->{texture};
1414 1608
1415 $self->update; 1609 $self->realloc;
1416 $self->check_size;
1417} 1610}
1418 1611
1419sub _draw { 1612sub _draw {
1420 my ($self) = @_; 1613 my ($self) = @_;
1421 1614
… …
1427 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1624
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1433 1627
1628 unless (exists $self->{ox}) {
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1437 1632
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1443 }; 1636 };
1444 1637
1445 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447 1640
… …
1473 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1474 can_hover => 1, 1667 can_hover => 1,
1475 can_focus => 1, 1668 can_focus => 1,
1476 valign => 0, 1669 valign => 0,
1477 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1478 @_ 1672 @_
1479 ) 1673 )
1480} 1674}
1481 1675
1482sub _set_text { 1676sub _set_text {
… …
1484 1678
1485 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1486 1680
1487 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1488 1682
1489 delete $self->{texture};
1490
1491 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1492 $self->{text} = $text; 1684 $self->{text} = $text;
1493 1685
1494 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1496 1688
1497 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1498} 1691}
1499 1692
1500sub set_text { 1693sub set_text {
1501 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1502 1695
1503 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1697 $self->_set_text ($text);
1505 $self->update; 1698
1506 $self->check_size; 1699 $self->realloc;
1507} 1700}
1508 1701
1509sub get_text { 1702sub get_text {
1510 $_[0]{text} 1703 $_[0]{text}
1511} 1704}
… …
1514 my ($self) = @_; 1707 my ($self) = @_;
1515 1708
1516 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1517 1710
1518 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1712}
1526 1713
1527sub key_down { 1714sub key_down {
1528 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1529 1716
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1736 $self->_emit ('escape');
1550 } elsif ($uni) { 1737 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1552 } 1741 }
1553 1742
1554 $self->_set_text ($text); 1743 $self->_set_text ($text);
1555 $self->update; 1744
1556 $self->check_size; 1745 $self->realloc;
1746
1747 1
1557} 1748}
1558 1749
1559sub focus_in { 1750sub focus_in {
1560 my ($self) = @_; 1751 my ($self) = @_;
1561 1752
… …
1576 utf8::encode $text; 1767 utf8::encode $text;
1577 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1578 1769
1579 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1580 $self->update; 1771 $self->update;
1772
1773 1
1581} 1774}
1582 1775
1583sub mouse_motion { 1776sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1585# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1586} 1781}
1587 1782
1588sub _draw { 1783sub _draw {
1589 my ($self) = @_; 1784 my ($self) = @_;
1590 1785
… …
1641 if ($sym == 13) { 1836 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1647 $self->update; 1842 $self->update;
1648 1843
1649 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1667 } else { 1862 } else {
1668 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1669 } 1864 }
1670 1865
1671 } else { 1866 } else {
1672 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1673 } 1870 1
1674
1675} 1871}
1676 1872
1677############################################################################# 1873#############################################################################
1678 1874
1679package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1688 1884
1689sub new { 1885sub new {
1690 my $class = shift; 1886 my $class = shift;
1691 1887
1692 $class->SUPER::new ( 1888 $class->SUPER::new (
1693 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1694 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1696 can_hover => 1, 1893 can_hover => 1,
1697 align => 0, 1894 align => 0,
1698 valign => 0, 1895 valign => 0,
1699 can_events => 1, 1896 can_events => 1,
1700 @_ 1897 @_
1701 ) 1898 )
1702} 1899}
1703 1900
1901sub activate { }
1902
1704sub button_up { 1903sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1706 1905
1906 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate"); 1909
1710 } 1910 1
1711} 1911}
1712 1912
1713sub _draw { 1913sub _draw {
1714 my ($self) = @_; 1914 my ($self) = @_;
1715 1915
… …
1744 1944
1745sub new { 1945sub new {
1746 my $class = shift; 1946 my $class = shift;
1747 1947
1748 $class->SUPER::new ( 1948 $class->SUPER::new (
1749 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1750 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1955 state => 0,
… …
1758} 1959}
1759 1960
1760sub size_request { 1961sub size_request {
1761 my ($self) = @_; 1962 my ($self) = @_;
1762 1963
1763 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1764} 1965}
1765 1966
1766sub button_down { 1967sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1768 1969
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1773 } 1978 1
1774} 1979}
1775 1980
1776sub _draw { 1981sub _draw {
1777 my ($self) = @_; 1982 my ($self) = @_;
1778 1983
1779 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1780 1985
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1987
1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1784 1991
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1993
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1995
… …
2052 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2060 vertical => 0, 2267 vertical => 0,
2061 can_hover => 1, 2268 can_hover => 1,
2062 inner_pad => .05, 2269 inner_pad => 0.02,
2063 @_ 2270 @_
2064 ); 2271 );
2065 2272
2066 $self->set_value ($self->{range}[0]); 2273 $self->set_value ($self->{range}[0]);
2067 $self->update; 2274 $self->update;
2068 2275
2069 $self 2276 $self
2070} 2277}
2071 2278
2279sub changed { }
2280
2281sub set_range {
2282 my ($self, $range) = @_;
2283
2284 ($range, $self->{range}) = ($self->{range}, $range);
2285
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2288}
2289
2072sub set_value { 2290sub set_value {
2073 my ($self, $value) = @_; 2291 my ($self, $value) = @_;
2074 2292
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2293 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2294
2077 $hi = $lo + 1 if $hi <= $lo; 2295 $hi = $lo + 1 if $hi <= $lo;
2078 2296
2297 $page = $hi - $lo if $page > $hi - $lo;
2298
2079 $value = $lo if $value < $lo; 2299 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2300 $value = $hi - $page if $value > $hi - $page;
2081 2301
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2302 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2303 if $unit;
2084 2304
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2306
2089 if ($value != $old_value) { 2307 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2308 $self->_emit (changed => $value);
2091 $self->update; 2309 $self->update;
2092 } 2310 }
2093} 2311}
2094 2312
2095sub size_request { 2313sub size_request {
2096 my ($self) = @_; 2314 my ($self) = @_;
2097 2315
2098 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2317}
2103 2318
2104sub button_down { 2319sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2106 2321
2107 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2323
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325
2108 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2109} 2327}
2110 2328
2111sub mouse_motion { 2329sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2113 2331
2114 if ($GRAB == $self) { 2332 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2334
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2336
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2338
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2122 } 2344 1
2123} 2345}
2124 2346
2125sub update { 2347sub update {
2126 my ($self) = @_; 2348 my ($self) = @_;
2127 2349
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2129 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2130 2359
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
2132 2362
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2364
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2365 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2367
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2368 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2369 $value = $value * $self->{scale} + $self->{offset};
2139 2370
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2372 $self->{knob_w} = $knob_w;
2147 }); 2373 }
2148
2149 $self->SUPER::update;
2150}
2151
2152sub _draw {
2153 my ($self) = @_;
2154 2374
2155 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2156 2376
2157 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2158 2378
2159 if ($self->{vertical}) { 2379 if ($self->{vertical}) {
2160 # draw a vertical slider like a rotated horizontal slider 2380 # draw a vertical slider like a rotated horizontal slider
2161 2381
2382 glTranslate 1, 0, 0;
2162 glRotate 90, 0, 0, 1; 2383 glRotate 90, 0, 0, 1;
2163 glTranslate 0, 1, 0;
2164 } 2384 }
2165 2385
2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2386 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2387 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168 2388
… …
2175 # draw handle 2395 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2396 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2397
2178 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
2179} 2399}
2400
2401#############################################################################
2402
2403package CFClient::UI::ValSlider;
2404
2405our @ISA = CFClient::UI::HBox::;
2406
2407sub new {
2408 my ($class, %arg) = @_;
2409
2410 my $range = delete $arg{range};
2411
2412 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift },
2416 from_value => sub { shift },
2417 %arg,
2418 );
2419
2420 $self->{slider}->connect (changed => sub {
2421 my ($self, $value) = @_;
2422 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2423 $self->{parent}->emit (changed => $value);
2424 });
2425
2426# $self->{entry}->connect (changed => sub {
2427# my ($self, $value) = @_;
2428# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2429# $self->{parent}->emit (changed => $value);
2430# });
2431
2432 $self->add ($self->{slider}, $self->{entry});
2433
2434 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2435
2436 $self
2437}
2438
2439sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) }
2180 2441
2181############################################################################# 2442#############################################################################
2182 2443
2183package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
2184 2445
… …
2214 2475
2215 $self->{fontsize} = $fontsize; 2476 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2477 $self->reflow;
2217} 2478}
2218 2479
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2480sub size_allocate {
2239 my ($self, $w, $h) = @_; 2481 my ($self, $w, $h) = @_;
2240 2482
2241 $self->SUPER::size_allocate ($w, $h); 2483 $self->SUPER::size_allocate ($w, $h);
2242 2484
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2488
2247 $self->reflow; 2489 $self->reflow;
2248} 2490}
2249 2491
2492sub text_size {
2493 my ($self, $text, $indent) = @_;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent);
2499 $layout->set_markup ($text);
2500
2501 $layout->size
2502}
2503
2504sub reflow {
2505 my ($self) = @_;
2506
2507 $self->{need_reflow}++;
2508 $self->update;
2509}
2510
2511sub set_offset {
2512 my ($self, $offset) = @_;
2513
2514 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset);
2516}
2517
2518sub clear {
2519 my ($self) = @_;
2520
2521 $self->{par} = [];
2522 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524}
2525
2250sub add_paragraph { 2526sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2527 my ($self, $color, $text, $indent) = @_;
2252 2528
2253 #TODO: intelligently "reformat" paragraph 2529 for my $line (split /\n/, $text) {
2254 2530 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2531 $self->{height} += $h;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2533 }
2258 2534
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2536}
2264 2537
2265sub update { 2538sub update {
2266 my ($self) = @_; 2539 my ($self) = @_;
2267 2540
… …
2270 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
2271 2544
2272 delete $self->{texture}; 2545 delete $self->{texture};
2273 2546
2274 $ROOT->on_post_alloc ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
2275 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2551 my $height = 0;
2277 2552
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2279 for @{$self->{par}}; 2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2280 2568
2281 $self->{height} = $height; 2569 $self->{height} = $height;
2282 2570
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2572
2285 delete $self->{texture}; 2573 delete $self->{texture};
2286 } 2574 }
2287 2575
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2577 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
2291 2579
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2580 my $top = int $self->{children}[1]{range}[0];
2296 2581
2297 my $y0 = $top; 2582 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2583 my $y1 = $top + $H;
2299 2584
2300 my $y = 0; 2585 my $y = 0;
2301 2586
2302 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2303 2588
2304 $layout->set_font ($self->{font}) if $self->{font}; 2589 $layout->set_font ($self->{font}) if $self->{font};
2305 2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2306 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2596 my $h = $par->[1];
2308 2597
2309 if ($y0 < $y + $h && $y < $y1) { 2598 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2601 $layout->set_markup ($par->[4]);
2312 2602
2313 my ($W, $H) = $layout->size; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2604
2605 glRasterPos $par->[3], $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2607 }
2316 2608
2317 $y += $h; 2609 $y += $h;
2318 } 2610 }
2319 2611
2320 glDisable GL_TEXTURE_2D; 2612 glDisable GL_BLEND;
2321 }; 2613 };
2322 }); 2614 });
2323} 2615}
2324 2616
2325sub _draw { 2617sub _draw {
2326 my ($self) = @_; 2618 my ($self) = @_;
2327 2619
2328 glEnable GL_TEXTURE_2D; 2620 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2622 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2624 glDisable GL_TEXTURE_2D;
2333 2625
2334 $self->{children}[1]->draw; 2626 $self->{children}[1]->draw;
2335 2627
2336} 2628}
… …
2385 2677
2386sub new { 2678sub new {
2387 my $class = shift; 2679 my $class = shift;
2388 2680
2389 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2390 state => 0, 2682 state => 0,
2391 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2392 @_ 2684 @_
2393 ); 2685 );
2394 2686
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2687 $self
2401} 2688}
2402 2689
2403sub toggle_flopper { 2690sub toggle_flopper {
2404 my ($self) = @_; 2691 my ($self) = @_;
2405 2692
2406 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2694}
2418 2695
2419############################################################################# 2696#############################################################################
2420 2697
2421package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2434} 2711}
2435 2712
2436sub set_tooltip_from { 2713sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2438 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2439 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2728 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2730 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2742
2457sub size_allocate { 2743sub size_allocate {
2458 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2459 2745
2460 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2461} 2765}
2462 2766
2463sub _draw { 2767sub _draw {
2464 my ($self) = @_; 2768 my ($self) = @_;
2465 2769
… …
2482 glVertex $w, $h; 2786 glVertex $w, $h;
2483 glVertex $w, 0; 2787 glVertex $w, 0;
2484 glEnd; 2788 glEnd;
2485 2789
2486 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2487 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2488} 2793}
2489 2794
2490############################################################################# 2795#############################################################################
2491 2796
… …
2496use CFClient::OpenGL; 2801use CFClient::OpenGL;
2497 2802
2498sub new { 2803sub new {
2499 my $class = shift; 2804 my $class = shift;
2500 2805
2501 $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2502 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2503 @_, 2809 @_,
2504 ) 2810 );
2811
2812 if ($self->{anim} && $self->{animspeed}) {
2813 Scalar::Util::weaken (my $widget = $self);
2814
2815 $self->{timer} = Event->timer (
2816 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2817 hard => 1,
2818 interval => $self->{animspeed},
2819 cb => sub {
2820 ++$widget->{frame};
2821 $widget->update;
2822 },
2823 );
2824 }
2825
2826 $self
2505} 2827}
2506 2828
2507sub size_request { 2829sub size_request {
2508 (32, 8) 2830 (32, 8)
2509} 2831}
2510 2832
2833sub update {
2834 my ($self) = @_;
2835
2836 return unless $self->{visible};
2837
2838 $self->SUPER::update;
2839}
2840
2511sub _draw { 2841sub _draw {
2512 my ($self) = @_; 2842 my ($self) = @_;
2513 2843
2514 return unless $::CONN;#d# manage and cache textures differently 2844 return unless $::CONN;
2845
2846 my $face;
2847
2848 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}];
2850
2851 $face = $anim->[ $self->{frame} % @$anim ]
2852 if $anim && @$anim;
2853 }
2854
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2856
2517 # TODO animation
2518 if ($tex) { 2857 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2858 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2860 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2862 glDisable GL_TEXTURE_2D;
2524 } 2863 }
2525} 2864}
2526 2865
2866sub DESTROY {
2867 my ($self) = @_;
2868
2869 $self->{timer}->cancel
2870 if $self->{timer};
2871
2872 $self->SUPER::DESTROY;
2873}
2874
2527############################################################################# 2875#############################################################################
2528 2876
2529package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2530 2878
2531our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2532 2880
2533sub _item_to_desc { 2881# TODO: should actualyl wrap buttons and other goodies.
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676 2882
2677############################################################################# 2883#############################################################################
2678 2884
2679package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2680 2886
… …
2714 2920
2715# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2716sub popup { 2922sub popup {
2717 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2718 2924
2719 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2720 2926
2721 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2928 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2724 2930
2725 $self->show; 2931 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727} 2933}
2728 2934
2729sub mouse_motion { 2935sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2731 2937
2732 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2735} 2943}
2736 2944
2737sub button_up { 2945sub button_up {
2738 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2739 2947
2740 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2949 undef $GRAB;
2742 $self->hide; 2950 $self->hide;
2743 2951
2744 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2746 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2747} 3067}
2748 3068
2749############################################################################# 3069#############################################################################
2750 3070
2751package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2811sub add { 3131sub add {
2812 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2813 3133
2814 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2816 3138
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 3140
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 3142
… …
2854 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
2855} 3177}
2856 3178
2857############################################################################# 3179#############################################################################
2858 3180
2859package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
2860 3182
2861our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 3184
2865sub new { 3185sub new {
2866 my $class = shift; 3186 my $class = shift;
2867 3187
2868 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
2869 @_, 3430 @_,
2870 ) 3431 )
2871} 3432}
2872 3433
2873sub configure { 3434# XXX: Do sorting? Argl...
2874 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
2875
2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2879
2880sub check_size {
2881 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
2882 3438
2883 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2884 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
2885} 3493}
2886 3494
2887sub size_request { 3495sub size_request {
2888 my ($self) = @_; 3496 my ($self) = @_;
2889 3497
2890 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
2891} 3513}
2892 3514
2893sub size_allocate { 3515sub size_allocate {
2894 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2895 3517
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3518 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3520
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
2907 3523
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3525 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3526
2914 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
2915 } 3528 }
2916} 3529}
2917 3530
… …
2928} 3541}
2929 3542
2930sub update { 3543sub update {
2931 my ($self) = @_; 3544 my ($self) = @_;
2932 3545
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
2935} 3547}
2936 3548
2937sub add { 3549sub add {
2938 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
2939 3551
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3552 $_->{is_toplevel} = 1
2942 3553 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3554
2948 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3565
3566 while (@children) {
3567 my $w = pop @children;
3568 push @children, $w->children;
3569 $w->set_invisible;
3570 }
2949} 3571}
2950 3572
2951sub on_refresh { 3573sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
2953 3575
… …
2966 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
2967 $_->() 3589 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
2969 } 3591 }
2970 3592
2971 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
2972 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
2973 3597
2974 for (;;) { 3598 outer:
2975 if ($self->{check_size}) { 3599 while () {
2976 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
2978 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
2979 } 3608 }
2980 3609
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
2982 3612
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3614 and last;
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
2991 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
2993 3633
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
2995 3635
2996 $widget->{parent}->check_size
2997 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
2998 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
2999 } 3646 }
3000 } 3647 }
3001 3648
3002 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3005 3657
3006 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3008 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3009 $widget->{w} = $w; 3668 $widget->{w} = $w;
3010 $widget->{h} = $h; 3669 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3670
3012 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3013 } 3673 }
3014 } 3674 }
3015 3675
3016 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3017 $_->() 3677 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3019 } 3679 }
3020 3680
3681
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3024 3685
3025 glMatrixMode GL_PROJECTION; 3686 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3687 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3690 glLoadIdentity;
3030 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3031 $self->_draw; 3699 $self->_draw;
3032} 3700}
3033 3701
3034############################################################################# 3702#############################################################################
3035 3703

Diff Legend

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