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.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 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
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 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 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
211 248
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
218 return if $self->{parent}; 249 return if $self->{parent};
219 250
220 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
221} 252}
222 253
223sub hide { 254sub set_visible {
224 my ($self) = @_; 255 my ($self) = @_;
225 256
226 for (my @w = $self; @w; ) { 257 return if $self->{visible};
227 my $w = pop @w; 258
228 push @w, $w->children; 259 $self->{root} = $self->{parent}{root};
229 $w->{visible} = 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
230 } 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};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
301} 381}
302 382
303sub set_max_size { 383sub set_max_size {
304 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
305 385
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 388}
309 389
310sub set_tooltip { 390sub set_tooltip {
311 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
312 397
313 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
314 399
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 423 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
340 425
341 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
342 427
343 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
344 429
345 $focus->update if $focus; 430 $focus->update if $focus;
346 $FOCUS->update; 431 $FOCUS->update;
347} 432}
348 433
… …
351 436
352 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
353 438
354 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
355 440
356 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
357 442
358 $focus->update if $focus; #? 443 $focus->update if $focus; #?
359}
360 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
361sub mouse_motion { } 449sub mouse_motion { 0 }
362sub button_up { } 450sub button_up { 0 }
363sub key_down { } 451sub key_down { 0 }
364sub key_up { } 452sub key_up { 0 }
365 453
366sub button_down { 454sub button_down {
367 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
368 456
369 $self->focus_in; 457 $self->focus_in;
370}
371 458
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
376sub 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
377 535
378sub draw { 536sub draw {
379 my ($self) = @_; 537 my ($self) = @_;
380 538
381 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);
382 550
383 glPushMatrix; 551 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 553 $self->_draw;
386 glPopMatrix; 554 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
399 glEnd; 567 glEnd;
400 glDisable GL_BLEND; 568 glDisable GL_BLEND;
401 } 569 }
402 570
403 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 572 glPushMatrix;
405 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 576 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
412 glEnd; 580 glEnd;
413 glPopMatrix; 581 glPopMatrix;
414 #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;
415 } 583 }
416} 584}
417 585
418sub _draw { 586sub _draw {
419 my ($self) = @_; 587 my ($self) = @_;
420 588
421 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 590}
473 591
474sub DESTROY { 592sub DESTROY {
475 my ($self) = @_; 593 my ($self) = @_;
476 594
… …
534 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
536} 654}
537 655
538sub size_request { 656sub size_request {
539 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
540} 660}
541 661
542sub draw { } 662sub draw { }
543 663
544############################################################################# 664#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
549 669
550sub new { 670sub new {
551 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
552 672
553 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
554 674
555 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
556 children => [], 676 children => [],
557 can_events => 0, 677 can_events => 0,
558 %arg, 678 %arg,
559 ); 679 );
680
560 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
561 683
562 $self 684 $self
563} 685}
564 686
565sub add { 687sub add {
… …
573 $self->{children} = [ 695 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
576 ]; 698 ];
577 699
578 $self->check_size (1); 700 $self->realloc;
579 $self->update;
580} 701}
581 702
582sub children { 703sub children {
583 @{ $_[0]{children} } 704 @{ $_[0]{children} }
584} 705}
… …
589 delete $child->{parent}; 710 delete $child->{parent};
590 $child->hide; 711 $child->hide;
591 712
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 714
594 $self->check_size; 715 $self->realloc;
595 $self->update;
596} 716}
597 717
598sub clear { 718sub clear {
599 my ($self) = @_; 719 my ($self) = @_;
600 720
… …
604 for (@$children) { 724 for (@$children) {
605 delete $_->{parent}; 725 delete $_->{parent};
606 $_->hide; 726 $_->hide;
607 } 727 }
608 728
609 $self->check_size; 729 $self->realloc;
610 $self->update;
611} 730}
612 731
613sub find_widget { 732sub find_widget {
614 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
615 734
616 $x -= $self->{x}; 735 $x -= $self->{x};
617 $y -= $self->{y}; 736 $y -= $self->{y};
618 737
619 my $res; 738 my $res;
620 739
621 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
623 and return $res; 742 and return $res;
624 } 743 }
625 744
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
702 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 822 $self->update;
704} 823}
705 824
706sub _render { 825sub _render {
826 my ($self) = @_;
827
707 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
708} 829}
709 830
710sub render_child { 831sub render_child {
711 my ($self) = @_; 832 my ($self) = @_;
712 833
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
716 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
717 $self->_render; 845 $self->_render;
718 }; 846 };
719} 847}
720 848
721sub _draw { 849sub _draw {
722 my ($self) = @_; 850 my ($self) = @_;
723 851
724 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
725 853
726 my $tex = $self->{texture} 854 my $tex = $self->{texture}
727 or return; 855 or return;
728 856
729 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
739 867
740package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
741 869
742our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
743 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
744sub size_request { 882sub size_request {
745 my ($self) = @_; 883 my ($self) = @_;
746 884
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 886
750 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
751} 891}
752 892
753sub size_allocate { 893sub size_allocate {
754 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
755 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
756 $self->update; 902 $self->update;
757} 903}
758 904
759sub set_offset { 905sub set_offset {
760 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
794} 940}
795 941
796sub _render { 942sub _render {
797 my ($self) = @_; 943 my ($self) = @_;
798 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 949
801 $self->SUPER::_render; 950 $self->SUPER::_render;
802} 951}
803 952
… …
811 my $class = shift; 960 my $class = shift;
812 961
813 my $self; 962 my $self;
814 963
815 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
816 vertical => 1, 965 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 967 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 968 $self->{vp}->set_offset (0, $_[1]);
820 }, 969 },
821 ; 970 ;
822 971
823 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 973 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
832 981
833 $self 982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 1002}
835 1003
836#TODO# update range on size_allocate depending on child 1004#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1005# update viewport offset on scroll
838 1006
… …
882 1050
883our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
884 1052
885use CFClient::OpenGL; 1053use CFClient::OpenGL;
886 1054
887my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1062
891sub new { 1063sub new {
892 my $class = shift; 1064 my ($class, %arg) = @_;
893 1065
894 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
895 1067
896 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1071 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1072 can_events => 1,
902 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
903 ); 1076 );
904 1077
905 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
906 align => 0, 1079 align => 0,
907 valign => 1, 1080 valign => 1,
908 text => $self->{title}, 1081 text => $title,
909 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
910 1084
911 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
912} 1093}
913 1094
914sub border { 1095sub border {
915 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
916} 1097}
917 1098
918sub size_request { 1099sub size_request {
919 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
920 1104
921 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
922 1106
923 ( 1107 (
924 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
927} 1111}
928 1112
929sub size_allocate { 1113sub size_allocate {
930 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
931 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
932 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
934 1126
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
939} 1128}
940 1129
941sub button_down { 1130sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
943 1132
… …
959 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
960 1149
961 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
963 1152
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1158 };
969 1159
970 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1164 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
976 1166
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
978 1168
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
982 } 1175 1
983} 1176}
984 1177
985sub button_up { 1178sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
987 1180
988 delete $self->{motion}; 1181 !!delete $self->{motion}
989} 1182}
990 1183
991sub mouse_motion { 1184sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
993 1186
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
995} 1190}
996 1191
997sub _draw { 1192sub _draw {
998 my ($self) = @_; 1193 my ($self) = @_;
999 1194
1195 my $child = $self->{children}[0];
1196
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1199
1003 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1202
1006 my $border = $self->border; 1203 my $border = $self->border;
1007 1204
1008 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1210
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1016 1213
1017 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1219 }
1028 1220
1029 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1030 1222
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1034} 1229}
1035 1230
1036############################################################################# 1231#############################################################################
1037 1232
1038package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1046sub new { 1241sub new {
1047 my $class = shift; 1242 my $class = shift;
1048 1243
1049 $class->SUPER::new ( 1244 $class->SUPER::new (
1050 col_expand => [], 1245 col_expand => [],
1051 @_ 1246 @_,
1052 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1252}
1054 1253
1055sub add { 1254sub add {
1056 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1057 1256
1058 $child->set_parent ($self); 1257 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1060 1259
1061 $child->check_size; 1260 $self->realloc;
1062} 1261}
1063 1262
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1264sub clear {
1070 my ($self) = @_; 1265 my ($self) = @_;
1071 1266
1072 my @children = $self->children; 1267 my @children = $self->children;
1073 delete $self->{children}; 1268 delete $self->{children};
… …
1075 for (@children) { 1270 for (@children) {
1076 delete $_->{parent}; 1271 delete $_->{parent};
1077 $_->hide; 1272 $_->hide;
1078 } 1273 }
1079 1274
1080 $self->update; 1275 $self->realloc;
1081} 1276}
1082 1277
1083sub get_wh { 1278sub get_wh {
1084 my ($self) = @_; 1279 my ($self) = @_;
1085 1280
… …
1116sub size_allocate { 1311sub size_allocate {
1117 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1118 1313
1119 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1120 1315
1121 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1123 1318
1124 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1376 }
1182} 1377}
1183 1378
1184############################################################################# 1379#############################################################################
1185 1380
1186package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1382
1190our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1191 1384
1192sub size_request { 1385sub size_request {
1193 my ($self) = @_; 1386 my ($self) = @_;
1194 1387
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1196 1389 ? (
1197 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1392 )
1200 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1201} 1397}
1202 1398
1203sub size_allocate { 1399sub size_allocate {
1204 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1205 1401
1206 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1403 my $children = $self->{children};
1209 1404
1210 my @h = map $_->{req_w}, @$children; 1405 my @req;
1211 1406
1212 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1213 1408 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1422 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1423 }
1228 } 1424 }
1229 1425
1230 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1231 1427
1232 my $y = 0; 1428 my $pos = 0;
1233 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1432
1238 $y += $h; 1433 $pos += $alloc;
1239 } 1434 }
1240 1435
1241 1 1436 1
1242} 1437}
1243 1438
1244############################################################################# 1439#############################################################################
1245 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1246package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1247 1457
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1251 1459
1252sub size_request { 1460sub new {
1253 my ($self) = @_; 1461 my $class = shift;
1254 1462
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1256 1464 vertical => 1,
1257 ( 1465 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1466 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1467}
1301 1468
1302############################################################################# 1469#############################################################################
1303 1470
1304package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1488 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1323 fontsize => 1, 1490 fontsize => 1,
1324 align => -1, 1491 align => -1,
1325 valign => -1, 1492 valign => -1,
1326 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1327 can_events => 0, 1495 can_events => 0,
1328 %arg 1496 %arg
1329 ); 1497 );
1330 1498
1331 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1368 1536
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1371 1539
1540 $self->realloc;
1372 $self->update; 1541 $self->update;
1373 $self->check_size;
1374} 1542}
1375 1543
1376sub set_markup { 1544sub set_markup {
1377 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1378 1546
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1551
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1386 1554
1555 $self->realloc;
1387 $self->update; 1556 $self->update;
1388 $self->check_size;
1389} 1557}
1390 1558
1391sub size_request { 1559sub size_request {
1392 my ($self) = @_; 1560 my ($self) = @_;
1393 1561
… …
1407 1575
1408 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1410 } 1578 }
1411 1579
1412 ( 1580 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1581}
1417 1582
1418sub size_allocate { 1583sub size_allocate {
1419 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1420 1585
1586 delete $self->{ox};
1587
1421 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1590}
1423 1591
1424sub set_fontsize { 1592sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1426 1594
1427 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1596 delete $self->{texture};
1429 1597
1430 $self->update; 1598 $self->realloc;
1431 $self->check_size;
1432} 1599}
1433 1600
1434sub _draw { 1601sub _draw {
1435 my ($self) = @_; 1602 my ($self) = @_;
1436 1603
… …
1442 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1613
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1448 1616
1617 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1452 1621
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1625 };
1459 1626
1460 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1629
… …
1488 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1489 can_hover => 1, 1656 can_hover => 1,
1490 can_focus => 1, 1657 can_focus => 1,
1491 valign => 0, 1658 valign => 0,
1492 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1493 @_ 1661 @_
1494 ) 1662 )
1495} 1663}
1496 1664
1497sub _set_text { 1665sub _set_text {
… …
1507 $self->{text} = $text; 1675 $self->{text} = $text;
1508 1676
1509 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1511 1679
1512 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1513} 1681}
1514 1682
1515sub set_text { 1683sub set_text {
1516 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1517 1685
1518 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1687 $self->_set_text ($text);
1520 $self->update; 1688
1521 $self->check_size; 1689 $self->realloc;
1522} 1690}
1523 1691
1524sub get_text { 1692sub get_text {
1525 $_[0]{text} 1693 $_[0]{text}
1526} 1694}
… …
1529 my ($self) = @_; 1697 my ($self) = @_;
1530 1698
1531 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1532 1700
1533 ($w + 1, $h) # add 1 for cursor 1701 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1702}
1541 1703
1542sub key_down { 1704sub key_down {
1543 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1544 1706
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1726 $self->_emit ('escape');
1565 } elsif ($uni) { 1727 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1567 } 1731 }
1568 1732
1569 $self->_set_text ($text); 1733 $self->_set_text ($text);
1570 $self->update; 1734
1571 $self->check_size; 1735 $self->realloc;
1736
1737 1
1572} 1738}
1573 1739
1574sub focus_in { 1740sub focus_in {
1575 my ($self) = @_; 1741 my ($self) = @_;
1576 1742
… …
1591 utf8::encode $text; 1757 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1593 1759
1594 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1595 $self->update; 1761 $self->update;
1762
1763 1
1596} 1764}
1597 1765
1598sub mouse_motion { 1766sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1601} 1771}
1602 1772
1603sub _draw { 1773sub _draw {
1604 my ($self) = @_; 1774 my ($self) = @_;
1605 1775
… …
1656 if ($sym == 13) { 1826 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1827 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1828 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1829 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1830 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1831 $self->_emit (activate => $txt);
1662 $self->update; 1832 $self->update;
1663 1833
1664 } elsif ($sym == CFClient::SDLK_UP) { 1834 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1835 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1836 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1852 } else {
1683 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1684 } 1854 }
1685 1855
1686 } else { 1856 } else {
1687 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1688 } 1860 1
1689
1690} 1861}
1691 1862
1692############################################################################# 1863#############################################################################
1693 1864
1694package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1703 1874
1704sub new { 1875sub new {
1705 my $class = shift; 1876 my $class = shift;
1706 1877
1707 $class->SUPER::new ( 1878 $class->SUPER::new (
1708 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1709 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1711 can_hover => 1, 1883 can_hover => 1,
1712 align => 0, 1884 align => 0,
1713 valign => 0, 1885 valign => 0,
1714 can_events => 1, 1886 can_events => 1,
1715 @_ 1887 @_
1716 ) 1888 )
1717} 1889}
1718 1890
1891sub activate { }
1892
1719sub button_up { 1893sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1721 1895
1896 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1899
1725 } 1900 1
1726} 1901}
1727 1902
1728sub _draw { 1903sub _draw {
1729 my ($self) = @_; 1904 my ($self) = @_;
1730 1905
… …
1759 1934
1760sub new { 1935sub new {
1761 my $class = shift; 1936 my $class = shift;
1762 1937
1763 $class->SUPER::new ( 1938 $class->SUPER::new (
1764 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1765 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1945 state => 0,
… …
1773} 1949}
1774 1950
1775sub size_request { 1951sub size_request {
1776 my ($self) = @_; 1952 my ($self) = @_;
1777 1953
1778 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1779} 1955}
1780 1956
1781sub button_down { 1957sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1783 1959
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1788 } 1968 1
1789} 1969}
1790 1970
1791sub _draw { 1971sub _draw {
1792 my ($self) = @_; 1972 my ($self) = @_;
1793 1973
1794 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1795 1975
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1977
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1981
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1983
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1985
… …
2067 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2075 vertical => 0, 2257 vertical => 0,
2076 can_hover => 1, 2258 can_hover => 1,
2077 inner_pad => 0.02, 2259 inner_pad => 0.02,
2078 @_ 2260 @_
2079 ); 2261 );
… …
2082 $self->update; 2264 $self->update;
2083 2265
2084 $self 2266 $self
2085} 2267}
2086 2268
2269sub changed { }
2270
2271sub set_range {
2272 my ($self, $range) = @_;
2273
2274 ($range, $self->{range}) = ($self->{range}, $range);
2275
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2278}
2279
2087sub set_value { 2280sub set_value {
2088 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2089 2282
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2283 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2284
2092 $hi = $lo + 1 if $hi <= $lo; 2285 $hi = $lo + 1 if $hi <= $lo;
2093 2286
2287 $page = $hi - $lo if $page > $hi - $lo;
2288
2094 $value = $lo if $value < $lo; 2289 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2290 $value = $hi - $page if $value > $hi - $page;
2096 2291
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2292 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2293 if $unit;
2099 2294
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2296
2104 if ($value != $old_value) { 2297 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2298 $self->_emit (changed => $value);
2106 $self->update; 2299 $self->update;
2107 } 2300 }
2108} 2301}
2109 2302
2110sub size_request { 2303sub size_request {
2111 my ($self) = @_; 2304 my ($self) = @_;
2112 2305
2113 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2307}
2118 2308
2119sub button_down { 2309sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2121 2311
2122 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2313
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315
2123 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2124} 2317}
2125 2318
2126sub mouse_motion { 2319sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2128 2321
2129 if ($GRAB == $self) { 2322 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2324
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2326
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2328
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2137 } 2334 1
2138} 2335}
2139 2336
2140sub update { 2337sub update {
2141 my ($self) = @_; 2338 my ($self) = @_;
2142 2339
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2341 $self->set_value ($self->{range}[0]);
2145 2342
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
2147 2345
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2347
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2348 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2349 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2350
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2351 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2352 $value = $value * $self->{scale} + $self->{offset};
2154 2353
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2354 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2355 $self->{knob_w} = $knob_w;
2162 }); 2356 });
2163 2357
2164 $self->SUPER::update; 2358 $self->SUPER::update;
2165} 2359}
2166 2360
… …
2190 # draw handle 2384 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2385 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2386
2193 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
2194} 2388}
2389
2390#############################################################################
2391
2392package CFClient::UI::ValSlider;
2393
2394our @ISA = CFClient::UI::HBox::;
2395
2396sub new {
2397 my ($class, %arg) = @_;
2398
2399 my $range = delete $arg{range};
2400
2401 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift },
2405 from_value => sub { shift },
2406 %arg,
2407 );
2408
2409 $self->{slider}->connect (changed => sub {
2410 my ($self, $value) = @_;
2411 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2412 $self->{parent}->emit (changed => $value);
2413 });
2414
2415# $self->{entry}->connect (changed => sub {
2416# my ($self, $value) = @_;
2417# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2418# $self->{parent}->emit (changed => $value);
2419# });
2420
2421 $self->add ($self->{slider}, $self->{entry});
2422
2423 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2424
2425 $self
2426}
2427
2428sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) }
2195 2430
2196############################################################################# 2431#############################################################################
2197 2432
2198package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
2199 2434
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2476 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2477
2243 $self->reflow; 2478 $self->reflow;
2244} 2479}
2245 2480
2246sub text_height { 2481sub text_size {
2247 my ($self, $text, $indent) = @_; 2482 my ($self, $text, $indent) = @_;
2248 2483
2249 my $layout = $self->{layout}; 2484 my $layout = $self->{layout};
2250 2485
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2487 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2488 $layout->set_markup ($text);
2254 2489
2255 ($layout->size)[1] 2490 $layout->size
2256} 2491}
2257 2492
2258sub reflow { 2493sub reflow {
2259 my ($self) = @_; 2494 my ($self) = @_;
2260 2495
2261 $self->{need_reflow}++; 2496 $self->{need_reflow}++;
2262 $self->update; 2497 $self->update;
2263} 2498}
2264 2499
2500sub set_offset {
2501 my ($self, $offset) = @_;
2502
2503 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset);
2505}
2506
2507sub clear {
2508 my ($self) = @_;
2509
2510 $self->{par} = [];
2511 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513}
2514
2265sub add_paragraph { 2515sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2516 my ($self, $color, $text, $indent) = @_;
2267 2517
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2518 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2519 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2520 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2522 }
2275 2523
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2525}
2279 2526
2280sub update { 2527sub update {
2281 my ($self) = @_; 2528 my ($self) = @_;
2282 2529
… …
2285 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
2286 2533
2287 delete $self->{texture}; 2534 delete $self->{texture};
2288 2535
2289 $ROOT->on_post_alloc ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
2290 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2540 my $height = 0;
2292 2541
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2294 for @{$self->{par}}; 2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2295 2557
2296 $self->{height} = $height; 2558 $self->{height} = $height;
2297 2559
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2561
2301 delete $self->{texture}; 2562 delete $self->{texture};
2302 } 2563 }
2303 2564
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2307 2568
2308 my $top = int $self->{children}[1]{range}[0]; 2569 my $top = int $self->{children}[1]{range}[0];
2309 2570
2310 my $y0 = $top; 2571 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2572 my $y1 = $top + $H;
2312 2573
2313 my $y = 0; 2574 my $y = 0;
2314 2575
2315 my $layout = $self->{layout}; 2576 my $layout = $self->{layout};
2316 2577
2317 $layout->set_font ($self->{font}) if $self->{font}; 2578 $layout->set_font ($self->{font}) if $self->{font};
2318 2579
2319 glEnable GL_BLEND; 2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2583
2322 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2585 my $h = $par->[1];
2324 2586
2325 if ($y0 < $y + $h && $y < $y1) { 2587 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2588 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2589 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2590 $layout->set_markup ($par->[4]);
2329 2591
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2593
2332 glRasterPos $par->[2], $y - $y0; 2594 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2596 }
2335 2597
2336 $y += $h; 2598 $y += $h;
2337 } 2599 }
… …
2404 2666
2405sub new { 2667sub new {
2406 my $class = shift; 2668 my $class = shift;
2407 2669
2408 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2409 state => 0, 2671 state => 0,
2410 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2411 @_ 2673 @_
2412 ); 2674 );
2413 2675
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2676 $self
2420} 2677}
2421 2678
2422sub toggle_flopper { 2679sub toggle_flopper {
2423 my ($self) = @_; 2680 my ($self) = @_;
2424 2681
2425 # TODO: use animation 2682 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2683}
2437 2684
2438############################################################################# 2685#############################################################################
2439 2686
2440package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2453} 2700}
2454 2701
2455sub set_tooltip_from { 2702sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2457 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2458 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2717 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2719 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2731
2476sub size_allocate { 2732sub size_allocate {
2477 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2478 2734
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2480} 2754}
2481 2755
2482sub _draw { 2756sub _draw {
2483 my ($self) = @_; 2757 my ($self) = @_;
2484 2758
… …
2501 glVertex $w, $h; 2775 glVertex $w, $h;
2502 glVertex $w, 0; 2776 glVertex $w, 0;
2503 glEnd; 2777 glEnd;
2504 2778
2505 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2506 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2507} 2782}
2508 2783
2509############################################################################# 2784#############################################################################
2510 2785
… …
2516 2791
2517sub new { 2792sub new {
2518 my $class = shift; 2793 my $class = shift;
2519 2794
2520 my $self = $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2521 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2522 @_, 2798 @_,
2523 ); 2799 );
2524 2800
2525 if ($self->{anim} && $self->{animspeed}) { 2801 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2802 Scalar::Util::weaken (my $widget = $self);
… …
2541 2817
2542sub size_request { 2818sub size_request {
2543 (32, 8) 2819 (32, 8)
2544} 2820}
2545 2821
2822sub update {
2823 my ($self) = @_;
2824
2825 return unless $self->{visible};
2826
2827 $self->SUPER::update;
2828}
2829
2546sub _draw { 2830sub _draw {
2547 my ($self) = @_; 2831 my ($self) = @_;
2548 2832
2549 return unless $::CONN;#d# manage and cache textures differently 2833 return unless $::CONN;
2550 2834
2551 my $face; 2835 my $face;
2552 2836
2553 if ($self->{frame}) { 2837 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}]; 2838 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2577 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2578} 2862}
2579 2863
2580############################################################################# 2864#############################################################################
2581 2865
2582package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2583 2867
2584our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2585 2869
2586sub _item_to_desc { 2870# TODO: should actualyl wrap buttons and other goodies.
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2611
2612sub new {
2613 my $class = shift;
2614
2615 my %args = @_;
2616
2617 my $item = delete $args{item};
2618
2619 my $desc = _item_to_desc ($item);
2620
2621 my $self = $class->SUPER::new (
2622 can_hover => 1,
2623 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2637 $::CONN->send ("move $targ $item->{tag} 0");
2638 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) {
2641 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2654 ),
2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658 }
2659
2660 1
2661 },
2662 %args
2663 );
2664
2665
2666 $self->add (new CFClient::UI::Face
2667 can_events => 0,
2668 face => $item->{face},
2669 anim => $item->{anim},
2670 animspeed => $item->{animspeed},
2671 );
2672
2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675 $self->{item} = $item;
2676
2677 $self->update_item;
2678
2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI::Inventory;
2693
2694our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox),
2701 @_,
2702 );
2703
2704 $self
2705}
2706
2707sub set_items {
2708 my ($self, $items) = @_;
2709
2710 $self->{scrolled}->clear;
2711 return unless $items;
2712
2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2717
2718 $self->{real_items} = \@items;
2719
2720 for my $item (@items) {
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2723 }
2724
2725 $self->{scrolled}->add (@items);
2726
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728}
2729
2730sub size_request {
2731 my ($self) = @_;
2732 ($self->{req_w}, $self->{req_h});
2733}
2734 2871
2735############################################################################# 2872#############################################################################
2736 2873
2737package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2738 2875
… …
2772 2909
2773# popup given the event (must be a mouse button down event currently) 2910# popup given the event (must be a mouse button down event currently)
2774sub popup { 2911sub popup {
2775 my ($self, $ev) = @_; 2912 my ($self, $ev) = @_;
2776 2913
2777 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2778 2915
2779 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2780 $GRAB = $self; 2917 $GRAB = $self;
2781 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2782 2919
2783 $self->show; 2920 $self->show;
2784 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2785} 2922}
2786 2923
2787sub mouse_motion { 2924sub mouse_motion {
2788 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2789 2926
2790 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2791 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2792 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2793} 2932}
2794 2933
2795sub button_up { 2934sub button_up {
2796 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2797 2936
2798 if ($ev->{button} == $self->{button}) { 2937 if ($ev->{button} == $self->{button}) {
2799 undef $GRAB; 2938 undef $GRAB;
2800 $self->hide; 2939 $self->hide;
2801 2940
2802 $self->emit ("popdown"); 2941 $self->_emit ("popdown");
2803 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2804 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2805} 3054}
2806 3055
2807############################################################################# 3056#############################################################################
2808 3057
2809package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
2869sub add { 3118sub add {
2870 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2871 3120
2872 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2874 3125
2875 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2876 3127
2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878 3129
… …
2912 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
2913} 3164}
2914 3165
2915############################################################################# 3166#############################################################################
2916 3167
2917package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2918 3169
2919our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2920
2921use CFClient::OpenGL;
2922 3171
2923sub new { 3172sub new {
2924 my $class = shift; 3173 my $class = shift;
2925 3174
2926 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
2927 @_, 3418 @_,
2928 ) 3419 )
2929} 3420}
2930 3421
2931sub configure { 3422# XXX: Do sorting? Argl...
2932 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
2933
2934 $self->{w} = $w;
2935 $self->{h} = $h;
2936}
2937
2938sub check_size {
2939 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
2940 3426
2941 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2942 if $self->{w}; 3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
2943} 3481}
2944 3482
2945sub size_request { 3483sub size_request {
2946 my ($self) = @_; 3484 my ($self) = @_;
2947 3485
2948 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
2949} 3501}
2950 3502
2951sub size_allocate { 3503sub size_allocate {
2952 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2953 3505
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2960 for my $child ($self->children) { 3506 for my $child ($self->children) {
2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2962 3508
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
2964 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
2965 3511
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
2967 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
2968
2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971 3514
2972 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
2973 } 3516 }
2974} 3517}
2975 3518
… …
2986} 3529}
2987 3530
2988sub update { 3531sub update {
2989 my ($self) = @_; 3532 my ($self) = @_;
2990 3533
2991 $self->check_size;
2992 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
2993} 3535}
2994 3536
2995sub add { 3537sub add {
2996 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
2997 3539
2998 for my $child (@children) {
2999 $child->{toplevel} = 1; 3540 $_->{is_toplevel} = 1
3000 3541 for @children;
3001 # integerise window positions
3002 $child->{x} = int $child->{x};
3003 $child->{y} = int $child->{y};
3004 }
3005 3542
3006 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3544}
3545
3546sub remove {
3547 my ($self, @children) = @_;
3548
3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3553
3554 while (@children) {
3555 my $w = pop @children;
3556 push @children, $w->children;
3557 $w->set_invisible;
3558 }
3007} 3559}
3008 3560
3009sub on_refresh { 3561sub on_refresh {
3010 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
3011 3563
… …
3024 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3025 $_->() 3577 $_->()
3026 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3027 } 3579 }
3028 3580
3029 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3030 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
3031 3585
3032 for (;;) { 3586 outer:
3033 if ($self->{check_size}) { 3587 while () {
3034 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
3035 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
3036 for values %{delete $self->{check_size}} 3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3037 } 3596 }
3038 3597
3039 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
3040 3600
3041 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
3042 ? @$widget{qw(user_w user_h)} 3602 and last;
3043 : $widget->size_request;
3044
3045 if (delete $widget->{force_alloc}
3046 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3048 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3049 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3050 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3051 3621
3052 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3053 3623
3054 $widget->{parent}->check_size
3055 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3056 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3057 } 3634 }
3058 } 3635 }
3059 3636
3060 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3061 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3062 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3063 3645
3064 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3065 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3066 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3067 $widget->{w} = $w; 3656 $widget->{w} = $w;
3068 $widget->{h} = $h; 3657 $widget->{h} = $h;
3069 $widget->size_allocate ($w, $h); 3658
3070 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3071 } 3661 }
3072 } 3662 }
3073 3663
3074 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3075 $_->() 3665 $_->()
3076 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3077 } 3667 }
3668
3078 3669
3079 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3081 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3082 3673
… …
3084 glLoadIdentity; 3675 glLoadIdentity;
3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3086 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3087 glLoadIdentity; 3678 glLoadIdentity;
3088 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3089 $self->_draw; 3687 $self->_draw;
3090} 3688}
3091 3689
3092############################################################################# 3690#############################################################################
3093 3691

Diff Legend

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