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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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 {
… …
212 return if $self->{parent}; 249 return if $self->{parent};
213 250
214 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
215} 252}
216 253
217sub hide { 254sub set_visible {
218 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
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};
219 278
220 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
222 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
223 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
224 if $self->{parent}; 313 if $self->{parent};
225} 314}
226 315
227sub move { 316sub move_abs {
228 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
229 318
230 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
231 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
232 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
233 322
234 $self->update; 323 $self->update;
235} 324}
236 325
237sub set_size { 326sub set_size {
238 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
239 328
240 $self->{user_w} = $w; 329 $self->{force_w} = $w;
241 $self->{user_h} = $h; 330 $self->{force_h} = $h;
242 331
243 $self->check_size; 332 $self->realloc;
244} 333}
245 334
246sub size_request { 335sub size_request {
247 require Carp; 336 require Carp;
248 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
250 339
251sub configure { 340sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
253 342
254 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
257 348
258 # use alignment to adjust x, y 349 # use alignment to adjust x, y
259 350
260 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 353 }
265 354
266 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 356 $self->{x} = $x;
268 $self->{y} = $y; 357 $self->{y} = $y;
269 $self->update; 358 $self->update;
270 } 359 }
271 360
272 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $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;
274 } 368 }
275} 369}
276 370
277sub size_allocate { 371sub size_allocate {
278 # nothing to be done 372 # nothing to be done
279} 373}
280 374
281sub reconfigure {
282 my ($self) = @_;
283
284 $self->check_size (1);
285 $self->update;
286}
287
288sub children { 375sub children {
289} 376}
290 377
291sub set_max_size { 378sub set_max_size {
292 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
296} 383}
297 384
298sub set_tooltip { 385sub set_tooltip {
299 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
300 392
301 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
302 394
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
326 return if $FOCUS == $self; 418 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
328 420
329 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
330 422
331 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
332 424
333 $focus->update if $focus; 425 $focus->update if $focus;
334 $FOCUS->update; 426 $FOCUS->update;
335} 427}
336 428
… …
339 431
340 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
341 433
342 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
343 435
344 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
345 437
346 $focus->update if $focus; #? 438 $focus->update if $focus; #?
347}
348 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
349sub mouse_motion { } 444sub mouse_motion { 0 }
350sub button_up { } 445sub button_up { 0 }
351sub key_down { } 446sub key_down { 0 }
352sub key_up { } 447sub key_up { 0 }
353 448
354sub button_down { 449sub button_down {
355 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
356 451
357 $self->focus_in; 452 $self->focus_in;
358}
359 453
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
364sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365 530
366sub draw { 531sub draw {
367 my ($self) = @_; 532 my ($self) = @_;
368 533
369 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370 545
371 glPushMatrix; 546 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw; 548 $self->_draw;
374 glPopMatrix; 549 glPopMatrix;
… …
386 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
387 glEnd; 562 glEnd;
388 glDisable GL_BLEND; 563 glDisable GL_BLEND;
389 } 564 }
390 565
391 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
392 glPushMatrix; 567 glPushMatrix;
393 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 571 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
398 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
399 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
400 glEnd; 575 glEnd;
401 glPopMatrix; 576 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 578 }
404} 579}
405 580
406sub _draw { 581sub _draw {
407 my ($self) = @_; 582 my ($self) = @_;
408 583
409 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
410}
411
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458} 585}
459 586
460sub DESTROY { 587sub DESTROY {
461 my ($self) = @_; 588 my ($self) = @_;
462 589
… …
520 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
522} 649}
523 650
524sub size_request { 651sub size_request {
525 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
526} 655}
527 656
528sub draw { } 657sub draw { }
529 658
530############################################################################# 659#############################################################################
… …
559 $self->{children} = [ 688 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
562 ]; 691 ];
563 692
564 $self->check_size (1); 693 $self->realloc;
565 $self->update;
566} 694}
567 695
568sub children { 696sub children {
569 @{ $_[0]{children} } 697 @{ $_[0]{children} }
570} 698}
… …
575 delete $child->{parent}; 703 delete $child->{parent};
576 $child->hide; 704 $child->hide;
577 705
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 707
580 $self->check_size; 708 $self->realloc;
581 $self->update;
582} 709}
583 710
584sub clear { 711sub clear {
585 my ($self) = @_; 712 my ($self) = @_;
586 713
… …
590 for (@$children) { 717 for (@$children) {
591 delete $_->{parent}; 718 delete $_->{parent};
592 $_->hide; 719 $_->hide;
593 } 720 }
594 721
595 $self->check_size; 722 $self->realloc;
596 $self->update;
597} 723}
598 724
599sub find_widget { 725sub find_widget {
600 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
601 727
… …
688 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 815 $self->update;
690} 816}
691 817
692sub _render { 818sub _render {
819 my ($self) = @_;
820
693 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
694} 822}
695 823
696sub render_child { 824sub render_child {
697 my ($self) = @_; 825 my ($self) = @_;
698 826
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
702 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
703 $self->_render; 838 $self->_render;
704 }; 839 };
705} 840}
706 841
707sub _draw { 842sub _draw {
708 my ($self) = @_; 843 my ($self) = @_;
709 844
710 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
711 846
712 my $tex = $self->{texture} 847 my $tex = $self->{texture}
713 or return; 848 or return;
714 849
715 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
… …
725 860
726package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
727 862
728our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
729 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
730sub size_request { 875sub size_request {
731 my ($self) = @_; 876 my ($self) = @_;
732 877
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 879
736 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
737} 884}
738 885
739sub size_allocate { 886sub size_allocate {
740 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
741 888
889 my $child = $self->child;
890
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893
894 $self->child->configure (0, 0, $w, $h);
742 $self->update; 895 $self->update;
743} 896}
744 897
745sub set_offset { 898sub set_offset {
746 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
780} 933}
781 934
782sub _render { 935sub _render {
783 my ($self) = @_; 936 my ($self) = @_;
784 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 942
787 $self->SUPER::_render; 943 $self->SUPER::_render;
788} 944}
789 945
… …
797 my $class = shift; 953 my $class = shift;
798 954
799 my $self; 955 my $self;
800 956
801 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
802 vertical => 1, 958 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 960 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
806 }, 962 },
807 ; 963 ;
808 964
809 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 966 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
818 974
819 $self 975 $self
976}
977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986}
987
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 $self->SUPER::size_allocate ($w, $h);
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 995}
821 996
822#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 998# update viewport offset on scroll
824 999
… …
868 1043
869our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
870 1045
871use CFClient::OpenGL; 1046use CFClient::OpenGL;
872 1047
873my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1055
877sub new { 1056sub new {
878 my $class = shift; 1057 my ($class, %arg) = @_;
879 1058
880 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
881 1060
882 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1064 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1065 can_events => 1,
888 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
889 ); 1069 );
890 1070
891 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
892 align => 0, 1072 align => 0,
893 valign => 1, 1073 valign => 1,
894 text => $self->{title}, 1074 text => $title,
895 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
896 1077
897 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
898} 1086}
899 1087
900sub border { 1088sub border {
901 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
902} 1090}
903 1091
904sub size_request { 1092sub size_request {
905 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
906 1097
907 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
908 1099
909 ( 1100 (
910 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
913} 1104}
914 1105
915sub size_allocate { 1106sub size_allocate {
916 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
917 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
918 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
920 1119
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
925} 1121}
926 1122
927sub button_down { 1123sub button_down {
928 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
929 1125
… …
945 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
946 1142
947 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
949 1145
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size;
954 }; 1151 };
955 1152
956 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1157 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
962 1159
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
964 1161
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update;
967 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
968 } 1168 1
969} 1169}
970 1170
971sub button_up { 1171sub button_up {
972 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
973 1173
974 delete $self->{motion}; 1174 !!delete $self->{motion}
975} 1175}
976 1176
977sub mouse_motion { 1177sub mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
979 1179
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
981} 1183}
982 1184
983sub _draw { 1185sub _draw {
984 my ($self) = @_; 1186 my ($self) = @_;
985 1187
1188 my $child = $self->{children}[0];
1189
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1192
989 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1195
992 my $border = $self->border; 1196 my $border = $self->border;
993 1197
994 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1203
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1002 1206
1003 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1212 }
1014 1213
1015 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1016 1215
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1020} 1222}
1021 1223
1022############################################################################# 1224#############################################################################
1023 1225
1024package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1032sub new { 1234sub new {
1033 my $class = shift; 1235 my $class = shift;
1034 1236
1035 $class->SUPER::new ( 1237 $class->SUPER::new (
1036 col_expand => [], 1238 col_expand => [],
1037 @_ 1239 @_,
1038 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1245}
1040 1246
1041sub add { 1247sub add {
1042 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1043 1249
1044 $child->set_parent ($self); 1250 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1046 1252
1047 $child->check_size; 1253 $self->realloc;
1048} 1254}
1049 1255
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1257sub clear {
1056 my ($self) = @_; 1258 my ($self) = @_;
1057 1259
1058 my @children = $self->children; 1260 my @children = $self->children;
1059 delete $self->{children}; 1261 delete $self->{children};
… …
1061 for (@children) { 1263 for (@children) {
1062 delete $_->{parent}; 1264 delete $_->{parent};
1063 $_->hide; 1265 $_->hide;
1064 } 1266 }
1065 1267
1066 $self->update; 1268 $self->realloc;
1067} 1269}
1068 1270
1069sub get_wh { 1271sub get_wh {
1070 my ($self) = @_; 1272 my ($self) = @_;
1071 1273
… …
1102sub size_allocate { 1304sub size_allocate {
1103 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1104 1306
1105 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1106 1308
1107 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1109 1311
1110 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1167 } 1369 }
1168} 1370}
1169 1371
1170############################################################################# 1372#############################################################################
1171 1373
1172package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1173
1174# TODO: wrap into common Box base class
1175 1375
1176our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1177 1377
1178sub size_request { 1378sub size_request {
1179 my ($self) = @_; 1379 my ($self) = @_;
1180 1380
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1182 1382 ? (
1183 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1184 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185 (List::Util::max map $_->[1], @alloc), 1385 )
1186 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1187} 1390}
1188 1391
1189sub size_allocate { 1392sub size_allocate {
1190 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1191 1394
1192 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1193
1194 my $children = $self->{children}; 1396 my $children = $self->{children};
1195 1397
1196 my @h = map $_->{req_w}, @$children; 1398 my @req;
1197 1399
1198 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1199 1401 @req = ($space / (@$children || 1)) x @$children;
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205 $exp ||= 1;
1206 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1207 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 } 1416 }
1214 } 1417 }
1215 1418
1216 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1217 1420
1218 my $y = 0; 1421 my $pos = 0;
1219 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1222 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223 1425
1224 $y += $h; 1426 $pos += $alloc;
1225 } 1427 }
1226 1428
1227 1 1429 1
1228} 1430}
1229 1431
1230############################################################################# 1432#############################################################################
1231 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1232package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1233 1450
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1237 1452
1238sub size_request { 1453sub new {
1239 my ($self) = @_; 1454 my $class = shift;
1240 1455
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1242 1457 vertical => 1,
1243 ( 1458 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1459 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1460}
1287 1461
1288############################################################################# 1462#############################################################################
1289 1463
1290package CFClient::UI::Label; 1464package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1481 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1309 fontsize => 1, 1483 fontsize => 1,
1310 align => -1, 1484 align => -1,
1311 valign => -1, 1485 valign => -1,
1312 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1313 can_events => 0, 1488 can_events => 0,
1314 %arg 1489 %arg
1315 ); 1490 );
1316 1491
1317 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1353 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1354 1529
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1357 1532
1533 $self->realloc;
1358 $self->update; 1534 $self->update;
1359 $self->check_size;
1360} 1535}
1361 1536
1362sub set_markup { 1537sub set_markup {
1363 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1364 1539
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1544
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1372 1547
1548 $self->realloc;
1373 $self->update; 1549 $self->update;
1374 $self->check_size;
1375} 1550}
1376 1551
1377sub size_request { 1552sub size_request {
1378 my ($self) = @_; 1553 my ($self) = @_;
1379 1554
… …
1393 1568
1394 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1396 } 1571 }
1397 1572
1398 ( 1573 ($w, $h)
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1574}
1403 1575
1404sub size_allocate { 1576sub size_allocate {
1405 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1406 1578
1579 delete $self->{ox};
1580
1407 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408} 1583}
1409 1584
1410sub set_fontsize { 1585sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1412 1587
1413 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1589 delete $self->{texture};
1415 1590
1416 $self->update; 1591 $self->realloc;
1417 $self->check_size;
1418} 1592}
1419 1593
1420sub _draw { 1594sub _draw {
1421 my ($self) = @_; 1595 my ($self) = @_;
1422 1596
… …
1428 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1606
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1434 1609
1610 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1438 1614
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1618 };
1445 1619
1446 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1448 1622
… …
1474 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1475 can_hover => 1, 1649 can_hover => 1,
1476 can_focus => 1, 1650 can_focus => 1,
1477 valign => 0, 1651 valign => 0,
1478 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1479 @_ 1654 @_
1480 ) 1655 )
1481} 1656}
1482 1657
1483sub _set_text { 1658sub _set_text {
… …
1493 $self->{text} = $text; 1668 $self->{text} = $text;
1494 1669
1495 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1497 1672
1498 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1499} 1674}
1500 1675
1501sub set_text { 1676sub set_text {
1502 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1503 1678
1504 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1680 $self->_set_text ($text);
1506 $self->update; 1681
1507 $self->check_size; 1682 $self->realloc;
1508} 1683}
1509 1684
1510sub get_text { 1685sub get_text {
1511 $_[0]{text} 1686 $_[0]{text}
1512} 1687}
… …
1515 my ($self) = @_; 1690 my ($self) = @_;
1516 1691
1517 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1518 1693
1519 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1695}
1527 1696
1528sub key_down { 1697sub key_down {
1529 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1530 1699
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1719 $self->_emit ('escape');
1551 } elsif ($uni) { 1720 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1553 } 1724 }
1554 1725
1555 $self->_set_text ($text); 1726 $self->_set_text ($text);
1556 $self->update; 1727
1557 $self->check_size; 1728 $self->realloc;
1729
1730 1
1558} 1731}
1559 1732
1560sub focus_in { 1733sub focus_in {
1561 my ($self) = @_; 1734 my ($self) = @_;
1562 1735
… …
1577 utf8::encode $text; 1750 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1579 1752
1580 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1581 $self->update; 1754 $self->update;
1755
1756 1
1582} 1757}
1583 1758
1584sub mouse_motion { 1759sub mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1587} 1764}
1588 1765
1589sub _draw { 1766sub _draw {
1590 my ($self) = @_; 1767 my ($self) = @_;
1591 1768
… …
1642 if ($sym == 13) { 1819 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1648 $self->update; 1825 $self->update;
1649 1826
1650 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1668 } else { 1845 } else {
1669 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1670 } 1847 }
1671 1848
1672 } else { 1849 } else {
1673 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1674 } 1853 1
1675
1676} 1854}
1677 1855
1678############################################################################# 1856#############################################################################
1679 1857
1680package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1689 1867
1690sub new { 1868sub new {
1691 my $class = shift; 1869 my $class = shift;
1692 1870
1693 $class->SUPER::new ( 1871 $class->SUPER::new (
1694 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1695 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1697 can_hover => 1, 1876 can_hover => 1,
1698 align => 0, 1877 align => 0,
1699 valign => 0, 1878 valign => 0,
1700 can_events => 1, 1879 can_events => 1,
1701 @_ 1880 @_
1702 ) 1881 )
1703} 1882}
1704 1883
1884sub activate { }
1885
1705sub button_up { 1886sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1707 1888
1889 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1892
1711 } 1893 1
1712} 1894}
1713 1895
1714sub _draw { 1896sub _draw {
1715 my ($self) = @_; 1897 my ($self) = @_;
1716 1898
… …
1745 1927
1746sub new { 1928sub new {
1747 my $class = shift; 1929 my $class = shift;
1748 1930
1749 $class->SUPER::new ( 1931 $class->SUPER::new (
1750 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1751 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 1938 state => 0,
… …
1759} 1942}
1760 1943
1761sub size_request { 1944sub size_request {
1762 my ($self) = @_; 1945 my ($self) = @_;
1763 1946
1764 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1765} 1948}
1766 1949
1767sub button_down { 1950sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1769 1952
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1774 } 1961 1
1775} 1962}
1776 1963
1777sub _draw { 1964sub _draw {
1778 my ($self) = @_; 1965 my ($self) = @_;
1779 1966
1780 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1781 1968
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 1970
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 1974
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 1976
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 1978
… …
2053 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2061 vertical => 0, 2250 vertical => 0,
2062 can_hover => 1, 2251 can_hover => 1,
2063 inner_pad => 0.02, 2252 inner_pad => 0.02,
2064 @_ 2253 @_
2065 ); 2254 );
… …
2068 $self->update; 2257 $self->update;
2069 2258
2070 $self 2259 $self
2071} 2260}
2072 2261
2262sub changed { }
2263
2264sub set_range {
2265 my ($self, $range) = @_;
2266
2267 ($range, $self->{range}) = ($self->{range}, $range);
2268
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2271}
2272
2073sub set_value { 2273sub set_value {
2074 my ($self, $value) = @_; 2274 my ($self, $value) = @_;
2075 2275
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2277
2078 $hi = $lo + 1 if $hi <= $lo; 2278 $hi = $lo + 1 if $hi <= $lo;
2079 2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2080 $value = $lo if $value < $lo; 2282 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2283 $value = $hi - $page if $value > $hi - $page;
2082 2284
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2286 if $unit;
2085 2287
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2289
2090 if ($value != $old_value) { 2290 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2291 $self->_emit (changed => $value);
2092 $self->update; 2292 $self->update;
2093 } 2293 }
2094} 2294}
2095 2295
2096sub size_request { 2296sub size_request {
2097 my ($self) = @_; 2297 my ($self) = @_;
2098 2298
2099 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2300}
2104 2301
2105sub button_down { 2302sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2107 2304
2108 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2306
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308
2109 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2110} 2310}
2111 2311
2112sub mouse_motion { 2312sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2114 2314
2115 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2317
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2319
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2321
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2123 } 2327 1
2124} 2328}
2125 2329
2126sub update { 2330sub update {
2127 my ($self) = @_; 2331 my ($self) = @_;
2128 2332
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2334 $self->set_value ($self->{range}[0]);
2131 2335
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2133 2338
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2340
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2343
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2344 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2345 $value = $value * $self->{scale} + $self->{offset};
2140 2346
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2348 $self->{knob_w} = $knob_w;
2148 }); 2349 });
2149 2350
2150 $self->SUPER::update; 2351 $self->SUPER::update;
2151} 2352}
2152 2353
… …
2176 # draw handle 2377 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2378 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2379
2179 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2180} 2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::ValSlider;
2386
2387our @ISA = CFClient::UI::HBox::;
2388
2389sub new {
2390 my ($class, %arg) = @_;
2391
2392 my $range = delete $arg{range};
2393
2394 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift },
2398 from_value => sub { shift },
2399 %arg,
2400 );
2401
2402 $self->{slider}->connect (changed => sub {
2403 my ($self, $value) = @_;
2404 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2405 $self->{parent}->emit (changed => $value);
2406 });
2407
2408# $self->{entry}->connect (changed => sub {
2409# my ($self, $value) = @_;
2410# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2411# $self->{parent}->emit (changed => $value);
2412# });
2413
2414 $self->add ($self->{slider}, $self->{entry});
2415
2416 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2417
2418 $self
2419}
2420
2421sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) }
2181 2423
2182############################################################################# 2424#############################################################################
2183 2425
2184package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2185 2427
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2470
2229 $self->reflow; 2471 $self->reflow;
2230} 2472}
2231 2473
2232sub text_height { 2474sub text_size {
2233 my ($self, $text, $indent) = @_; 2475 my ($self, $text, $indent) = @_;
2234 2476
2235 my $layout = $self->{layout}; 2477 my $layout = $self->{layout};
2236 2478
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2481 $layout->set_markup ($text);
2240 2482
2241 ($layout->size)[1] 2483 $layout->size
2242} 2484}
2243 2485
2244sub reflow { 2486sub reflow {
2245 my ($self) = @_; 2487 my ($self) = @_;
2246 2488
2247 $self->{need_reflow}++; 2489 $self->{need_reflow}++;
2248 $self->update; 2490 $self->update;
2249} 2491}
2250 2492
2493sub set_offset {
2494 my ($self, $offset) = @_;
2495
2496 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset);
2498}
2499
2500sub clear {
2501 my ($self) = @_;
2502
2503 $self->{par} = [];
2504 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506}
2507
2251sub add_paragraph { 2508sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2253 2510
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2511 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2512 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2513 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2515 }
2261 2516
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2518}
2265 2519
2266sub update { 2520sub update {
2267 my ($self) = @_; 2521 my ($self) = @_;
2268 2522
… …
2271 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2272 2526
2273 delete $self->{texture}; 2527 delete $self->{texture};
2274 2528
2275 $ROOT->on_post_alloc ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2276 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2533 my $height = 0;
2278 2534
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2280 for @{$self->{par}}; 2539 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h;
2546 }
2547
2548 $height += $_->[1];
2549 }
2281 2550
2282 $self->{height} = $height; 2551 $self->{height} = $height;
2283 2552
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2554
2287 delete $self->{texture}; 2555 delete $self->{texture};
2288 } 2556 }
2289 2557
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2293 2561
2294 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2295 2563
2296 my $y0 = $top; 2564 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2298 2566
2299 my $y = 0; 2567 my $y = 0;
2300 2568
2301 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2302 2570
2303 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2304 2572
2305 glEnable GL_BLEND; 2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2576
2308 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2578 my $h = $par->[1];
2310 2579
2311 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2582 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2583 $layout->set_markup ($par->[4]);
2315 2584
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2586
2318 glRasterPos $par->[2], $y - $y0; 2587 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2589 }
2321 2590
2322 $y += $h; 2591 $y += $h;
2323 } 2592 }
… …
2390 2659
2391sub new { 2660sub new {
2392 my $class = shift; 2661 my $class = shift;
2393 2662
2394 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2395 state => 0, 2664 state => 0,
2396 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2397 @_ 2666 @_
2398 ); 2667 );
2399 2668
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2669 $self
2406} 2670}
2407 2671
2408sub toggle_flopper { 2672sub toggle_flopper {
2409 my ($self) = @_; 2673 my ($self) = @_;
2410 2674
2411 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2676}
2423 2677
2424############################################################################# 2678#############################################################################
2425 2679
2426package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2439} 2693}
2440 2694
2441sub set_tooltip_from { 2695sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2443 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2444 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2710 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2712 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2724
2462sub size_allocate { 2725sub size_allocate {
2463 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2464 2727
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2466} 2747}
2467 2748
2468sub _draw { 2749sub _draw {
2469 my ($self) = @_; 2750 my ($self) = @_;
2470 2751
… …
2487 glVertex $w, $h; 2768 glVertex $w, $h;
2488 glVertex $w, 0; 2769 glVertex $w, 0;
2489 glEnd; 2770 glEnd;
2490 2771
2491 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2492 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2493} 2775}
2494 2776
2495############################################################################# 2777#############################################################################
2496 2778
… …
2502 2784
2503sub new { 2785sub new {
2504 my $class = shift; 2786 my $class = shift;
2505 2787
2506 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2507 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2508 @_, 2791 @_,
2509 ); 2792 );
2510 2793
2511 if ($self->{anim} && $self->{animspeed}) { 2794 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2795 Scalar::Util::weaken (my $widget = $self);
… …
2527 2810
2528sub size_request { 2811sub size_request {
2529 (32, 8) 2812 (32, 8)
2530} 2813}
2531 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2532sub _draw { 2823sub _draw {
2533 my ($self) = @_; 2824 my ($self) = @_;
2534 2825
2535 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2536 2827
2537 my $face; 2828 my $face;
2538 2829
2539 if ($self->{frame}) { 2830 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2831 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2559 2850
2560 $self->{timer}->cancel 2851 $self->{timer}->cancel
2561 if $self->{timer}; 2852 if $self->{timer};
2562 2853
2563 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::InventoryItem;
2569
2570our @ISA = CFClient::UI::HBox::;
2571
2572sub _item_to_desc {
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719} 2855}
2720 2856
2721############################################################################# 2857#############################################################################
2722 2858
2723package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2758 2894
2759# popup given the event (must be a mouse button down event currently) 2895# popup given the event (must be a mouse button down event currently)
2760sub popup { 2896sub popup {
2761 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2762 2898
2763 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2764 2900
2765 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2902 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2768 2904
2769 $self->show; 2905 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 2907}
2772 2908
2773sub mouse_motion { 2909sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2775 2911
2776 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2779} 2917}
2780 2918
2781sub button_up { 2919sub button_up {
2782 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2783 2921
2784 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2923 undef $GRAB;
2786 $self->hide; 2924 $self->hide;
2787 2925
2788 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2790 } 2932 1
2791} 2933}
2792 2934
2793############################################################################# 2935#############################################################################
2794 2936
2795package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
… …
2855sub add { 2997sub add {
2856 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2857 2999
2858 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2860 3004
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 3006
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3008
… …
2898 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
2899} 3043}
2900 3044
2901############################################################################# 3045#############################################################################
2902 3046
2903package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2904 3048
2905our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3050
2909sub new { 3051sub new {
2910 my $class = shift; 3052 my $class = shift;
2911 3053
2912 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2913 @_, 3056 @_,
2914 ) 3057 );
2915}
2916 3058
2917sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
2918 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2919 3213
2920 $self->{w} = $w; 3214 $self->clear_command_list;
2921 $self->{h} = $h; 3215 $self->{recording} = 0;
2922} 3216 $self->{rec_btn}->set_text ("start recording");
2923 3217
2924sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
2925 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
2926 3236
2927 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2928 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2929} 3360}
2930 3361
2931sub size_request { 3362sub size_request {
2932 my ($self) = @_; 3363 my ($self) = @_;
2933 3364
2934 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
2935} 3380}
2936 3381
2937sub size_allocate { 3382sub size_allocate {
2938 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2939 3384
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3385 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3387
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
2951 3390
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3393
2958 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2959 } 3395 }
2960} 3396}
2961 3397
… …
2972} 3408}
2973 3409
2974sub update { 3410sub update {
2975 my ($self) = @_; 3411 my ($self) = @_;
2976 3412
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2979} 3414}
2980 3415
2981sub add { 3416sub add {
2982 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
2983 3418
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3419 $_->{is_toplevel} = 1
2986 3420 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3421
2992 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3423}
3424
3425sub remove {
3426 my ($self, @children) = @_;
3427
3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3432
3433 while (@children) {
3434 my $w = pop @children;
3435 push @children, $w->children;
3436 $w->set_invisible;
3437 }
2993} 3438}
2994 3439
2995sub on_refresh { 3440sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2997 3442
… …
3010 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3011 $_->() 3456 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3013 } 3458 }
3014 3459
3015 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3016 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
3017 3464
3018 for (;;) { 3465 outer:
3019 if ($self->{check_size}) { 3466 while () {
3020 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3023 } 3475 }
3024 3476
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
3026 3479
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3481 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3037 3500
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3039 3502
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3042 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3043 } 3513 }
3044 } 3514 }
3045 3515
3046 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3524
3050 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3052 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3053 $widget->{w} = $w; 3535 $widget->{w} = $w;
3054 $widget->{h} = $h; 3536 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3537
3056 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3057 } 3540 }
3058 } 3541 }
3059 3542
3060 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3061 $_->() 3544 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3063 } 3546 }
3547
3064 3548
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3068 3552
… …
3070 glLoadIdentity; 3554 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3557 glLoadIdentity;
3074 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
3075 $self->_draw; 3566 $self->_draw;
3076} 3567}
3077 3568
3078############################################################################# 3569#############################################################################
3079 3570

Diff Legend

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