ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
211 248
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
218 return if $self->{parent}; 249 return if $self->{parent};
219 250
220 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
221} 252}
222 253
223sub hide { 254sub set_visible {
224 my ($self) = @_; 255 my ($self) = @_;
225 256
226 for (my @w = $self; @w; ) { 257 return if $self->{visible};
227 my $w = pop @w; 258
228 push @w, $w->children; 259 $self->{root} = $self->{parent}{root};
229 $w->{visible} = 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
230 } 261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
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 = shift;
893 1056
894 # TODO: user_x, user_y, overwrite moveto?
895
896 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1060 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
902 @_ 1064 @_
903 ); 1065 );
904 1066
905 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 1068 align => 0,
… …
959 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
960 1122
961 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
963 1125
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1131 };
969 1132
970 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1137 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
976 1139
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
978 1141
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1143 };
982 } 1144 }
983} 1145}
984 1146
985sub button_up { 1147sub button_up {
… …
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1167
1006 my $border = $self->border; 1168 my $border = $self->border;
1007 1169
1008 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1175
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
1016 1178
1017 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1182 $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); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1184 }
1028 1185
1029 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
1030 1187
… …
1046sub new { 1203sub new {
1047 my $class = shift; 1204 my $class = shift;
1048 1205
1049 $class->SUPER::new ( 1206 $class->SUPER::new (
1050 col_expand => [], 1207 col_expand => [],
1051 @_ 1208 @_,
1052 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1214}
1054 1215
1055sub add { 1216sub add {
1056 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1057 1218
1058 $child->set_parent ($self); 1219 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1060 1221
1061 $child->check_size; 1222 $self->realloc;
1062} 1223}
1063 1224
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1225# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1226sub clear {
1070 my ($self) = @_; 1227 my ($self) = @_;
1071 1228
1072 my @children = $self->children; 1229 my @children = $self->children;
1073 delete $self->{children}; 1230 delete $self->{children};
… …
1075 for (@children) { 1232 for (@children) {
1076 delete $_->{parent}; 1233 delete $_->{parent};
1077 $_->hide; 1234 $_->hide;
1078 } 1235 }
1079 1236
1080 $self->update; 1237 $self->realloc;
1081} 1238}
1082 1239
1083sub get_wh { 1240sub get_wh {
1084 my ($self) = @_; 1241 my ($self) = @_;
1085 1242
… …
1116sub size_allocate { 1273sub size_allocate {
1117 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1118 1275
1119 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1120 1277
1121 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1123 1280
1124 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1338 }
1182} 1339}
1183 1340
1184############################################################################# 1341#############################################################################
1185 1342
1186package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1344
1190our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1191 1346
1192sub size_request { 1347sub size_request {
1193 my ($self) = @_; 1348 my ($self) = @_;
1194 1349
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1196 1351 ? (
1197 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1354 )
1200 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1201} 1359}
1202 1360
1203sub size_allocate { 1361sub size_allocate {
1204 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1205 1363
1206 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1365 my $children = $self->{children};
1209 1366
1210 my @h = map $_->{req_w}, @$children; 1367 my @req;
1211 1368
1212 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1213 1370 @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 { 1371 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1373 my $req = List::Util::sum @req;
1374
1375 if ($req > $space) {
1376 # ah well, not enough space
1377 $_ *= $space / $req for @req;
1378 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1384 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 } 1385 }
1228 } 1386 }
1229 1387
1230 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1231 1389
1232 my $y = 0; 1390 my $pos = 0;
1233 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1394
1238 $y += $h; 1395 $pos += $alloc;
1239 } 1396 }
1240 1397
1241 1 1398 1
1242} 1399}
1243 1400
1244############################################################################# 1401#############################################################################
1245 1402
1403package CFClient::UI::HBox;
1404
1405our @ISA = CFClient::UI::Box::;
1406
1407sub new {
1408 my $class = shift;
1409
1410 $class->SUPER::new (
1411 vertical => 0,
1412 @_,
1413 )
1414}
1415
1416#############################################################################
1417
1246package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1247 1419
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1251 1421
1252sub size_request { 1422sub new {
1253 my ($self) = @_; 1423 my $class = shift;
1254 1424
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1256 1426 vertical => 1,
1257 ( 1427 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1428 )
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} 1429}
1301 1430
1302############################################################################# 1431#############################################################################
1303 1432
1304package CFClient::UI::Label; 1433package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1450 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1451 layout => (new CFClient::Layout),
1323 fontsize => 1, 1452 fontsize => 1,
1324 align => -1, 1453 align => -1,
1325 valign => -1, 1454 valign => -1,
1326 padding => 2, 1455 padding_x => 2,
1456 padding_y => 2,
1327 can_events => 0, 1457 can_events => 0,
1328 %arg 1458 %arg
1329 ); 1459 );
1330 1460
1331 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1368 1498
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1371 1501
1502 $self->realloc;
1372 $self->update; 1503 $self->update;
1373 $self->check_size;
1374} 1504}
1375 1505
1376sub set_markup { 1506sub set_markup {
1377 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1378 1508
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1513
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1386 1516
1517 $self->realloc;
1387 $self->update; 1518 $self->update;
1388 $self->check_size;
1389} 1519}
1390 1520
1391sub size_request { 1521sub size_request {
1392 my ($self) = @_; 1522 my ($self) = @_;
1393 1523
… …
1407 1537
1408 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1410 } 1540 }
1411 1541
1412 ( 1542 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1543}
1417 1544
1418sub size_allocate { 1545sub size_allocate {
1419 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1420 1547
1421 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1550}
1423 1551
1424sub set_fontsize { 1552sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1426 1554
1427 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1556 delete $self->{texture};
1429 1557
1430 $self->update; 1558 $self->realloc;
1431 $self->check_size;
1432} 1559}
1433 1560
1434sub _draw { 1561sub _draw {
1435 my ($self) = @_; 1562 my ($self) = @_;
1436 1563
… …
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1573
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448 1575
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1578 : ($self->{w} - $tex->{w}) * 0.5);
1452 1579
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1582 : ($self->{h} - $tex->{h}) * 0.5);
1456 1583
1457 $tex 1584 $tex
1458 }; 1585 };
1459 1586
… …
1488 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1489 can_hover => 1, 1616 can_hover => 1,
1490 can_focus => 1, 1617 can_focus => 1,
1491 valign => 0, 1618 valign => 0,
1492 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1493 @_ 1621 @_
1494 ) 1622 )
1495} 1623}
1496 1624
1497sub _set_text { 1625sub _set_text {
… …
1507 $self->{text} = $text; 1635 $self->{text} = $text;
1508 1636
1509 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1511 1639
1512 $self->emit (changed => $self->{text}); 1640 $self->_emit (changed => $self->{text});
1513} 1641}
1514 1642
1515sub set_text { 1643sub set_text {
1516 my ($self, $text) = @_; 1644 my ($self, $text) = @_;
1517 1645
1518 $self->{cursor} = length $text; 1646 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1647 $self->_set_text ($text);
1520 $self->update; 1648
1521 $self->check_size; 1649 $self->realloc;
1522} 1650}
1523 1651
1524sub get_text { 1652sub get_text {
1525 $_[0]{text} 1653 $_[0]{text}
1526} 1654}
… …
1529 my ($self) = @_; 1657 my ($self) = @_;
1530 1658
1531 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1532 1660
1533 ($w + 1, $h) # add 1 for cursor 1661 ($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} 1662}
1541 1663
1542sub key_down { 1664sub key_down {
1543 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1544 1666
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1685 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1686 $self->_emit ('escape');
1565 } elsif ($uni) { 1687 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1689 }
1568 1690
1569 $self->_set_text ($text); 1691 $self->_set_text ($text);
1570 $self->update; 1692
1571 $self->check_size; 1693 $self->realloc;
1572} 1694}
1573 1695
1574sub focus_in { 1696sub focus_in {
1575 my ($self) = @_; 1697 my ($self) = @_;
1576 1698
… …
1656 if ($sym == 13) { 1778 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1662 $self->update; 1784 $self->update;
1663 1785
1664 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1703 1825
1704sub new { 1826sub new {
1705 my $class = shift; 1827 my $class = shift;
1706 1828
1707 $class->SUPER::new ( 1829 $class->SUPER::new (
1708 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1709 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1711 can_hover => 1, 1834 can_hover => 1,
1712 align => 0, 1835 align => 0,
1713 valign => 0, 1836 valign => 0,
1714 can_events => 1, 1837 can_events => 1,
1715 @_ 1838 @_
1716 ) 1839 )
1717} 1840}
1718 1841
1842sub activate { }
1843
1719sub button_up { 1844sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1721 1846
1847 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1850}
1727 1851
1728sub _draw { 1852sub _draw {
1729 my ($self) = @_; 1853 my ($self) = @_;
1730 1854
… …
1759 1883
1760sub new { 1884sub new {
1761 my $class = shift; 1885 my $class = shift;
1762 1886
1763 $class->SUPER::new ( 1887 $class->SUPER::new (
1764 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1765 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1891 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1892 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1893 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1894 state => 0,
… …
1773} 1898}
1774 1899
1775sub size_request { 1900sub size_request {
1776 my ($self) = @_; 1901 my ($self) = @_;
1777 1902
1778 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1779} 1904}
1780 1905
1781sub button_down { 1906sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1783 1908
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1788 } 1913 }
1789} 1914}
1790 1915
1791sub _draw { 1916sub _draw {
1792 my ($self) = @_; 1917 my ($self) = @_;
1793 1918
1794 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1795 1920
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1922
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1923 my ($w, $h) = @$self{qw(w h)};
1924
1925 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1926
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1928
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1930
… …
2067 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2196 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2197 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2198 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2075 vertical => 0, 2202 vertical => 0,
2076 can_hover => 1, 2203 can_hover => 1,
2077 inner_pad => 0.02, 2204 inner_pad => 0.02,
2078 @_ 2205 @_
2079 ); 2206 );
… …
2082 $self->update; 2209 $self->update;
2083 2210
2084 $self 2211 $self
2085} 2212}
2086 2213
2214sub changed { }
2215
2216sub set_range {
2217 my ($self, $range) = @_;
2218
2219 ($range, $self->{range}) = ($self->{range}, $range);
2220
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}";
2223}
2224
2087sub set_value { 2225sub set_value {
2088 my ($self, $value) = @_; 2226 my ($self, $value) = @_;
2089 2227
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2228 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2229
2092 $hi = $lo + 1 if $hi <= $lo; 2230 $hi = $lo + 1 if $hi <= $lo;
2093 2231
2232 $page = $hi - $lo if $page > $hi - $lo;
2233
2094 $value = $lo if $value < $lo; 2234 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2235 $value = $hi - $page if $value > $hi - $page;
2096 2236
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2237 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2238 if $unit;
2099 2239
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2241
2104 if ($value != $old_value) { 2242 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2243 $self->_emit (changed => $value);
2106 $self->update; 2244 $self->update;
2107 } 2245 }
2108} 2246}
2109 2247
2110sub size_request { 2248sub size_request {
2111 my ($self) = @_; 2249 my ($self) = @_;
2112 2250
2113 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2252}
2118 2253
2119sub button_down { 2254sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2121 2256
2122 $self->SUPER::button_down ($ev, $x, $y); 2257 $self->SUPER::button_down ($ev, $x, $y);
2258
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260
2123 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2124} 2262}
2125 2263
2126sub mouse_motion { 2264sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2267 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2269
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2270 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2271
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2273
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2275 }
2138} 2276}
2139 2277
2140sub update { 2278sub update {
2141 my ($self) = @_; 2279 my ($self) = @_;
2142 2280
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2282 $self->set_value ($self->{range}[0]);
2145 2283
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2147 2286
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2288
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2291
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2292 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2293 $value = $value * $self->{scale} + $self->{offset};
2154 2294
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; 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2296 $self->{knob_w} = $knob_w;
2162 }); 2297 });
2163 2298
2164 $self->SUPER::update; 2299 $self->SUPER::update;
2165} 2300}
2166 2301
… …
2190 # draw handle 2325 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2326 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2327
2193 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2194} 2329}
2330
2331#############################################################################
2332
2333package CFClient::UI::ValSlider;
2334
2335our @ISA = CFClient::UI::HBox::;
2336
2337sub new {
2338 my ($class, %arg) = @_;
2339
2340 my $range = delete $arg{range};
2341
2342 my $self = $class->SUPER::new (
2343 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2344 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2345 to_value => sub { shift },
2346 from_value => sub { shift },
2347 %arg,
2348 );
2349
2350 $self->{slider}->connect (changed => sub {
2351 my ($self, $value) = @_;
2352 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2353 $self->{parent}->emit (changed => $value);
2354 });
2355
2356# $self->{entry}->connect (changed => sub {
2357# my ($self, $value) = @_;
2358# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2359# $self->{parent}->emit (changed => $value);
2360# });
2361
2362 $self->add ($self->{slider}, $self->{entry});
2363
2364 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2365
2366 $self
2367}
2368
2369sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) }
2195 2371
2196############################################################################# 2372#############################################################################
2197 2373
2198package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2199 2375
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2418
2243 $self->reflow; 2419 $self->reflow;
2244} 2420}
2245 2421
2246sub text_height { 2422sub text_size {
2247 my ($self, $text, $indent) = @_; 2423 my ($self, $text, $indent) = @_;
2248 2424
2249 my $layout = $self->{layout}; 2425 my $layout = $self->{layout};
2250 2426
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2428 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2429 $layout->set_markup ($text);
2254 2430
2255 ($layout->size)[1] 2431 $layout->size
2256} 2432}
2257 2433
2258sub reflow { 2434sub reflow {
2259 my ($self) = @_; 2435 my ($self) = @_;
2260 2436
2261 $self->{need_reflow}++; 2437 $self->{need_reflow}++;
2262 $self->update; 2438 $self->update;
2263} 2439}
2264 2440
2441sub set_offset {
2442 my ($self, $offset) = @_;
2443
2444 # todo: base offset on lines or so, not on pixels
2445 $self->{children}[1]->set_value ($offset);
2446}
2447
2448sub clear {
2449 my ($self) = @_;
2450
2451 $self->{par} = [];
2452 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454}
2455
2265sub add_paragraph { 2456sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2267 2458
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2459 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2460 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2461 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2463 }
2275 2464
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2466}
2279 2467
2280sub update { 2468sub update {
2281 my ($self) = @_; 2469 my ($self) = @_;
2282 2470
… …
2285 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2286 2474
2287 delete $self->{texture}; 2475 delete $self->{texture};
2288 2476
2289 $ROOT->on_post_alloc ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2290 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2481 my $height = 0;
2292 2482
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2294 for @{$self->{par}}; 2487 for (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489 $layout->set_width ($W - $_->[3]);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3];
2493 $_->[1] = $h;
2494 }
2495
2496 $height += $_->[1];
2497 }
2295 2498
2296 $self->{height} = $height; 2499 $self->{height} = $height;
2297 2500
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2502
2301 delete $self->{texture}; 2503 delete $self->{texture};
2302 } 2504 }
2303 2505
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2307 2509
2308 my $top = int $self->{children}[1]{range}[0]; 2510 my $top = int $self->{children}[1]{range}[0];
2309 2511
2310 my $y0 = $top; 2512 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2513 my $y1 = $top + $H;
2312 2514
2313 my $y = 0; 2515 my $y = 0;
2314 2516
2315 my $layout = $self->{layout}; 2517 my $layout = $self->{layout};
2316 2518
2317 $layout->set_font ($self->{font}) if $self->{font}; 2519 $layout->set_font ($self->{font}) if $self->{font};
2318 2520
2319 glEnable GL_BLEND; 2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2524
2322 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2526 my $h = $par->[1];
2324 2527
2325 if ($y0 < $y + $h && $y < $y1) { 2528 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2529 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2530 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2531 $layout->set_markup ($par->[4]);
2329 2532
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2534
2332 glRasterPos $par->[2], $y - $y0; 2535 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2537 }
2335 2538
2336 $y += $h; 2539 $y += $h;
2337 } 2540 }
… …
2404 2607
2405sub new { 2608sub new {
2406 my $class = shift; 2609 my $class = shift;
2407 2610
2408 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2409 state => 0, 2612 state => 0,
2410 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2411 @_ 2614 @_
2412 ); 2615 );
2413 2616
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2617 $self
2420} 2618}
2421 2619
2422sub toggle_flopper { 2620sub toggle_flopper {
2423 my ($self) = @_; 2621 my ($self) = @_;
2424 2622
2425 # TODO: use animation 2623 $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} 2624}
2437 2625
2438############################################################################# 2626#############################################################################
2439 2627
2440package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2453} 2641}
2454 2642
2455sub set_tooltip_from { 2643sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2644 my ($self, $widget) = @_;
2457 2645
2646 my $tooltip = $widget->{tooltip};
2647
2648 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}";
2653 }
2654
2458 $self->add (new CFClient::UI::Label 2655 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2656 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2658 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2659 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2660 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2672
2476sub size_allocate { 2673sub size_allocate {
2477 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2478 2675
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2677}
2678
2679sub visibility_change {
2680 my ($self, $visible) = @_;
2681
2682 return unless $visible;
2683
2684 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner}
2686 or return;
2687
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH;
2692
2693 $self->move_abs ($x, $y);
2694 });
2480} 2695}
2481 2696
2482sub _draw { 2697sub _draw {
2483 my ($self) = @_; 2698 my ($self) = @_;
2484 2699
… …
2501 glVertex $w, $h; 2716 glVertex $w, $h;
2502 glVertex $w, 0; 2717 glVertex $w, 0;
2503 glEnd; 2718 glEnd;
2504 2719
2505 glTranslate 2 - 0.375, 2 - 0.375; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2721
2506 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2507} 2723}
2508 2724
2509############################################################################# 2725#############################################################################
2510 2726
… …
2516 2732
2517sub new { 2733sub new {
2518 my $class = shift; 2734 my $class = shift;
2519 2735
2520 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2521 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2522 @_, 2739 @_,
2523 ); 2740 );
2524 2741
2525 if ($self->{anim} && $self->{animspeed}) { 2742 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2743 Scalar::Util::weaken (my $widget = $self);
… …
2541 2758
2542sub size_request { 2759sub size_request {
2543 (32, 8) 2760 (32, 8)
2544} 2761}
2545 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2546sub _draw { 2771sub _draw {
2547 my ($self) = @_; 2772 my ($self) = @_;
2548 2773
2549 return unless $::CONN;#d# manage and cache textures differently 2774 return unless $::CONN;
2550 2775
2551 my $face; 2776 my $face;
2552 2777
2553 if ($self->{frame}) { 2778 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}]; 2779 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2573 2798
2574 $self->{timer}->cancel 2799 $self->{timer}->cancel
2575 if $self->{timer}; 2800 if $self->{timer};
2576 2801
2577 $self->SUPER::DESTROY; 2802 $self->SUPER::DESTROY;
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::InventoryItem;
2583
2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2611
2612sub new {
2613 my $class = shift;
2614
2615 my %args = @_;
2616
2617 my $item = delete $args{item};
2618
2619 my $desc = _item_to_desc ($item);
2620
2621 my $self = $class->SUPER::new (
2622 can_hover => 1,
2623 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2637 $::CONN->send ("move $targ $item->{tag} 0");
2638 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) {
2641 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2654 ),
2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658 }
2659
2660 1
2661 },
2662 %args
2663 );
2664
2665
2666 $self->add (new CFClient::UI::Face
2667 can_events => 0,
2668 face => $item->{face},
2669 anim => $item->{anim},
2670 animspeed => $item->{animspeed},
2671 );
2672
2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675 $self->{item} = $item;
2676
2677 $self->update_item;
2678
2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI::Inventory;
2693
2694our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox),
2701 @_,
2702 );
2703
2704 $self
2705}
2706
2707sub set_items {
2708 my ($self, $items) = @_;
2709
2710 $self->{scrolled}->clear;
2711 return unless $items;
2712
2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2717
2718 $self->{real_items} = \@items;
2719
2720 for my $item (@items) {
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2723 }
2724
2725 $self->{scrolled}->add (@items);
2726
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728}
2729
2730sub size_request {
2731 my ($self) = @_;
2732 ($self->{req_w}, $self->{req_h});
2733} 2803}
2734 2804
2735############################################################################# 2805#############################################################################
2736 2806
2737package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2772 2842
2773# popup given the event (must be a mouse button down event currently) 2843# popup given the event (must be a mouse button down event currently)
2774sub popup { 2844sub popup {
2775 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2776 2846
2777 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2778 2848
2779 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2780 $GRAB = $self; 2850 $GRAB = $self;
2781 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2782 2852
2783 $self->show; 2853 $self->show;
2784 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2785} 2855}
2786 2856
2787sub mouse_motion { 2857sub mouse_motion {
2788 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2789 2859
… …
2797 2867
2798 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2799 undef $GRAB; 2869 undef $GRAB;
2800 $self->hide; 2870 $self->hide;
2801 2871
2802 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2803 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2804 } 2874 }
2805} 2875}
2806 2876
2807############################################################################# 2877#############################################################################
… …
2869sub add { 2939sub add {
2870 my ($self, $text, %arg) = @_; 2940 my ($self, $text, %arg) = @_;
2871 2941
2872 $text =~ s/^\s+//; 2942 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//; 2943 $text =~ s/\s+$//;
2944
2945 return unless $text;
2874 2946
2875 my $timeout = time + ((delete $arg{timeout}) || 60); 2947 my $timeout = time + ((delete $arg{timeout}) || 60);
2876 2948
2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878 2950
… …
2912 $self->SUPER::reconfigure; 2984 $self->SUPER::reconfigure;
2913} 2985}
2914 2986
2915############################################################################# 2987#############################################################################
2916 2988
2917package CFClient::UI::Root; 2989package CFClient::UI::Inventory;
2918 2990
2919our @ISA = CFClient::UI::Container::; 2991our @ISA = CFClient::UI::ScrolledWindow::;
2920
2921use CFClient::OpenGL;
2922 2992
2923sub new { 2993sub new {
2924 my $class = shift; 2994 my $class = shift;
2925 2995
2926 $class->SUPER::new ( 2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2927 @_, 2998 @_,
2928 ) 2999 );
2929}
2930 3000
2931sub configure { 3001 $self
3002}
3003
3004sub set_items {
3005 my ($self, $items) = @_;
3006
3007 $self->{scrolled}->clear;
3008 return unless $items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::BindEditor;
3032
3033our @ISA = CFClient::UI::FancyFrame::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040 $self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044 text => "start recording",
3045 tooltip => "Start/Stops recording of actions."
3046 ."All subsequent actions after the recording started will be captured."
3047 ."The actions are displayed after the record was stopped."
3048 ."To bind the action you have to click on the 'Bind' button",
3049 on_activate => sub {
3050 unless ($self->{recording}) {
3051 $self->start;
3052 } else {
3053 $self->stop;
3054 }
3055 });
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 });
3141}
3142
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
2932 my ($self, $x, $y, $w, $h) = @_; 3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2933 3150
2934 $self->{w} = $w; 3151 $self->clear_command_list;
2935 $self->{h} = $h; 3152 $self->{recording} = 0;
2936} 3153 $self->{rec_btn}->set_text ("start recording");
2937 3154
2938sub check_size { 3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
2939 my ($self) = @_; 3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
2940 3173
2941 $self->size_allocate ($self->{w}, $self->{h}) 3174sub update_binding_widgets {
2942 if $self->{w}; 3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell {
3240 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell;
3242
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270}
3271
3272sub remove_spell {
3273 my ($self, $spell) = @_;
3274 delete $self->{spells}->{$spell->{name}};
3275 $self->rebuild_spell_list;
3276}
3277
3278#############################################################################
3279
3280package CFClient::UI::Root;
3281
3282our @ISA = CFClient::UI::Container::;
3283
3284use CFClient::OpenGL;
3285
3286sub new {
3287 my $class = shift;
3288
3289 my $self = $class->SUPER::new (
3290 visible => 1,
3291 @_,
3292 );
3293
3294 Scalar::Util::weaken ($self->{root} = $self);
3295
3296 $self
2943} 3297}
2944 3298
2945sub size_request { 3299sub size_request {
2946 my ($self) = @_; 3300 my ($self) = @_;
2947 3301
2948 ($self->{w}, $self->{h}) 3302 ($self->{w}, $self->{h})
3303}
3304
3305sub _to_pixel {
3306 my ($coord, $size, $max) = @_;
3307
3308 $coord =
3309 $coord eq "center" ? ($max - $size) * 0.5
3310 : $coord eq "max" ? $max
3311 : $coord;
3312
3313 $coord = 0 if $coord < 0;
3314 $coord = $max - $size if $coord > $max - $size;
3315
3316 int $coord + 0.5
2949} 3317}
2950 3318
2951sub size_allocate { 3319sub size_allocate {
2952 my ($self, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2953 3321
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2960 for my $child ($self->children) { 3322 for my $child ($self->children) {
2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2962 3324
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3325 $X = $child->{force_x} if exists $child->{force_x};
2964 if exists $child->{req_x}; 3326 $Y = $child->{force_y} if exists $child->{force_y};
2965 3327
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3328 $X = _to_pixel $X, $W, $self->{w};
2967 if exists $child->{req_y}; 3329 $Y = _to_pixel $Y, $H, $self->{h};
2968
2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971 3330
2972 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
2973 } 3332 }
2974} 3333}
2975 3334
… …
2986} 3345}
2987 3346
2988sub update { 3347sub update {
2989 my ($self) = @_; 3348 my ($self) = @_;
2990 3349
2991 $self->check_size;
2992 $::WANT_REFRESH++; 3350 $::WANT_REFRESH++;
2993} 3351}
2994 3352
2995sub add { 3353sub add {
2996 my ($self, @children) = @_; 3354 my ($self, @children) = @_;
2997 3355
2998 for my $child (@children) {
2999 $child->{toplevel} = 1; 3356 $_->{is_toplevel} = 1
3000 3357 for @children;
3001 # integerise window positions
3002 $child->{x} = int $child->{x};
3003 $child->{y} = int $child->{y};
3004 }
3005 3358
3006 $self->SUPER::add (@children); 3359 $self->SUPER::add (@children);
3360}
3361
3362sub remove {
3363 my ($self, @children) = @_;
3364
3365 $self->SUPER::remove (@children);
3366
3367 delete $self->{is_toplevel}
3368 for @children;
3369
3370 while (@children) {
3371 my $w = pop @children;
3372 push @children, $w->children;
3373 $w->set_invisible;
3374 }
3007} 3375}
3008 3376
3009sub on_refresh { 3377sub on_refresh {
3010 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
3011 3379
… …
3024 while ($self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
3025 $_->() 3393 $_->()
3026 for values %{delete $self->{refresh_hook}}; 3394 for values %{delete $self->{refresh_hook}};
3027 } 3395 }
3028 3396
3029 if ($self->{check_size}) { 3397 if ($self->{realloc}) {
3030 my @queue = ([], []); 3398 my %queue;
3399 my @queue;
3400 my $widget;
3031 3401
3032 for (;;) { 3402 outer:
3033 if ($self->{check_size}) { 3403 while () {
3034 # heuristic: check containers last 3404 if (my $realloc = delete $self->{realloc}) {
3035 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3405 for $widget (values %$realloc) {
3036 for values %{delete $self->{check_size}} 3406 $widget->{visible} or next; # do not resize invisible widgets
3407
3408 $queue{$widget+0}++ and next; # duplicates are common
3409
3410 push @{ $queue[$widget->{visible}] }, $widget;
3411 }
3037 } 3412 }
3038 3413
3039 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3414 while () {
3415 @queue or last outer;
3040 3416
3041 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3417 $widget = pop @{ $queue[-1] || [] }
3042 ? @$widget{qw(user_w user_h)} 3418 and last;
3043 : $widget->size_request;
3044
3045 if (delete $widget->{force_alloc}
3046 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3048 3419
3420 pop @queue;
3421 }
3422
3423 delete $queue{$widget+0};
3424
3425 my ($w, $h) = $widget->size_request;
3426
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3429
3430 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h};
3432
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3434 || delete $widget->{force_realloc}) {
3049 $widget->{req_w} = $w; 3435 $widget->{req_w} = $w;
3050 $widget->{req_h} = $h; 3436 $widget->{req_h} = $h;
3051 3437
3052 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3438 $self->{size_alloc}{$widget+0} = $widget;
3053 3439
3054 $widget->{parent}->check_size
3055 if $widget->{parent}; 3440 if (my $parent = $widget->{parent}) {
3441 $self->{realloc}{$parent+0} = $parent
3442 unless $queue{$parent+0};
3443
3444 $parent->{force_size_alloc} = 1;
3445 $self->{size_alloc}{$parent+0} = $parent;
3446 }
3056 } 3447 }
3448
3449 delete $self->{realloc}{$widget+0};
3057 } 3450 }
3058 } 3451 }
3059 3452
3060 while ($self->{size_alloc}) { 3453 while (my $size_alloc = delete $self->{size_alloc}) {
3061 for (values %{delete $self->{size_alloc}}) { 3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
3062 my ($widget, $w, $h) = @$_; 3455 values %$size_alloc;
3456
3457 while () {
3458 my $widget = pop @queue || last;
3459
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3063 3461
3064 $w = 0 if $w < 0; 3462 $w = 0 if $w < 0;
3065 $h = 0 if $h < 0; 3463 $h = 0 if $h < 0;
3066 3464
3465 $w = int $w + 0.5;
3466 $h = int $h + 0.5;
3467
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h};
3471
3067 $widget->{w} = $w; 3472 $widget->{w} = $w;
3068 $widget->{h} = $h; 3473 $widget->{h} = $h;
3069 $widget->size_allocate ($w, $h); 3474
3070 $widget->emit (size_allocate => $w, $h); 3475 $widget->emit (size_allocate => $w, $h);
3476 }
3071 } 3477 }
3072 } 3478 }
3073 3479
3074 while ($self->{post_alloc_hook}) { 3480 while ($self->{post_alloc_hook}) {
3075 $_->() 3481 $_->()
3076 for values %{delete $self->{post_alloc_hook}}; 3482 for values %{delete $self->{post_alloc_hook}};
3077 } 3483 }
3484
3078 3485
3079 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3081 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
3082 3489
… …
3084 glLoadIdentity; 3491 glLoadIdentity;
3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3086 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
3087 glLoadIdentity; 3494 glLoadIdentity;
3088 3495
3496 {
3497 package CFClient::UI::Base;
3498
3499 ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h});
3501 }
3502
3089 $self->_draw; 3503 $self->_draw;
3090} 3504}
3091 3505
3092############################################################################# 3506#############################################################################
3093 3507

Diff Legend

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