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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 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} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $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} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $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 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
382 541
383 glPushMatrix; 542 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 544 $self->_draw;
386 glPopMatrix; 545 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
399 glEnd; 558 glEnd;
400 glDisable GL_BLEND; 559 glDisable GL_BLEND;
401 } 560 }
402 561
403 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 563 glPushMatrix;
405 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 567 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
412 glEnd; 571 glEnd;
413 glPopMatrix; 572 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 574 }
416} 575}
417 576
418sub _draw { 577sub _draw {
419 my ($self) = @_; 578 my ($self) = @_;
420 579
421 warn "no draw defined for $self\n"; 580 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} 581}
473 582
474sub DESTROY { 583sub DESTROY {
475 my ($self) = @_; 584 my ($self) = @_;
476 585
… …
534 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
536} 645}
537 646
538sub size_request { 647sub size_request {
539 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
540} 651}
541 652
542sub draw { } 653sub draw { }
543 654
544############################################################################# 655#############################################################################
… …
573 $self->{children} = [ 684 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
576 ]; 687 ];
577 688
578 $self->check_size (1); 689 $self->realloc;
579 $self->update;
580} 690}
581 691
582sub children { 692sub children {
583 @{ $_[0]{children} } 693 @{ $_[0]{children} }
584} 694}
… …
589 delete $child->{parent}; 699 delete $child->{parent};
590 $child->hide; 700 $child->hide;
591 701
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 703
594 $self->check_size; 704 $self->realloc;
595 $self->update;
596} 705}
597 706
598sub clear { 707sub clear {
599 my ($self) = @_; 708 my ($self) = @_;
600 709
… …
604 for (@$children) { 713 for (@$children) {
605 delete $_->{parent}; 714 delete $_->{parent};
606 $_->hide; 715 $_->hide;
607 } 716 }
608 717
609 $self->check_size; 718 $self->realloc;
610 $self->update;
611} 719}
612 720
613sub find_widget { 721sub find_widget {
614 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
615 723
… …
702 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 811 $self->update;
704} 812}
705 813
706sub _render { 814sub _render {
815 my ($self) = @_;
816
707 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
708} 818}
709 819
710sub render_child { 820sub render_child {
711 my ($self) = @_; 821 my ($self) = @_;
712 822
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
716 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
717 $self->_render; 834 $self->_render;
718 }; 835 };
719} 836}
720 837
721sub _draw { 838sub _draw {
722 my ($self) = @_; 839 my ($self) = @_;
723 840
724 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
725 842
726 my $tex = $self->{texture} 843 my $tex = $self->{texture}
727 or return; 844 or return;
728 845
729 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
… …
739 856
740package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
741 858
742our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
743 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
744sub size_request { 871sub size_request {
745 my ($self) = @_; 872 my ($self) = @_;
746 873
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 875
750 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
751} 880}
752 881
753sub size_allocate { 882sub size_allocate {
754 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
755 884
885 my $child = $self->child;
886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
890 $self->child->configure (0, 0, $w, $h);
756 $self->update; 891 $self->update;
757} 892}
758 893
759sub set_offset { 894sub set_offset {
760 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
794} 929}
795 930
796sub _render { 931sub _render {
797 my ($self) = @_; 932 my ($self) = @_;
798 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 938
801 $self->SUPER::_render; 939 $self->SUPER::_render;
802} 940}
803 941
… …
811 my $class = shift; 949 my $class = shift;
812 950
813 my $self; 951 my $self;
814 952
815 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
816 vertical => 1, 954 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 956 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
820 }, 958 },
821 ; 959 ;
822 960
823 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 962 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
832 970
833 $self 971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 991}
835 992
836#TODO# update range on size_allocate depending on child 993#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 994# update viewport offset on scroll
838 995
… …
882 1039
883our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
884 1041
885use CFClient::OpenGL; 1042use CFClient::OpenGL;
886 1043
887my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 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); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1051
891sub new { 1052sub new {
892 my $class = shift; 1053 my $class = shift;
893 1054
894 # TODO: user_x, user_y, overwrite moveto?
895
896 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1058 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
902 @_ 1062 @_
903 ); 1063 );
904 1064
905 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 1066 align => 0,
… …
959 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
960 1120
961 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
963 1123
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1129 };
969 1130
970 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1135 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
976 1137
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
978 1139
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1141 };
982 } 1142 }
983} 1143}
984 1144
985sub button_up { 1145sub button_up {
… …
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1165
1006 my $border = $self->border; 1166 my $border = $self->border;
1007 1167
1008 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1173
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
1016 1176
1017 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1180 $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); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1182 }
1028 1183
1029 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
1030 1185
… …
1046sub new { 1201sub new {
1047 my $class = shift; 1202 my $class = shift;
1048 1203
1049 $class->SUPER::new ( 1204 $class->SUPER::new (
1050 col_expand => [], 1205 col_expand => [],
1051 @_ 1206 @_,
1052 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1212}
1054 1213
1055sub add { 1214sub add {
1056 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1057 1216
1058 $child->set_parent ($self); 1217 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1060 1219
1061 $child->check_size; 1220 $self->realloc;
1062} 1221}
1063 1222
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1224sub clear {
1070 my ($self) = @_; 1225 my ($self) = @_;
1071 1226
1072 my @children = $self->children; 1227 my @children = $self->children;
1073 delete $self->{children}; 1228 delete $self->{children};
… …
1075 for (@children) { 1230 for (@children) {
1076 delete $_->{parent}; 1231 delete $_->{parent};
1077 $_->hide; 1232 $_->hide;
1078 } 1233 }
1079 1234
1080 $self->update; 1235 $self->realloc;
1081} 1236}
1082 1237
1083sub get_wh { 1238sub get_wh {
1084 my ($self) = @_; 1239 my ($self) = @_;
1085 1240
… …
1116sub size_allocate { 1271sub size_allocate {
1117 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1118 1273
1119 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1120 1275
1121 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1123 1278
1124 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1336 }
1182} 1337}
1183 1338
1184############################################################################# 1339#############################################################################
1185 1340
1186package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1342
1190our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1191 1344
1192sub size_request { 1345sub size_request {
1193 my ($self) = @_; 1346 my ($self) = @_;
1194 1347
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1196 1349 ? (
1197 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1352 )
1200 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1201} 1357}
1202 1358
1203sub size_allocate { 1359sub size_allocate {
1204 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1205 1361
1206 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1363 my $children = $self->{children};
1209 1364
1210 my @h = map $_->{req_w}, @$children; 1365 my @req;
1211 1366
1212 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1213 1368 @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 { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1382 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 } 1383 }
1228 } 1384 }
1229 1385
1230 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1231 1387
1232 my $y = 0; 1388 my $pos = 0;
1233 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1392
1238 $y += $h; 1393 $pos += $alloc;
1239 } 1394 }
1240 1395
1241 1 1396 1
1242} 1397}
1243 1398
1244############################################################################# 1399#############################################################################
1245 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1246package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1247 1417
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1251 1419
1252sub size_request { 1420sub new {
1253 my ($self) = @_; 1421 my $class = shift;
1254 1422
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1256 1424 vertical => 1,
1257 ( 1425 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1426 )
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} 1427}
1301 1428
1302############################################################################# 1429#############################################################################
1303 1430
1304package CFClient::UI::Label; 1431package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1448 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1323 fontsize => 1, 1450 fontsize => 1,
1324 align => -1, 1451 align => -1,
1325 valign => -1, 1452 valign => -1,
1326 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1327 can_events => 0, 1455 can_events => 0,
1328 %arg 1456 %arg
1329 ); 1457 );
1330 1458
1331 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1368 1496
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1371 1499
1500 $self->realloc;
1372 $self->update; 1501 $self->update;
1373 $self->check_size;
1374} 1502}
1375 1503
1376sub set_markup { 1504sub set_markup {
1377 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1378 1506
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1511
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1386 1514
1515 $self->realloc;
1387 $self->update; 1516 $self->update;
1388 $self->check_size;
1389} 1517}
1390 1518
1391sub size_request { 1519sub size_request {
1392 my ($self) = @_; 1520 my ($self) = @_;
1393 1521
… …
1407 1535
1408 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1410 } 1538 }
1411 1539
1412 ( 1540 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1541}
1417 1542
1418sub size_allocate { 1543sub size_allocate {
1419 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1420 1545
1421 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1548}
1423 1549
1424sub set_fontsize { 1550sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1426 1552
1427 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1554 delete $self->{texture};
1429 1555
1430 $self->update; 1556 $self->realloc;
1431 $self->check_size;
1432} 1557}
1433 1558
1434sub _draw { 1559sub _draw {
1435 my ($self) = @_; 1560 my ($self) = @_;
1436 1561
… …
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1571
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448 1573
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1452 1577
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1456 1581
1457 $tex 1582 $tex
1458 }; 1583 };
1459 1584
… …
1488 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1489 can_hover => 1, 1614 can_hover => 1,
1490 can_focus => 1, 1615 can_focus => 1,
1491 valign => 0, 1616 valign => 0,
1492 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1493 @_ 1619 @_
1494 ) 1620 )
1495} 1621}
1496 1622
1497sub _set_text { 1623sub _set_text {
… …
1507 $self->{text} = $text; 1633 $self->{text} = $text;
1508 1634
1509 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1511 1637
1512 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1513} 1639}
1514 1640
1515sub set_text { 1641sub set_text {
1516 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1517 1643
1518 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1645 $self->_set_text ($text);
1520 $self->update; 1646
1521 $self->check_size; 1647 $self->realloc;
1522} 1648}
1523 1649
1524sub get_text { 1650sub get_text {
1525 $_[0]{text} 1651 $_[0]{text}
1526} 1652}
… …
1529 my ($self) = @_; 1655 my ($self) = @_;
1530 1656
1531 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1532 1658
1533 ($w + 1, $h) # add 1 for cursor 1659 ($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} 1660}
1541 1661
1542sub key_down { 1662sub key_down {
1543 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1544 1664
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1683 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1684 $self->_emit ('escape');
1565 } elsif ($uni) { 1685 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1687 }
1568 1688
1569 $self->_set_text ($text); 1689 $self->_set_text ($text);
1570 $self->update; 1690
1571 $self->check_size; 1691 $self->realloc;
1572} 1692}
1573 1693
1574sub focus_in { 1694sub focus_in {
1575 my ($self) = @_; 1695 my ($self) = @_;
1576 1696
… …
1656 if ($sym == 13) { 1776 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1662 $self->update; 1782 $self->update;
1663 1783
1664 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1703 1823
1704sub new { 1824sub new {
1705 my $class = shift; 1825 my $class = shift;
1706 1826
1707 $class->SUPER::new ( 1827 $class->SUPER::new (
1708 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1709 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1711 can_hover => 1, 1832 can_hover => 1,
1712 align => 0, 1833 align => 0,
1713 valign => 0, 1834 valign => 0,
1714 can_events => 1, 1835 can_events => 1,
1715 @_ 1836 @_
1716 ) 1837 )
1717} 1838}
1718 1839
1840sub activate { }
1841
1719sub button_up { 1842sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1721 1844
1845 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1848}
1727 1849
1728sub _draw { 1850sub _draw {
1729 my ($self) = @_; 1851 my ($self) = @_;
1730 1852
… …
1759 1881
1760sub new { 1882sub new {
1761 my $class = shift; 1883 my $class = shift;
1762 1884
1763 $class->SUPER::new ( 1885 $class->SUPER::new (
1764 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1765 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1890 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1891 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1892 state => 0,
… …
1773} 1896}
1774 1897
1775sub size_request { 1898sub size_request {
1776 my ($self) = @_; 1899 my ($self) = @_;
1777 1900
1778 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1779} 1902}
1780 1903
1781sub button_down { 1904sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1783 1906
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1788 } 1911 }
1789} 1912}
1790 1913
1791sub _draw { 1914sub _draw {
1792 my ($self) = @_; 1915 my ($self) = @_;
1793 1916
1794 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1795 1918
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1920
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1924
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1926
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1928
… …
2067 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2195 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2196 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2075 vertical => 0, 2200 vertical => 0,
2076 can_hover => 1, 2201 can_hover => 1,
2077 inner_pad => 0.02, 2202 inner_pad => 0.02,
2078 @_ 2203 @_
2079 ); 2204 );
… …
2082 $self->update; 2207 $self->update;
2083 2208
2084 $self 2209 $self
2085} 2210}
2086 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2087sub set_value { 2223sub set_value {
2088 my ($self, $value) = @_; 2224 my ($self, $value) = @_;
2089 2225
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2227
2092 $hi = $lo + 1 if $hi <= $lo; 2228 $hi = $lo + 1 if $hi <= $lo;
2093 2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2094 $value = $lo if $value < $lo; 2232 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2233 $value = $hi - $page if $value > $hi - $page;
2096 2234
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2236 if $unit;
2099 2237
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2239
2104 if ($value != $old_value) { 2240 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2241 $self->_emit (changed => $value);
2106 $self->update; 2242 $self->update;
2107 } 2243 }
2108} 2244}
2109 2245
2110sub size_request { 2246sub size_request {
2111 my ($self) = @_; 2247 my ($self) = @_;
2112 2248
2113 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2250}
2118 2251
2119sub button_down { 2252sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2121 2254
2122 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
2123 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2124} 2260}
2125 2261
2126sub mouse_motion { 2262sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2267
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2269
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2271
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2273 }
2138} 2274}
2139 2275
2140sub update { 2276sub update {
2141 my ($self) = @_; 2277 my ($self) = @_;
2142 2278
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2280 $self->set_value ($self->{range}[0]);
2145 2281
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2147 2284
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2286
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2289
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2290 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2291 $value = $value * $self->{scale} + $self->{offset};
2154 2292
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; 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2294 $self->{knob_w} = $knob_w;
2162 }); 2295 });
2163 2296
2164 $self->SUPER::update; 2297 $self->SUPER::update;
2165} 2298}
2166 2299
… …
2190 # draw handle 2323 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2325
2193 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2194} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
2195 2369
2196############################################################################# 2370#############################################################################
2197 2371
2198package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2199 2373
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2416
2243 $self->reflow; 2417 $self->reflow;
2244} 2418}
2245 2419
2246sub text_height { 2420sub text_size {
2247 my ($self, $text, $indent) = @_; 2421 my ($self, $text, $indent) = @_;
2248 2422
2249 my $layout = $self->{layout}; 2423 my $layout = $self->{layout};
2250 2424
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2427 $layout->set_markup ($text);
2254 2428
2255 ($layout->size)[1] 2429 $layout->size
2256} 2430}
2257 2431
2258sub reflow { 2432sub reflow {
2259 my ($self) = @_; 2433 my ($self) = @_;
2260 2434
2261 $self->{need_reflow}++; 2435 $self->{need_reflow}++;
2262 $self->update; 2436 $self->update;
2263} 2437}
2264 2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2265sub add_paragraph { 2454sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2267 2456
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2457 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2458 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2459 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2461 }
2275 2462
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2464}
2279 2465
2280sub update { 2466sub update {
2281 my ($self) = @_; 2467 my ($self) = @_;
2282 2468
… …
2285 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2286 2472
2287 delete $self->{texture}; 2473 delete $self->{texture};
2288 2474
2289 $ROOT->on_post_alloc ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2290 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2479 my $height = 0;
2292 2480
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2294 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2295 2496
2296 $self->{height} = $height; 2497 $self->{height} = $height;
2297 2498
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2500
2301 delete $self->{texture}; 2501 delete $self->{texture};
2302 } 2502 }
2303 2503
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2307 2507
2308 my $top = int $self->{children}[1]{range}[0]; 2508 my $top = int $self->{children}[1]{range}[0];
2309 2509
2310 my $y0 = $top; 2510 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2312 2512
2313 my $y = 0; 2513 my $y = 0;
2314 2514
2315 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2316 2516
2317 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2318 2518
2319 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2522
2322 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2524 my $h = $par->[1];
2324 2525
2325 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2528 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2529 $layout->set_markup ($par->[4]);
2329 2530
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2532
2332 glRasterPos $par->[2], $y - $y0; 2533 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2535 }
2335 2536
2336 $y += $h; 2537 $y += $h;
2337 } 2538 }
… …
2404 2605
2405sub new { 2606sub new {
2406 my $class = shift; 2607 my $class = shift;
2407 2608
2408 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2409 state => 0, 2610 state => 0,
2410 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2411 @_ 2612 @_
2412 ); 2613 );
2413 2614
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2615 $self
2420} 2616}
2421 2617
2422sub toggle_flopper { 2618sub toggle_flopper {
2423 my ($self) = @_; 2619 my ($self) = @_;
2424 2620
2425 # TODO: use animation 2621 $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} 2622}
2437 2623
2438############################################################################# 2624#############################################################################
2439 2625
2440package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2453} 2639}
2454 2640
2455sub set_tooltip_from { 2641sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2457 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2458 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2656 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2658 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2670
2476sub size_allocate { 2671sub size_allocate {
2477 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2478 2673
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2480} 2693}
2481 2694
2482sub _draw { 2695sub _draw {
2483 my ($self) = @_; 2696 my ($self) = @_;
2484 2697
… …
2501 glVertex $w, $h; 2714 glVertex $w, $h;
2502 glVertex $w, 0; 2715 glVertex $w, 0;
2503 glEnd; 2716 glEnd;
2504 2717
2505 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2506 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2507} 2721}
2508 2722
2509############################################################################# 2723#############################################################################
2510 2724
… …
2516 2730
2517sub new { 2731sub new {
2518 my $class = shift; 2732 my $class = shift;
2519 2733
2520 my $self = $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2521 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2522 @_, 2737 @_,
2523 ); 2738 );
2524 2739
2525 if ($self->{anim} && $self->{animspeed}) { 2740 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2741 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2767}
2553 2768
2554sub _draw { 2769sub _draw {
2555 my ($self) = @_; 2770 my ($self) = @_;
2556 2771
2557 return unless $::CONN;#d# manage and cache textures differently 2772 return unless $::CONN;
2558 2773
2559 my $face; 2774 my $face;
2560 2775
2561 if ($self->{frame}) { 2776 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2777 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2581 2796
2582 $self->{timer}->cancel 2797 $self->{timer}->cancel
2583 if $self->{timer}; 2798 if $self->{timer};
2584 2799
2585 $self->SUPER::DESTROY; 2800 $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 - examine\nshift+leftclick - move/pickup/drop\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->{mod} & CFClient::KMOD_SHIFT) && $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} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749} 2801}
2750 2802
2751############################################################################# 2803#############################################################################
2752 2804
2753package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2788 2840
2789# popup given the event (must be a mouse button down event currently) 2841# popup given the event (must be a mouse button down event currently)
2790sub popup { 2842sub popup {
2791 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2792 2844
2793 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2794 2846
2795 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 2848 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2798 2850
2799 $self->show; 2851 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801} 2853}
2802 2854
2803sub mouse_motion { 2855sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2805 2857
… …
2813 2865
2814 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 2867 undef $GRAB;
2816 $self->hide; 2868 $self->hide;
2817 2869
2818 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2820 } 2872 }
2821} 2873}
2822 2874
2823############################################################################# 2875#############################################################################
… …
2885sub add { 2937sub add {
2886 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2887 2939
2888 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2890 2944
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2892 2946
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 2948
… …
2928 $self->SUPER::reconfigure; 2982 $self->SUPER::reconfigure;
2929} 2983}
2930 2984
2931############################################################################# 2985#############################################################################
2932 2986
2933package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2934 2988
2935our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 2990
2939sub new { 2991sub new {
2940 my $class = shift; 2992 my $class = shift;
2941 2993
2942 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2943 @_, 2996 @_,
2944 ) 2997 );
2945}
2946 2998
2947sub configure { 2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
2948 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2949 3148
2950 $self->{w} = $w; 3149 $self->clear_command_list;
2951 $self->{h} = $h; 3150 $self->{recording} = 0;
2952} 3151 $self->{rec_btn}->set_text ("start recording");
2953 3152
2954sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
2955 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
2956 3171
2957 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2958 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2959} 3295}
2960 3296
2961sub size_request { 3297sub size_request {
2962 my ($self) = @_; 3298 my ($self) = @_;
2963 3299
2964 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
2965} 3315}
2966 3316
2967sub size_allocate { 3317sub size_allocate {
2968 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2969 3319
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3320 for my $child ($self->children) {
2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978 3322
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
2981 3325
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3327 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3328
2988 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2989 } 3330 }
2990} 3331}
2991 3332
… …
3002} 3343}
3003 3344
3004sub update { 3345sub update {
3005 my ($self) = @_; 3346 my ($self) = @_;
3006 3347
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
3009} 3349}
3010 3350
3011sub add { 3351sub add {
3012 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
3013 3353
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3354 $_->{is_toplevel} = 1
3016 3355 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3356
3022 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3023 3367
3024 while (@children) { 3368 while (@children) {
3025 my $w = pop @children; 3369 my $w = pop @children;
3026 push @children, $w->children; 3370 push @children, $w->children;
3027 $w->{visible} = 1; 3371 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3372 }
3041} 3373}
3042 3374
3043sub on_refresh { 3375sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
3059 $_->() 3391 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
3061 } 3393 }
3062 3394
3063 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
3064 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
3065 3399
3066 for (;;) { 3400 outer:
3067 if ($self->{check_size}) { 3401 while () {
3068 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
3070 for values %{delete $self->{check_size}} 3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
3071 } 3410 }
3072 3411
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
3074 3414
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3416 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
3083 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
3085 3435
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
3087 3437
3088 $widget->{parent}->check_size
3089 if $widget->{parent}; 3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
3090 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
3091 } 3448 }
3092 } 3449 }
3093 3450
3094 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 my ($widget, $w, $h) = @$_; 3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3097 3459
3098 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
3100 3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3101 $widget->{w} = $w; 3470 $widget->{w} = $w;
3102 $widget->{h} = $h; 3471 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3472
3104 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
3105 } 3475 }
3106 } 3476 }
3107 3477
3108 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
3109 $_->() 3479 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
3111 } 3481 }
3482
3112 3483
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
3116 3487
… …
3118 glLoadIdentity; 3489 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3492 glLoadIdentity;
3122 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
3123 $self->_draw; 3501 $self->_draw;
3124} 3502}
3125 3503
3126############################################################################# 3504#############################################################################
3127 3505

Diff Legend

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