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.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 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 {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 263
229sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
230 my ($self) = @_; 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})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
676} 795}
677 796
678############################################################################# 797#############################################################################
679 798
799# back-buffered drawing area
800
680package CFClient::UI::Window; 801package CFClient::UI::Window;
681 802
682our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
683 804
684use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 824 $self->update;
704} 825}
705 826
706sub _render { 827sub _render {
828 my ($self) = @_;
829
707 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
708} 831}
709 832
710sub render_child { 833sub render_child {
711 my ($self) = @_; 834 my ($self) = @_;
712 835
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
716 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
717 $self->_render; 847 $self->_render;
718 }; 848 };
719} 849}
720 850
721sub _draw { 851sub _draw {
722 my ($self) = @_; 852 my ($self) = @_;
723 853
724 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
725 855
726 my $tex = $self->{texture} 856 my $tex = $self->{texture}
727 or return; 857 or return;
728 858
729 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
739 869
740package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
741 871
742our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
743 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
744sub size_request { 884sub size_request {
745 my ($self) = @_; 885 my ($self) = @_;
746 886
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 888
749 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
750} 893}
751 894
752sub size_allocate { 895sub size_allocate {
753 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
754 897
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 898 my $child = $self->child;
756# $w = $self->{w}; 899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
757 $self->child->configure (0, 0, $cw, $ch); 903 $self->child->configure (0, 0, $w, $h);
758 $self->update; 904 $self->update;
759} 905}
760 906
761sub set_offset { 907sub set_offset {
762 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
796} 942}
797 943
798sub _render { 944sub _render {
799 my ($self) = @_; 945 my ($self) = @_;
800 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 951
803 $self->SUPER::_render; 952 $self->SUPER::_render;
804} 953}
805 954
… …
808package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
809 958
810our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
811 960
812sub new { 961sub new {
813 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
814 965
815 my $self; 966 my $self;
816 967
817 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
818 vertical => 1, 969 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 971 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
822 }, 973 },
823 ; 974 ;
824 975
825 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 978 slider => $slider,
828 @_, 979 %arg,
829 ); 980 );
830 981
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
834 984
835 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($w, $h);
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 1011}
837 1012
838#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1014# update viewport offset on scroll
840 1015
… …
884 1059
885our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
886 1061
887use CFClient::OpenGL; 1062use CFClient::OpenGL;
888 1063
889my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1071
893sub new { 1072sub new {
894 my $class = shift; 1073 my ($class, %arg) = @_;
895 1074
896 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
897 1076
898 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1080 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1081 can_events => 1,
904 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
905 ); 1085 );
906 1086
907 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
908 align => 0, 1088 align => 0,
909 valign => 1, 1089 valign => 1,
910 text => $self->{title}, 1090 text => $title,
911 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
912 1093
913 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
914} 1102}
915 1103
916sub border { 1104sub border {
917 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
918} 1106}
919 1107
920sub size_request { 1108sub size_request {
921 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
922 1113
923 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
924 1115
925 ( 1116 (
926 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
929} 1120}
930 1121
931sub size_allocate { 1122sub size_allocate {
932 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
933 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
934 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
936 1135
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
941} 1137}
942 1138
943sub button_down { 1139sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
945 1141
… …
961 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
962 1158
963 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
965 1161
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size;
970 }; 1167 };
971 1168
972 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1173 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
978 1175
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
980 1177
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update;
983 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
984 } 1184 1
985} 1185}
986 1186
987sub button_up { 1187sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
989 1189
990 delete $self->{motion}; 1190 !!delete $self->{motion}
991} 1191}
992 1192
993sub mouse_motion { 1193sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
995 1195
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
997} 1199}
998 1200
999sub _draw { 1201sub _draw {
1000 my ($self) = @_; 1202 my ($self) = @_;
1001 1203
1204 my $child = $self->{children}[0];
1205
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1208
1005 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1211
1008 my $border = $self->border; 1212 my $border = $self->border;
1009 1213
1010 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1219
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
1018 1222
1019 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1228 }
1030 1229
1031 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1032 1231
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1036} 1238}
1037 1239
1038############################################################################# 1240#############################################################################
1039 1241
1040package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1048sub new { 1250sub new {
1049 my $class = shift; 1251 my $class = shift;
1050 1252
1051 $class->SUPER::new ( 1253 $class->SUPER::new (
1052 col_expand => [], 1254 col_expand => [],
1053 @_ 1255 @_,
1054 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1261}
1056 1262
1057sub add { 1263sub add {
1058 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1059 1265
1060 $child->set_parent ($self); 1266 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1062 1268
1063 $child->check_size; 1269 $self->realloc;
1064} 1270}
1065 1271
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1273sub clear {
1072 my ($self) = @_; 1274 my ($self) = @_;
1073 1275
1074 my @children = $self->children; 1276 my @children = $self->children;
1075 delete $self->{children}; 1277 delete $self->{children};
… …
1077 for (@children) { 1279 for (@children) {
1078 delete $_->{parent}; 1280 delete $_->{parent};
1079 $_->hide; 1281 $_->hide;
1080 } 1282 }
1081 1283
1082 $self->update; 1284 $self->realloc;
1083} 1285}
1084 1286
1085sub get_wh { 1287sub get_wh {
1086 my ($self) = @_; 1288 my ($self) = @_;
1087 1289
… …
1118sub size_allocate { 1320sub size_allocate {
1119 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1120 1322
1121 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1122 1324
1123 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1125 1327
1126 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1385 }
1184} 1386}
1185 1387
1186############################################################################# 1388#############################################################################
1187 1389
1188package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1391
1192our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1193 1393
1194sub size_request { 1394sub size_request {
1195 my ($self) = @_; 1395 my ($self) = @_;
1196 1396
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1198 1398 ? (
1199 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1401 )
1202 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1203} 1406}
1204 1407
1205sub size_allocate { 1408sub size_allocate {
1206 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1207 1410
1208 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1412 my $children = $self->{children};
1211 1413
1212 my @h = map $_->{req_w}, @$children; 1414 my @req;
1213 1415
1214 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1215 1417 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1432 }
1230 } 1433 }
1231 1434
1232 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1233 1436
1234 my $y = 0; 1437 my $pos = 0;
1235 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1441
1240 $y += $h; 1442 $pos += $alloc;
1241 } 1443 }
1242 1444
1243 1 1445 1
1244} 1446}
1245 1447
1246############################################################################# 1448#############################################################################
1247 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1248package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1249 1466
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1253 1468
1254sub size_request { 1469sub new {
1255 my ($self) = @_; 1470 my $class = shift;
1256 1471
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1258 1473 vertical => 1,
1259 ( 1474 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1475 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1476}
1303 1477
1304############################################################################# 1478#############################################################################
1305 1479
1306package CFClient::UI::Label; 1480package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1497 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1325 fontsize => 1, 1499 fontsize => 1,
1326 align => -1, 1500 align => -1,
1327 valign => -1, 1501 valign => -1,
1328 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1329 can_events => 0, 1504 can_events => 0,
1330 %arg 1505 %arg
1331 ); 1506 );
1332 1507
1333 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1369 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1370 1545
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1373 1548
1549 $self->realloc;
1374 $self->update; 1550 $self->update;
1375 $self->check_size;
1376} 1551}
1377 1552
1378sub set_markup { 1553sub set_markup {
1379 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1380 1555
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1560
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1388 1563
1564 $self->realloc;
1389 $self->update; 1565 $self->update;
1390 $self->check_size;
1391} 1566}
1392 1567
1393sub size_request { 1568sub size_request {
1394 my ($self) = @_; 1569 my ($self) = @_;
1395 1570
… …
1409 1584
1410 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1412 } 1587 }
1413 1588
1414 ( 1589 ($w, $h)
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1590}
1419 1591
1420sub size_allocate { 1592sub size_allocate {
1421 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1422 1594
1595 delete $self->{ox};
1596
1423 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1599}
1425 1600
1426sub set_fontsize { 1601sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1428 1603
1429 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1605 delete $self->{texture};
1431 1606
1432 $self->update; 1607 $self->realloc;
1433 $self->check_size;
1434} 1608}
1435 1609
1436sub _draw { 1610sub _draw {
1437 my ($self) = @_; 1611 my ($self) = @_;
1438 1612
… …
1444 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1622
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1450 1625
1626 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1454 1630
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1634 };
1461 1635
1462 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1638
… …
1510 $self->{text} = $text; 1684 $self->{text} = $text;
1511 1685
1512 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1514 1688
1515 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1516} 1690}
1517 1691
1518sub set_text { 1692sub set_text {
1519 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1520 1694
1521 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1696 $self->_set_text ($text);
1523 $self->update; 1697
1524 $self->check_size; 1698 $self->realloc;
1525} 1699}
1526 1700
1527sub get_text { 1701sub get_text {
1528 $_[0]{text} 1702 $_[0]{text}
1529} 1703}
… …
1532 my ($self) = @_; 1706 my ($self) = @_;
1533 1707
1534 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1535 1709
1536 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1711}
1544 1712
1545sub key_down { 1713sub key_down {
1546 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1547 1715
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1735 $self->_emit ('escape');
1568 } elsif ($uni) { 1736 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1570 } 1740 }
1571 1741
1572 $self->_set_text ($text); 1742 $self->_set_text ($text);
1573 $self->update; 1743
1574 $self->check_size; 1744 $self->realloc;
1745
1746 1
1575} 1747}
1576 1748
1577sub focus_in { 1749sub focus_in {
1578 my ($self) = @_; 1750 my ($self) = @_;
1579 1751
… …
1594 utf8::encode $text; 1766 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1596 1768
1597 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1598 $self->update; 1770 $self->update;
1771
1772 1
1599} 1773}
1600 1774
1601sub mouse_motion { 1775sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1604} 1780}
1605 1781
1606sub _draw { 1782sub _draw {
1607 my ($self) = @_; 1783 my ($self) = @_;
1608 1784
… …
1659 if ($sym == 13) { 1835 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1665 $self->update; 1841 $self->update;
1666 1842
1667 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1861 } else {
1686 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1687 } 1863 }
1688 1864
1689 } else { 1865 } else {
1690 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1691 } 1869 1
1692
1693} 1870}
1694 1871
1695############################################################################# 1872#############################################################################
1696 1873
1697package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1706 1883
1707sub new { 1884sub new {
1708 my $class = shift; 1885 my $class = shift;
1709 1886
1710 $class->SUPER::new ( 1887 $class->SUPER::new (
1711 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1712 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1714 can_hover => 1, 1892 can_hover => 1,
1715 align => 0, 1893 align => 0,
1716 valign => 0, 1894 valign => 0,
1717 can_events => 1, 1895 can_events => 1,
1718 @_ 1896 @_
1719 ) 1897 )
1720} 1898}
1721 1899
1900sub activate { }
1901
1722sub button_up { 1902sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1724 1904
1905 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1908
1728 } 1909 1
1729} 1910}
1730 1911
1731sub _draw { 1912sub _draw {
1732 my ($self) = @_; 1913 my ($self) = @_;
1733 1914
… …
1762 1943
1763sub new { 1944sub new {
1764 my $class = shift; 1945 my $class = shift;
1765 1946
1766 $class->SUPER::new ( 1947 $class->SUPER::new (
1767 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1768 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1952 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1953 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1954 state => 0,
… …
1776} 1958}
1777 1959
1778sub size_request { 1960sub size_request {
1779 my ($self) = @_; 1961 my ($self) = @_;
1780 1962
1781 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1782} 1964}
1783 1965
1784sub button_down { 1966sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1786 1968
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1791 } 1977 1
1792} 1978}
1793 1979
1794sub _draw { 1980sub _draw {
1795 my ($self) = @_; 1981 my ($self) = @_;
1796 1982
1797 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1798 1984
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 1986
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 1990
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 1992
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 1994
… …
2070 my $self = $class->SUPER::new ( 2258 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2261 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2262 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2263 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2078 vertical => 0, 2266 vertical => 0,
2079 can_hover => 1, 2267 can_hover => 1,
2080 inner_pad => 0.02, 2268 inner_pad => 0.02,
2081 @_ 2269 @_
2082 ); 2270 );
… …
2085 $self->update; 2273 $self->update;
2086 2274
2087 $self 2275 $self
2088} 2276}
2089 2277
2278sub changed { }
2279
2090sub set_range { 2280sub set_range {
2091 my ($self, $range) = @_; 2281 my ($self, $range) = @_;
2092 2282
2093 $self->{range} = $range; 2283 ($range, $self->{range}) = ($self->{range}, $range);
2094 2284
2095 $self->update; 2285 $self->update
2286 if "@$range" ne "@{$self->{range}}";
2096} 2287}
2097 2288
2098sub set_value { 2289sub set_value {
2099 my ($self, $value) = @_; 2290 my ($self, $value) = @_;
2100 2291
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2292 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2293
2103 $hi = $lo + 1 if $hi <= $lo; 2294 $hi = $lo + 1 if $hi <= $lo;
2104 2295
2296 $page = $hi - $lo if $page > $hi - $lo;
2297
2105 $value = $lo if $value < $lo; 2298 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2299 $value = $hi - $page if $value > $hi - $page;
2107 2300
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2301 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2302 if $unit;
2110 2303
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2304 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2305
2115 if ($value != $old_value) { 2306 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2307 $self->_emit (changed => $value);
2117 $self->update; 2308 $self->update;
2118 } 2309 }
2119} 2310}
2120 2311
2121sub size_request { 2312sub size_request {
2122 my ($self) = @_; 2313 my ($self) = @_;
2123 2314
2124 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2316}
2129 2317
2130sub button_down { 2318sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2132 2320
2133 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2322
2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2324
2134 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2135} 2326}
2136 2327
2137sub mouse_motion { 2328sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2139 2330
2140 if ($GRAB == $self) { 2331 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2332 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2333
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2335
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2337
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2148 } 2343 1
2149} 2344}
2150 2345
2151sub update { 2346sub update {
2152 my ($self) = @_; 2347 my ($self) = @_;
2153 2348
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2155 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2156 2358
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2360 my $range = ($hi - $page - $lo) || 1e-100;
2158 2361
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2362 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2363
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2364 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2365 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2366
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2367 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2368 $value = $value * $self->{scale} + $self->{offset};
2165 2369
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2371 $self->{knob_w} = $knob_w;
2173 }); 2372 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2373
2181 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2182 2375
2183 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2184 2377
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2486 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2487
2295 $self->reflow; 2488 $self->reflow;
2296} 2489}
2297 2490
2298sub text_height { 2491sub text_size {
2299 my ($self, $text, $indent) = @_; 2492 my ($self, $text, $indent) = @_;
2300 2493
2301 my $layout = $self->{layout}; 2494 my $layout = $self->{layout};
2302 2495
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2496 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2497 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2498 $layout->set_markup ($text);
2306 2499
2307 ($layout->size)[1] 2500 $layout->size
2308} 2501}
2309 2502
2310sub reflow { 2503sub reflow {
2311 my ($self) = @_; 2504 my ($self) = @_;
2312 2505
2313 $self->{need_reflow}++; 2506 $self->{need_reflow}++;
2314 $self->update; 2507 $self->update;
2315} 2508}
2316 2509
2510sub set_offset {
2511 my ($self, $offset) = @_;
2512
2513 # todo: base offset on lines or so, not on pixels
2514 $self->{children}[1]->set_value ($offset);
2515}
2516
2317sub clear { 2517sub clear {
2318 my ($self) = @_; 2518 my ($self) = @_;
2319 2519
2320 $self->{par} = []; 2520 $self->{par} = [];
2321 $self->{height} = 0; 2521 $self->{height} = 0;
2322 2522 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2523}
2325 2524
2326sub add_paragraph { 2525sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2526 my ($self, $color, $text, $indent) = @_;
2328 2527
2329 for my $line (split /\n/, $text) { 2528 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2529 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2530 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2531 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2532 }
2334 2533
2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2534 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2336 $self->{children}[1]->update;
2337} 2535}
2338 2536
2339sub update { 2537sub update {
2340 my ($self) = @_; 2538 my ($self) = @_;
2341 2539
… …
2344 return unless $self->{h} > 0; 2542 return unless $self->{h} > 0;
2345 2543
2346 delete $self->{texture}; 2544 delete $self->{texture};
2347 2545
2348 $ROOT->on_post_alloc ($self, sub { 2546 $ROOT->on_post_alloc ($self, sub {
2547 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2548
2349 if (delete $self->{need_reflow}) { 2549 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2550 my $height = 0;
2351 2551
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2552 my $layout = $self->{layout};
2553
2554 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2555
2353 for @{$self->{par}}; 2556 for (@{$self->{par}}) {
2557 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2558 $layout->set_width ($W - $_->[3]);
2559 $layout->set_markup ($_->[4]);
2560 my ($w, $h) = $layout->size;
2561 $_->[0] = $w + $_->[3];
2562 $_->[1] = $h;
2563 }
2564
2565 $height += $_->[1];
2566 }
2354 2567
2355 $self->{height} = $height; 2568 $self->{height} = $height;
2356 2569
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2570 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2571
2360 delete $self->{texture}; 2572 delete $self->{texture};
2361 } 2573 }
2362 2574
2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2575 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2576 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2577 glClear GL_COLOR_BUFFER_BIT;
2366 2578
2367 my $top = int $self->{children}[1]{range}[0]; 2579 my $top = int $self->{children}[1]{range}[0];
2368 2580
2369 my $y0 = $top; 2581 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2582 my $y1 = $top + $H;
2371 2583
2372 my $y = 0; 2584 my $y = 0;
2373 2585
2374 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2375 2587
2376 $layout->set_font ($self->{font}) if $self->{font}; 2588 $layout->set_font ($self->{font}) if $self->{font};
2377 2589
2378 glEnable GL_BLEND; 2590 glEnable GL_BLEND;
2591 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2592 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2593
2381 for my $par (@{$self->{par}}) { 2594 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2595 my $h = $par->[1];
2383 2596
2384 if ($y0 < $y + $h && $y < $y1) { 2597 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2598 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2599 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2600 $layout->set_markup ($par->[4]);
2388 2601
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2602 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2603
2391 glRasterPos $par->[2], $y - $y0; 2604 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2605 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2606 }
2394 2607
2395 $y += $h; 2608 $y += $h;
2396 } 2609 }
… …
2463 2676
2464sub new { 2677sub new {
2465 my $class = shift; 2678 my $class = shift;
2466 2679
2467 my $self = $class->SUPER::new ( 2680 my $self = $class->SUPER::new (
2468 state => 0, 2681 state => 0,
2469 connect_activate => \&toggle_flopper, 2682 on_activate => \&toggle_flopper,
2470 @_ 2683 @_
2471 ); 2684 );
2472 2685
2473 if ($self->{state}) {
2474 $self->{state} = 0;
2475 $self->toggle_flopper;
2476 }
2477
2478 $self 2686 $self
2479} 2687}
2480 2688
2481sub toggle_flopper { 2689sub toggle_flopper {
2482 my ($self) = @_; 2690 my ($self) = @_;
2483 2691
2484 # TODO: use animation 2692 $self->{other}->toggle_visibility;
2485 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open");
2489 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close");
2492 }
2493
2494 $self->emit (changed => $self->{state});
2495} 2693}
2496 2694
2497############################################################################# 2695#############################################################################
2498 2696
2499package CFClient::UI::Tooltip; 2697package CFClient::UI::Tooltip;
… …
2512} 2710}
2513 2711
2514sub set_tooltip_from { 2712sub set_tooltip_from {
2515 my ($self, $widget) = @_; 2713 my ($self, $widget) = @_;
2516 2714
2715 my $tooltip = $widget->{tooltip};
2716
2717 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}";
2722 }
2723
2517 $self->add (new CFClient::UI::Label 2724 $self->add (new CFClient::UI::Label
2518 markup => $widget->{tooltip}, 2725 markup => $tooltip,
2519 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2520 fontsize => 0.8, 2727 fontsize => 0.8,
2521 fg => [0, 0, 0, 1], 2728 fg => [0, 0, 0, 1],
2522 ellipsise => 0, 2729 ellipsise => 0,
2523 font => ($widget->{tooltip_font} || $::FONT_PROP), 2730 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2534 2741
2535sub size_allocate { 2742sub size_allocate {
2536 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2537 2744
2538 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2746}
2747
2748sub visibility_change {
2749 my ($self, $visible) = @_;
2750
2751 return unless $visible;
2752
2753 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner}
2755 or return;
2756
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH;
2761
2762 $self->move_abs ($x, $y);
2763 });
2539} 2764}
2540 2765
2541sub _draw { 2766sub _draw {
2542 my ($self) = @_; 2767 my ($self) = @_;
2543 2768
… …
2560 glVertex $w, $h; 2785 glVertex $w, $h;
2561 glVertex $w, 0; 2786 glVertex $w, 0;
2562 glEnd; 2787 glEnd;
2563 2788
2564 glTranslate 2 - 0.375, 2 - 0.375; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2790
2565 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2566} 2792}
2567 2793
2568############################################################################# 2794#############################################################################
2569 2795
… …
2575 2801
2576sub new { 2802sub new {
2577 my $class = shift; 2803 my $class = shift;
2578 2804
2579 my $self = $class->SUPER::new ( 2805 my $self = $class->SUPER::new (
2580 aspect => 1, 2806 aspect => 1,
2807 can_events => 0,
2581 @_, 2808 @_,
2582 ); 2809 );
2583 2810
2584 if ($self->{anim} && $self->{animspeed}) { 2811 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self); 2812 Scalar::Util::weaken (my $widget = $self);
… …
2611} 2838}
2612 2839
2613sub _draw { 2840sub _draw {
2614 my ($self) = @_; 2841 my ($self) = @_;
2615 2842
2616 return unless $::CONN;#d# manage and cache textures differently 2843 return unless $::CONN;
2617 2844
2618 my $face; 2845 my $face;
2619 2846
2620 if ($self->{frame}) { 2847 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2848 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2644 $self->SUPER::DESTROY; 2871 $self->SUPER::DESTROY;
2645} 2872}
2646 2873
2647############################################################################# 2874#############################################################################
2648 2875
2649package CFClient::UI::InventoryItem; 2876package CFClient::UI::Buttonbar;
2650 2877
2651our @ISA = CFClient::UI::HBox::; 2878our @ISA = CFClient::UI::HBox::;
2652 2879
2653sub _item_to_desc { 2880# TODO: should actualyl wrap buttons and other goodies.
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678
2679sub new {
2680 my $class = shift;
2681
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 for my $item (@items) {
2790 $item->{item} = $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794
2795 my $i = 0;
2796 for (@items) {
2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2801
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2803}
2804
2805sub size_request {
2806 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h});
2808}
2809 2881
2810############################################################################# 2882#############################################################################
2811 2883
2812package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2813 2885
… …
2847 2919
2848# popup given the event (must be a mouse button down event currently) 2920# popup given the event (must be a mouse button down event currently)
2849sub popup { 2921sub popup {
2850 my ($self, $ev) = @_; 2922 my ($self, $ev) = @_;
2851 2923
2852 $self->emit ("popdown"); 2924 $self->_emit ("popdown");
2853 2925
2854 # maybe save $GRAB? must be careful about events... 2926 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2927 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2928 $self->{button} = $ev->{button};
2857 2929
2858 $self->show; 2930 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860} 2932}
2861 2933
2862sub mouse_motion { 2934sub mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2864 2936
2865 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2868} 2942}
2869 2943
2870sub button_up { 2944sub button_up {
2871 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2872 2946
2873 if ($ev->{button} == $self->{button}) { 2947 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2948 undef $GRAB;
2875 $self->hide; 2949 $self->hide;
2876 2950
2877 $self->emit ("popdown"); 2951 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
2879 } 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
2880} 3066}
2881 3067
2882############################################################################# 3068#############################################################################
2883 3069
2884package CFClient::UI::Statusbox; 3070package CFClient::UI::Statusbox;
… …
2944sub add { 3130sub add {
2945 my ($self, $text, %arg) = @_; 3131 my ($self, $text, %arg) = @_;
2946 3132
2947 $text =~ s/^\s+//; 3133 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 3134 $text =~ s/\s+$//;
3135
3136 return unless $text;
2949 3137
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3138 my $timeout = time + ((delete $arg{timeout}) || 60);
2951 3139
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3140 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3141
… …
2987 $self->SUPER::reconfigure; 3175 $self->SUPER::reconfigure;
2988} 3176}
2989 3177
2990############################################################################# 3178#############################################################################
2991 3179
2992package CFClient::UI::Root; 3180package CFClient::UI::Inventory;
2993 3181
2994our @ISA = CFClient::UI::Container::; 3182our @ISA = CFClient::UI::ScrolledWindow::;
2995
2996use CFClient::OpenGL;
2997 3183
2998sub new { 3184sub new {
2999 my $class = shift; 3185 my $class = shift;
3000 3186
3001 $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
3002 @_, 3429 @_,
3003 ) 3430 )
3004} 3431}
3005 3432
3006sub configure { 3433# XXX: Do sorting? Argl...
3007 my ($self, $x, $y, $w, $h) = @_; 3434sub add_spell {
3008
3009 $self->{w} = $w;
3010 $self->{h} = $h;
3011}
3012
3013sub check_size {
3014 my ($self) = @_; 3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
3015 3437
3016 $self->size_allocate ($self->{w}, $self->{h}) 3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3017 if $self->{w}; 3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::Root;
3476
3477our @ISA = CFClient::UI::Container::;
3478
3479use CFClient::OpenGL;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 visible => 1,
3486 @_,
3487 );
3488
3489 Scalar::Util::weaken ($self->{root} = $self);
3490
3491 $self
3018} 3492}
3019 3493
3020sub size_request { 3494sub size_request {
3021 my ($self) = @_; 3495 my ($self) = @_;
3022 3496
3023 ($self->{w}, $self->{h}) 3497 ($self->{w}, $self->{h})
3498}
3499
3500sub _to_pixel {
3501 my ($coord, $size, $max) = @_;
3502
3503 $coord =
3504 $coord eq "center" ? ($max - $size) * 0.5
3505 : $coord eq "max" ? $max
3506 : $coord;
3507
3508 $coord = 0 if $coord < 0;
3509 $coord = $max - $size if $coord > $max - $size;
3510
3511 int $coord + 0.5
3024} 3512}
3025 3513
3026sub size_allocate { 3514sub size_allocate {
3027 my ($self, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
3028 3516
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
3035 for my $child ($self->children) { 3517 for my $child ($self->children) {
3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3037 3519
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3520 $X = $child->{force_x} if exists $child->{force_x};
3039 if exists $child->{req_x}; 3521 $Y = $child->{force_y} if exists $child->{force_y};
3040 3522
3041 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3523 $X = _to_pixel $X, $W, $self->{w};
3042 if exists $child->{req_y}; 3524 $Y = _to_pixel $Y, $H, $self->{h};
3043
3044 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3045 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3046 3525
3047 $child->configure ($X, $Y, $W, $H); 3526 $child->configure ($X, $Y, $W, $H);
3048 } 3527 }
3049} 3528}
3050 3529
… …
3061} 3540}
3062 3541
3063sub update { 3542sub update {
3064 my ($self) = @_; 3543 my ($self) = @_;
3065 3544
3066 $self->check_size;
3067 $::WANT_REFRESH++; 3545 $::WANT_REFRESH++;
3068} 3546}
3069 3547
3070sub add { 3548sub add {
3071 my ($self, @children) = @_; 3549 my ($self, @children) = @_;
3072 3550
3073 for my $child (@children) {
3074 $child->{toplevel} = 1; 3551 $_->{is_toplevel} = 1
3075 3552 for @children;
3076 # integerise window positions
3077 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y};
3079 }
3080 3553
3081 $self->SUPER::add (@children); 3554 $self->SUPER::add (@children);
3555}
3556
3557sub remove {
3558 my ($self, @children) = @_;
3559
3560 $self->SUPER::remove (@children);
3561
3562 delete $self->{is_toplevel}
3563 for @children;
3082 3564
3083 while (@children) { 3565 while (@children) {
3084 my $w = pop @children; 3566 my $w = pop @children;
3085 push @children, $w->children; 3567 push @children, $w->children;
3086 $w->{visible} = 1; 3568 $w->set_invisible;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 } 3569 }
3100} 3570}
3101 3571
3102sub on_refresh { 3572sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3573 my ($self, $id, $cb) = @_;
… …
3117 while ($self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
3118 $_->() 3588 $_->()
3119 for values %{delete $self->{refresh_hook}}; 3589 for values %{delete $self->{refresh_hook}};
3120 } 3590 }
3121 3591
3122 if ($self->{check_size}) { 3592 if ($self->{realloc}) {
3123 my @queue = ([], []); 3593 my %queue;
3594 my @queue;
3595 my $widget;
3124 3596
3125 for (;;) { 3597 outer:
3126 if ($self->{check_size}) { 3598 while () {
3127 # heuristic: check containers last 3599 if (my $realloc = delete $self->{realloc}) {
3128 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3600 for $widget (values %$realloc) {
3129 for values %{delete $self->{check_size}} 3601 $widget->{visible} or next; # do not resize invisible widgets
3602
3603 $queue{$widget+0}++ and next; # duplicates are common
3604
3605 push @{ $queue[$widget->{visible}] }, $widget;
3606 }
3130 } 3607 }
3131 3608
3132 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3609 while () {
3610 @queue or last outer;
3133 3611
3134 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3612 $widget = pop @{ $queue[-1] || [] }
3135 ? @$widget{qw(user_w user_h)} 3613 and last;
3136 : $widget->size_request;
3137
3138 if (delete $widget->{force_alloc}
3139 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3140 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3141 3614
3615 pop @queue;
3616 }
3617
3618 delete $queue{$widget+0};
3619
3620 my ($w, $h) = $widget->size_request;
3621
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3624
3625 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h};
3627
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3629 || delete $widget->{force_realloc}) {
3142 $widget->{req_w} = $w; 3630 $widget->{req_w} = $w;
3143 $widget->{req_h} = $h; 3631 $widget->{req_h} = $h;
3144 3632
3145 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3633 $self->{size_alloc}{$widget+0} = $widget;
3146 3634
3147 $widget->{parent}->check_size
3148 if $widget->{parent}; 3635 if (my $parent = $widget->{parent}) {
3636 $self->{realloc}{$parent+0} = $parent
3637 unless $queue{$parent+0};
3638
3639 $parent->{force_size_alloc} = 1;
3640 $self->{size_alloc}{$parent+0} = $parent;
3641 }
3149 } 3642 }
3643
3644 delete $self->{realloc}{$widget+0};
3150 } 3645 }
3151 } 3646 }
3152 3647
3153 while ($self->{size_alloc}) { 3648 while (my $size_alloc = delete $self->{size_alloc}) {
3154 for (values %{delete $self->{size_alloc}}) { 3649 my @queue = sort { $b->{visible} <=> $a->{visible} }
3155 my ($widget, $w, $h) = @$_; 3650 values %$size_alloc;
3651
3652 while () {
3653 my $widget = pop @queue || last;
3654
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3156 3656
3157 $w = 0 if $w < 0; 3657 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3658 $h = 0 if $h < 0;
3159 3659
3660 $w = int $w + 0.5;
3661 $h = int $h + 0.5;
3662
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3664 $widget->{old_w} = $widget->{w};
3665 $widget->{old_h} = $widget->{h};
3666
3160 $widget->{w} = $w; 3667 $widget->{w} = $w;
3161 $widget->{h} = $h; 3668 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h); 3669
3163 $widget->emit (size_allocate => $w, $h); 3670 $widget->emit (size_allocate => $w, $h);
3671 }
3164 } 3672 }
3165 } 3673 }
3166 3674
3167 while ($self->{post_alloc_hook}) { 3675 while ($self->{post_alloc_hook}) {
3168 $_->() 3676 $_->()
3169 for values %{delete $self->{post_alloc_hook}}; 3677 for values %{delete $self->{post_alloc_hook}};
3170 } 3678 }
3679
3171 3680
3172 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3173 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3174 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
3175 3684
… …
3177 glLoadIdentity; 3686 glLoadIdentity;
3178 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3179 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
3180 glLoadIdentity; 3689 glLoadIdentity;
3181 3690
3691 {
3692 package CFClient::UI::Base;
3693
3694 ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h});
3696 }
3697
3182 $self->_draw; 3698 $self->_draw;
3183} 3699}
3184 3700
3185############################################################################# 3701#############################################################################
3186 3702

Diff Legend

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