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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 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 {
301} 376}
302 377
303sub set_max_size { 378sub set_max_size {
304 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 383}
309 384
310sub set_tooltip { 385sub set_tooltip {
311 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
312 392
313 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
314 394
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 418 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
340 420
341 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
342 422
343 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
344 424
345 $focus->update if $focus; 425 $focus->update if $focus;
346 $FOCUS->update; 426 $FOCUS->update;
347} 427}
348 428
… …
351 431
352 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
353 433
354 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
355 435
356 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
357 437
358 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
359} 442}
360 443
361sub mouse_motion { } 444sub mouse_motion { }
362sub button_up { } 445sub button_up { }
363sub key_down { } 446sub key_down { }
364sub key_up { } 447sub key_up { }
365 448
366sub button_down { 449sub button_down {
367 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
368 451
369 $self->focus_in; 452 $self->focus_in;
370} 453}
371 454
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 528
378sub draw { 529sub draw {
379 my ($self) = @_; 530 my ($self) = @_;
380 531
381 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 543
383 glPushMatrix; 544 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 546 $self->_draw;
386 glPopMatrix; 547 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
399 glEnd; 560 glEnd;
400 glDisable GL_BLEND; 561 glDisable GL_BLEND;
401 } 562 }
402 563
403 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 565 glPushMatrix;
405 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 569 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
412 glEnd; 573 glEnd;
413 glPopMatrix; 574 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 576 }
416} 577}
417 578
418sub _draw { 579sub _draw {
419 my ($self) = @_; 580 my ($self) = @_;
420 581
421 warn "no draw defined for $self\n"; 582 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} 583}
473 584
474sub DESTROY { 585sub DESTROY {
475 my ($self) = @_; 586 my ($self) = @_;
476 587
… …
534 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
536} 647}
537 648
538sub size_request { 649sub size_request {
539 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
540} 653}
541 654
542sub draw { } 655sub draw { }
543 656
544############################################################################# 657#############################################################################
… …
573 $self->{children} = [ 686 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
576 ]; 689 ];
577 690
578 $self->check_size (1); 691 $self->realloc;
579 $self->update;
580} 692}
581 693
582sub children { 694sub children {
583 @{ $_[0]{children} } 695 @{ $_[0]{children} }
584} 696}
… …
589 delete $child->{parent}; 701 delete $child->{parent};
590 $child->hide; 702 $child->hide;
591 703
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 705
594 $self->check_size; 706 $self->realloc;
595 $self->update;
596} 707}
597 708
598sub clear { 709sub clear {
599 my ($self) = @_; 710 my ($self) = @_;
600 711
… …
604 for (@$children) { 715 for (@$children) {
605 delete $_->{parent}; 716 delete $_->{parent};
606 $_->hide; 717 $_->hide;
607 } 718 }
608 719
609 $self->check_size; 720 $self->realloc;
610 $self->update;
611} 721}
612 722
613sub find_widget { 723sub find_widget {
614 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
615 725
… …
702 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 813 $self->update;
704} 814}
705 815
706sub _render { 816sub _render {
817 my ($self) = @_;
818
707 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
708} 820}
709 821
710sub render_child { 822sub render_child {
711 my ($self) = @_; 823 my ($self) = @_;
712 824
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
716 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
717 $self->_render; 836 $self->_render;
718 }; 837 };
719} 838}
720 839
721sub _draw { 840sub _draw {
722 my ($self) = @_; 841 my ($self) = @_;
723 842
724 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
725 844
726 my $tex = $self->{texture} 845 my $tex = $self->{texture}
727 or return; 846 or return;
728 847
729 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
… …
739 858
740package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
741 860
742our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
743 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
744sub size_request { 873sub size_request {
745 my ($self) = @_; 874 my ($self) = @_;
746 875
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 877
750 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
751} 882}
752 883
753sub size_allocate { 884sub size_allocate {
754 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
755 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
756 $self->update; 893 $self->update;
757} 894}
758 895
759sub set_offset { 896sub set_offset {
760 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
794} 931}
795 932
796sub _render { 933sub _render {
797 my ($self) = @_; 934 my ($self) = @_;
798 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 940
801 $self->SUPER::_render; 941 $self->SUPER::_render;
802} 942}
803 943
… …
811 my $class = shift; 951 my $class = shift;
812 952
813 my $self; 953 my $self;
814 954
815 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
816 vertical => 1, 956 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 958 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
820 }, 960 },
821 ; 961 ;
822 962
823 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 964 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
832 972
833 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 993}
835 994
836#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 996# update viewport offset on scroll
838 997
… …
882 1041
883our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
884 1043
885use CFClient::OpenGL; 1044use CFClient::OpenGL;
886 1045
887my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1053
891sub new { 1054sub new {
892 my $class = shift; 1055 my ($class, %arg) = @_;
893 1056
894 # TODO: user_x, user_y, overwrite moveto? 1057 my $title = delete $arg{title};
895 1058
896 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1062 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1063 can_events => 1,
902 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
903 ); 1067 );
904 1068
905 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
906 align => 0, 1070 align => 0,
907 valign => 1, 1071 valign => 1,
908 text => $self->{title}, 1072 text => $title,
909 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
910 1075
911 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
912} 1084}
913 1085
914sub border { 1086sub border {
915 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
916} 1088}
917 1089
918sub size_request { 1090sub size_request {
919 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
920 1095
921 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
922 1097
923 ( 1098 (
924 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
927} 1102}
928 1103
929sub size_allocate { 1104sub size_allocate {
930 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
931 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
932 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
934 1117
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
939} 1119}
940 1120
941sub button_down { 1121sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
943 1123
… …
959 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
960 1140
961 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
963 1143
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1149 };
969 1150
970 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1155 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
976 1157
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
978 1159
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1161 };
982 } 1162 }
983} 1163}
984 1164
985sub button_up { 1165sub button_up {
… …
995} 1175}
996 1176
997sub _draw { 1177sub _draw {
998 my ($self) = @_; 1178 my ($self) = @_;
999 1179
1180 my $child = $self->{children}[0];
1181
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1184
1003 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1187
1006 my $border = $self->border; 1188 my $border = $self->border;
1007 1189
1008 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1195
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
1016 1198
1017 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1204 }
1028 1205
1029 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1030 1207
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1034} 1214}
1035 1215
1036############################################################################# 1216#############################################################################
1037 1217
1038package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1046sub new { 1226sub new {
1047 my $class = shift; 1227 my $class = shift;
1048 1228
1049 $class->SUPER::new ( 1229 $class->SUPER::new (
1050 col_expand => [], 1230 col_expand => [],
1051 @_ 1231 @_,
1052 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1237}
1054 1238
1055sub add { 1239sub add {
1056 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1057 1241
1058 $child->set_parent ($self); 1242 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1060 1244
1061 $child->check_size; 1245 $self->realloc;
1062} 1246}
1063 1247
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1249sub clear {
1070 my ($self) = @_; 1250 my ($self) = @_;
1071 1251
1072 my @children = $self->children; 1252 my @children = $self->children;
1073 delete $self->{children}; 1253 delete $self->{children};
… …
1075 for (@children) { 1255 for (@children) {
1076 delete $_->{parent}; 1256 delete $_->{parent};
1077 $_->hide; 1257 $_->hide;
1078 } 1258 }
1079 1259
1080 $self->update; 1260 $self->realloc;
1081} 1261}
1082 1262
1083sub get_wh { 1263sub get_wh {
1084 my ($self) = @_; 1264 my ($self) = @_;
1085 1265
… …
1116sub size_allocate { 1296sub size_allocate {
1117 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1118 1298
1119 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1120 1300
1121 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1123 1303
1124 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1361 }
1182} 1362}
1183 1363
1184############################################################################# 1364#############################################################################
1185 1365
1186package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1367
1190our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1191 1369
1192sub size_request { 1370sub size_request {
1193 my ($self) = @_; 1371 my ($self) = @_;
1194 1372
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1196 1374 ? (
1197 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1377 )
1200 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1201} 1382}
1202 1383
1203sub size_allocate { 1384sub size_allocate {
1204 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1205 1386
1206 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1388 my $children = $self->{children};
1209 1389
1210 my @h = map $_->{req_w}, @$children; 1390 my @req;
1211 1391
1212 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1213 1393 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1408 }
1228 } 1409 }
1229 1410
1230 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1231 1412
1232 my $y = 0; 1413 my $pos = 0;
1233 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1417
1238 $y += $h; 1418 $pos += $alloc;
1239 } 1419 }
1240 1420
1241 1 1421 1
1242} 1422}
1243 1423
1244############################################################################# 1424#############################################################################
1245 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1246package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1247 1442
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1251 1444
1252sub size_request { 1445sub new {
1253 my ($self) = @_; 1446 my $class = shift;
1254 1447
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1256 1449 vertical => 1,
1257 ( 1450 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1451 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1452}
1301 1453
1302############################################################################# 1454#############################################################################
1303 1455
1304package CFClient::UI::Label; 1456package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1473 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1323 fontsize => 1, 1475 fontsize => 1,
1324 align => -1, 1476 align => -1,
1325 valign => -1, 1477 valign => -1,
1326 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1327 can_events => 0, 1480 can_events => 0,
1328 %arg 1481 %arg
1329 ); 1482 );
1330 1483
1331 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1368 1521
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1371 1524
1525 $self->realloc;
1372 $self->update; 1526 $self->update;
1373 $self->check_size;
1374} 1527}
1375 1528
1376sub set_markup { 1529sub set_markup {
1377 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1378 1531
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1536
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1386 1539
1540 $self->realloc;
1387 $self->update; 1541 $self->update;
1388 $self->check_size;
1389} 1542}
1390 1543
1391sub size_request { 1544sub size_request {
1392 my ($self) = @_; 1545 my ($self) = @_;
1393 1546
… …
1407 1560
1408 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1410 } 1563 }
1411 1564
1412 ( 1565 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1566}
1417 1567
1418sub size_allocate { 1568sub size_allocate {
1419 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1420 1570
1571 delete $self->{ox};
1572
1421 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1575}
1423 1576
1424sub set_fontsize { 1577sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1426 1579
1427 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1581 delete $self->{texture};
1429 1582
1430 $self->update; 1583 $self->realloc;
1431 $self->check_size;
1432} 1584}
1433 1585
1434sub _draw { 1586sub _draw {
1435 my ($self) = @_; 1587 my ($self) = @_;
1436 1588
… …
1442 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1598
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1448 1601
1602 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1452 1606
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1610 };
1459 1611
1460 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1614
… …
1488 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1489 can_hover => 1, 1641 can_hover => 1,
1490 can_focus => 1, 1642 can_focus => 1,
1491 valign => 0, 1643 valign => 0,
1492 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1493 @_ 1646 @_
1494 ) 1647 )
1495} 1648}
1496 1649
1497sub _set_text { 1650sub _set_text {
… …
1507 $self->{text} = $text; 1660 $self->{text} = $text;
1508 1661
1509 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1511 1664
1512 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1513} 1666}
1514 1667
1515sub set_text { 1668sub set_text {
1516 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1517 1670
1518 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1672 $self->_set_text ($text);
1520 $self->update; 1673
1521 $self->check_size; 1674 $self->realloc;
1522} 1675}
1523 1676
1524sub get_text { 1677sub get_text {
1525 $_[0]{text} 1678 $_[0]{text}
1526} 1679}
… …
1529 my ($self) = @_; 1682 my ($self) = @_;
1530 1683
1531 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1532 1685
1533 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1687}
1541 1688
1542sub key_down { 1689sub key_down {
1543 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1544 1691
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1710 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1711 $self->_emit ('escape');
1565 } elsif ($uni) { 1712 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1714 }
1568 1715
1569 $self->_set_text ($text); 1716 $self->_set_text ($text);
1570 $self->update; 1717
1571 $self->check_size; 1718 $self->realloc;
1572} 1719}
1573 1720
1574sub focus_in { 1721sub focus_in {
1575 my ($self) = @_; 1722 my ($self) = @_;
1576 1723
… …
1656 if ($sym == 13) { 1803 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1662 $self->update; 1809 $self->update;
1663 1810
1664 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1703 1850
1704sub new { 1851sub new {
1705 my $class = shift; 1852 my $class = shift;
1706 1853
1707 $class->SUPER::new ( 1854 $class->SUPER::new (
1708 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1709 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1711 can_hover => 1, 1859 can_hover => 1,
1712 align => 0, 1860 align => 0,
1713 valign => 0, 1861 valign => 0,
1714 can_events => 1, 1862 can_events => 1,
1715 @_ 1863 @_
1716 ) 1864 )
1717} 1865}
1718 1866
1867sub activate { }
1868
1719sub button_up { 1869sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1721 1871
1872 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1875}
1727 1876
1728sub _draw { 1877sub _draw {
1729 my ($self) = @_; 1878 my ($self) = @_;
1730 1879
… …
1759 1908
1760sub new { 1909sub new {
1761 my $class = shift; 1910 my $class = shift;
1762 1911
1763 $class->SUPER::new ( 1912 $class->SUPER::new (
1764 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1765 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1919 state => 0,
… …
1773} 1923}
1774 1924
1775sub size_request { 1925sub size_request {
1776 my ($self) = @_; 1926 my ($self) = @_;
1777 1927
1778 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1779} 1929}
1780 1930
1781sub button_down { 1931sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1783 1933
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1788 } 1938 }
1789} 1939}
1790 1940
1791sub _draw { 1941sub _draw {
1792 my ($self) = @_; 1942 my ($self) = @_;
1793 1943
1794 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1795 1945
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1947
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1951
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1953
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1955
… …
2067 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2075 vertical => 0, 2227 vertical => 0,
2076 can_hover => 1, 2228 can_hover => 1,
2077 inner_pad => 0.02, 2229 inner_pad => 0.02,
2078 @_ 2230 @_
2079 ); 2231 );
… …
2082 $self->update; 2234 $self->update;
2083 2235
2084 $self 2236 $self
2085} 2237}
2086 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2087sub set_value { 2250sub set_value {
2088 my ($self, $value) = @_; 2251 my ($self, $value) = @_;
2089 2252
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2254
2092 $hi = $lo + 1 if $hi <= $lo; 2255 $hi = $lo + 1 if $hi <= $lo;
2093 2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2094 $value = $lo if $value < $lo; 2259 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2260 $value = $hi - $page if $value > $hi - $page;
2096 2261
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2263 if $unit;
2099 2264
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2266
2104 if ($value != $old_value) { 2267 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2268 $self->_emit (changed => $value);
2106 $self->update; 2269 $self->update;
2107 } 2270 }
2108} 2271}
2109 2272
2110sub size_request { 2273sub size_request {
2111 my ($self) = @_; 2274 my ($self) = @_;
2112 2275
2113 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2277}
2118 2278
2119sub button_down { 2279sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2121 2281
2122 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
2123 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
2124} 2287}
2125 2288
2126sub mouse_motion { 2289sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2294
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2296
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2298
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2300 }
2138} 2301}
2139 2302
2140sub update { 2303sub update {
2141 my ($self) = @_; 2304 my ($self) = @_;
2142 2305
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2307 $self->set_value ($self->{range}[0]);
2145 2308
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2147 2311
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2313
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2316
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2317 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2318 $value = $value * $self->{scale} + $self->{offset};
2154 2319
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2321 $self->{knob_w} = $knob_w;
2162 }); 2322 });
2163 2323
2164 $self->SUPER::update; 2324 $self->SUPER::update;
2165} 2325}
2166 2326
… …
2190 # draw handle 2350 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2352
2193 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2194} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2195 2396
2196############################################################################# 2397#############################################################################
2197 2398
2198package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2199 2400
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2443
2243 $self->reflow; 2444 $self->reflow;
2244} 2445}
2245 2446
2246sub text_height { 2447sub text_size {
2247 my ($self, $text, $indent) = @_; 2448 my ($self, $text, $indent) = @_;
2248 2449
2249 my $layout = $self->{layout}; 2450 my $layout = $self->{layout};
2250 2451
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2454 $layout->set_markup ($text);
2254 2455
2255 ($layout->size)[1] 2456 $layout->size
2256} 2457}
2257 2458
2258sub reflow { 2459sub reflow {
2259 my ($self) = @_; 2460 my ($self) = @_;
2260 2461
2261 $self->{need_reflow}++; 2462 $self->{need_reflow}++;
2262 $self->update; 2463 $self->update;
2263} 2464}
2264 2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2265sub add_paragraph { 2481sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2267 2483
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2484 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2485 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2486 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2488 }
2275 2489
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2491}
2279 2492
2280sub update { 2493sub update {
2281 my ($self) = @_; 2494 my ($self) = @_;
2282 2495
… …
2285 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2286 2499
2287 delete $self->{texture}; 2500 delete $self->{texture};
2288 2501
2289 $ROOT->on_post_alloc ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2290 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2506 my $height = 0;
2292 2507
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2294 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2295 2523
2296 $self->{height} = $height; 2524 $self->{height} = $height;
2297 2525
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2527
2301 delete $self->{texture}; 2528 delete $self->{texture};
2302 } 2529 }
2303 2530
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2307 2534
2308 my $top = int $self->{children}[1]{range}[0]; 2535 my $top = int $self->{children}[1]{range}[0];
2309 2536
2310 my $y0 = $top; 2537 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2538 my $y1 = $top + $H;
2312 2539
2313 my $y = 0; 2540 my $y = 0;
2314 2541
2315 my $layout = $self->{layout}; 2542 my $layout = $self->{layout};
2316 2543
2317 $layout->set_font ($self->{font}) if $self->{font}; 2544 $layout->set_font ($self->{font}) if $self->{font};
2318 2545
2319 glEnable GL_BLEND; 2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2549
2322 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2551 my $h = $par->[1];
2324 2552
2325 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2554 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2555 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2556 $layout->set_markup ($par->[4]);
2329 2557
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2559
2332 glRasterPos $par->[2], $y - $y0; 2560 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2562 }
2335 2563
2336 $y += $h; 2564 $y += $h;
2337 } 2565 }
… …
2404 2632
2405sub new { 2633sub new {
2406 my $class = shift; 2634 my $class = shift;
2407 2635
2408 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2409 state => 0, 2637 state => 0,
2410 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2411 @_ 2639 @_
2412 ); 2640 );
2413 2641
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2642 $self
2420} 2643}
2421 2644
2422sub toggle_flopper { 2645sub toggle_flopper {
2423 my ($self) = @_; 2646 my ($self) = @_;
2424 2647
2425 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2649}
2437 2650
2438############################################################################# 2651#############################################################################
2439 2652
2440package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2453} 2666}
2454 2667
2455sub set_tooltip_from { 2668sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2457 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2458 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2683 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2685 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2697
2476sub size_allocate { 2698sub size_allocate {
2477 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2478 2700
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2702}
2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2480} 2720}
2481 2721
2482sub _draw { 2722sub _draw {
2483 my ($self) = @_; 2723 my ($self) = @_;
2484 2724
… …
2501 glVertex $w, $h; 2741 glVertex $w, $h;
2502 glVertex $w, 0; 2742 glVertex $w, 0;
2503 glEnd; 2743 glEnd;
2504 2744
2505 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2506 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2507} 2748}
2508 2749
2509############################################################################# 2750#############################################################################
2510 2751
… …
2516 2757
2517sub new { 2758sub new {
2518 my $class = shift; 2759 my $class = shift;
2519 2760
2520 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2521 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2522 @_, 2764 @_,
2523 ); 2765 );
2524 2766
2525 if ($self->{anim} && $self->{animspeed}) { 2767 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2768 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2794}
2553 2795
2554sub _draw { 2796sub _draw {
2555 my ($self) = @_; 2797 my ($self) = @_;
2556 2798
2557 return unless $::CONN;#d# manage and cache textures differently 2799 return unless $::CONN;
2558 2800
2559 my $face; 2801 my $face;
2560 2802
2561 if ($self->{frame}) { 2803 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2804 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2581 2823
2582 $self->{timer}->cancel 2824 $self->{timer}->cancel
2583 if $self->{timer}; 2825 if $self->{timer};
2584 2826
2585 $self->SUPER::DESTROY; 2827 $self->SUPER::DESTROY;
2586}
2587
2588#############################################################################
2589
2590package CFClient::UI::InventoryItem;
2591
2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) {
2649 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653 (
2654 $item->{flags} & Crossfire::Protocol::F_LOCKED
2655 ? (
2656 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657 )
2658 : (
2659 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661 )
2662 ),
2663 );
2664
2665 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666 }
2667
2668 1
2669 },
2670 %args
2671 );
2672
2673
2674 $self->add (new CFClient::UI::Face
2675 can_events => 0,
2676 face => $item->{face},
2677 anim => $item->{anim},
2678 animspeed => $item->{animspeed},
2679 );
2680
2681 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683 $self->{item} = $item;
2684
2685 $self->update_item;
2686
2687 $self
2688}
2689
2690sub update_item {
2691 my ($self) = @_;
2692
2693 my $desc = _item_to_desc ($self->{item});
2694
2695 $self->{name_lbl}->set_text ($desc);
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::Inventory;
2701
2702our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox),
2709 @_,
2710 );
2711
2712 $self
2713}
2714
2715sub set_items {
2716 my ($self, $items) = @_;
2717
2718 $self->{scrolled}->clear;
2719 return unless $items;
2720
2721 my @items = sort {
2722 ($a->{type} <=> $b->{type})
2723 or ($a->{name} cmp $b->{name})
2724 } @$items;
2725
2726 $self->{real_items} = \@items;
2727
2728 for my $item (@items) {
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2730 $item->update_item ();
2731 }
2732
2733 $self->{scrolled}->add (@items);
2734
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2736}
2737
2738sub size_request {
2739 my ($self) = @_;
2740 ($self->{req_w}, $self->{req_h});
2741} 2828}
2742 2829
2743############################################################################# 2830#############################################################################
2744 2831
2745package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
… …
2780 2867
2781# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2782sub popup { 2869sub popup {
2783 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2784 2871
2785 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2786 2873
2787 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 2875 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2790 2877
2791 $self->show; 2878 $self->show;
2792 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2793} 2880}
2794 2881
2795sub mouse_motion { 2882sub mouse_motion {
2796 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2797 2884
… …
2805 2892
2806 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 2894 undef $GRAB;
2808 $self->hide; 2895 $self->hide;
2809 2896
2810 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2812 } 2899 }
2813} 2900}
2814 2901
2815############################################################################# 2902#############################################################################
… …
2877sub add { 2964sub add {
2878 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2879 2966
2880 $text =~ s/^\s+//; 2967 $text =~ s/^\s+//;
2881 $text =~ s/\s+$//; 2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2882 2971
2883 my $timeout = time + ((delete $arg{timeout}) || 60); 2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2884 2973
2885 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886 2975
… …
2920 $self->SUPER::reconfigure; 3009 $self->SUPER::reconfigure;
2921} 3010}
2922 3011
2923############################################################################# 3012#############################################################################
2924 3013
2925package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
2926 3015
2927our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
2928
2929use CFClient::OpenGL;
2930 3017
2931sub new { 3018sub new {
2932 my $class = shift; 3019 my $class = shift;
2933 3020
2934 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2935 @_, 3023 @_,
2936 ) 3024 );
2937}
2938 3025
2939sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
2940 my ($self, $x, $y, $w, $h) = @_; 3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2941 3175
2942 $self->{w} = $w; 3176 $self->clear_command_list;
2943 $self->{h} = $h; 3177 $self->{recording} = 0;
2944} 3178 $self->{rec_btn}->set_text ("start recording");
2945 3179
2946sub check_size { 3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
2947 my ($self) = @_; 3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
2948 3198
2949 $self->size_allocate ($self->{w}, $self->{h}) 3199sub update_binding_widgets {
2950 if $self->{w}; 3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
3305package CFClient::UI::Root;
3306
3307our @ISA = CFClient::UI::Container::;
3308
3309use CFClient::OpenGL;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
2951} 3322}
2952 3323
2953sub size_request { 3324sub size_request {
2954 my ($self) = @_; 3325 my ($self) = @_;
2955 3326
2956 ($self->{w}, $self->{h}) 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
2957} 3342}
2958 3343
2959sub size_allocate { 3344sub size_allocate {
2960 my ($self, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
2961 3346
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967
2968 for my $child ($self->children) { 3347 for my $child ($self->children) {
2969 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2970 3349
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3350 $X = $child->{force_x} if exists $child->{force_x};
2972 if exists $child->{req_x}; 3351 $Y = $child->{force_y} if exists $child->{force_y};
2973 3352
2974 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3353 $X = _to_pixel $X, $W, $self->{w};
2975 if exists $child->{req_y}; 3354 $Y = _to_pixel $Y, $H, $self->{h};
2976
2977 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2978 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2979 3355
2980 $child->configure ($X, $Y, $W, $H); 3356 $child->configure ($X, $Y, $W, $H);
2981 } 3357 }
2982} 3358}
2983 3359
… …
2994} 3370}
2995 3371
2996sub update { 3372sub update {
2997 my ($self) = @_; 3373 my ($self) = @_;
2998 3374
2999 $self->check_size;
3000 $::WANT_REFRESH++; 3375 $::WANT_REFRESH++;
3001} 3376}
3002 3377
3003sub add { 3378sub add {
3004 my ($self, @children) = @_; 3379 my ($self, @children) = @_;
3005 3380
3006 for my $child (@children) {
3007 $child->{toplevel} = 1; 3381 $_->{is_toplevel} = 1
3008 3382 for @children;
3009 # integerise window positions
3010 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y};
3012 }
3013 3383
3014 $self->SUPER::add (@children); 3384 $self->SUPER::add (@children);
3385}
3386
3387sub remove {
3388 my ($self, @children) = @_;
3389
3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3015 3394
3016 while (@children) { 3395 while (@children) {
3017 my $w = pop @children; 3396 my $w = pop @children;
3018 push @children, $w->children; 3397 push @children, $w->children;
3019 $w->{visible} = 1; 3398 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3399 }
3033} 3400}
3034 3401
3035sub on_refresh { 3402sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3403 my ($self, $id, $cb) = @_;
… …
3050 while ($self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
3051 $_->() 3418 $_->()
3052 for values %{delete $self->{refresh_hook}}; 3419 for values %{delete $self->{refresh_hook}};
3053 } 3420 }
3054 3421
3055 if ($self->{check_size}) { 3422 if ($self->{realloc}) {
3056 my @queue = ([], []); 3423 my %queue;
3424 my @queue;
3425 my $widget;
3057 3426
3058 for (;;) { 3427 outer:
3059 if ($self->{check_size}) { 3428 while () {
3060 # heuristic: check containers last 3429 if (my $realloc = delete $self->{realloc}) {
3061 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3430 for $widget (values %$realloc) {
3062 for values %{delete $self->{check_size}} 3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
3063 } 3437 }
3064 3438
3065 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3439 while () {
3440 @queue or last outer;
3066 3441
3067 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3442 $widget = pop @{ $queue[-1] || [] }
3068 ? @$widget{qw(user_w user_h)} 3443 and last;
3069 : $widget->size_request;
3070
3071 if (delete $widget->{force_alloc}
3072 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3073 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3074 3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
3075 $widget->{req_w} = $w; 3460 $widget->{req_w} = $w;
3076 $widget->{req_h} = $h; 3461 $widget->{req_h} = $h;
3077 3462
3078 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3463 $self->{size_alloc}{$widget+0} = $widget;
3079 3464
3080 $widget->{parent}->check_size
3081 if $widget->{parent}; 3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
3082 } 3472 }
3473
3474 delete $self->{realloc}{$widget+0};
3083 } 3475 }
3084 } 3476 }
3085 3477
3086 while ($self->{size_alloc}) { 3478 while (my $size_alloc = delete $self->{size_alloc}) {
3087 for (values %{delete $self->{size_alloc}}) { 3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3088 my ($widget, $w, $h) = @$_; 3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3089 3486
3090 $w = 0 if $w < 0; 3487 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3488 $h = 0 if $h < 0;
3092 3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3093 $widget->{w} = $w; 3497 $widget->{w} = $w;
3094 $widget->{h} = $h; 3498 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h); 3499
3096 $widget->emit (size_allocate => $w, $h); 3500 $widget->emit (size_allocate => $w, $h);
3501 }
3097 } 3502 }
3098 } 3503 }
3099 3504
3100 while ($self->{post_alloc_hook}) { 3505 while ($self->{post_alloc_hook}) {
3101 $_->() 3506 $_->()
3102 for values %{delete $self->{post_alloc_hook}}; 3507 for values %{delete $self->{post_alloc_hook}};
3103 } 3508 }
3509
3104 3510
3105 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3106 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3107 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
3108 3514
… …
3110 glLoadIdentity; 3516 glLoadIdentity;
3111 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3112 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
3113 glLoadIdentity; 3519 glLoadIdentity;
3114 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
3115 $self->_draw; 3528 $self->_draw;
3116} 3529}
3117 3530
3118############################################################################# 3531#############################################################################
3119 3532

Diff Legend

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