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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.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 {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 263
229sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
301} 376}
302 377
303sub set_max_size { 378sub set_max_size {
304 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 383}
309 384
310sub set_tooltip { 385sub set_tooltip {
311 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
312 392
313 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
314 394
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 418 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
340 420
341 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
342 422
343 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
344 424
345 $focus->update if $focus; 425 $focus->update if $focus;
346 $FOCUS->update; 426 $FOCUS->update;
347} 427}
348 428
… …
351 431
352 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
353 433
354 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
355 435
356 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
357 437
358 $focus->update if $focus; #? 438 $focus->update if $focus; #?
359}
360 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
361sub mouse_motion { } 444sub mouse_motion { 0 }
362sub button_up { } 445sub button_up { 0 }
363sub key_down { } 446sub key_down { 0 }
364sub key_up { } 447sub key_up { 0 }
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}
371 453
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
376sub 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
377 530
378sub draw { 531sub draw {
379 my ($self) = @_; 532 my ($self) = @_;
380 533
381 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);
382 545
383 glPushMatrix; 546 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 548 $self->_draw;
386 glPopMatrix; 549 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
399 glEnd; 562 glEnd;
400 glDisable GL_BLEND; 563 glDisable GL_BLEND;
401 } 564 }
402 565
403 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 567 glPushMatrix;
405 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 571 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
412 glEnd; 575 glEnd;
413 glPopMatrix; 576 glPopMatrix;
414 #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;
415 } 578 }
416} 579}
417 580
418sub _draw { 581sub _draw {
419 my ($self) = @_; 582 my ($self) = @_;
420 583
421 warn "no draw defined for $self\n"; 584 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} 585}
473 586
474sub DESTROY { 587sub DESTROY {
475 my ($self) = @_; 588 my ($self) = @_;
476 589
… …
534 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
536} 649}
537 650
538sub size_request { 651sub size_request {
539 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
540} 655}
541 656
542sub draw { } 657sub draw { }
543 658
544############################################################################# 659#############################################################################
… …
573 $self->{children} = [ 688 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
576 ]; 691 ];
577 692
578 $self->check_size (1); 693 $self->realloc;
579 $self->update;
580} 694}
581 695
582sub children { 696sub children {
583 @{ $_[0]{children} } 697 @{ $_[0]{children} }
584} 698}
… …
589 delete $child->{parent}; 703 delete $child->{parent};
590 $child->hide; 704 $child->hide;
591 705
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 707
594 $self->check_size; 708 $self->realloc;
595 $self->update;
596} 709}
597 710
598sub clear { 711sub clear {
599 my ($self) = @_; 712 my ($self) = @_;
600 713
… …
604 for (@$children) { 717 for (@$children) {
605 delete $_->{parent}; 718 delete $_->{parent};
606 $_->hide; 719 $_->hide;
607 } 720 }
608 721
609 $self->check_size; 722 $self->realloc;
610 $self->update;
611} 723}
612 724
613sub find_widget { 725sub find_widget {
614 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
615 727
… …
702 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 815 $self->update;
704} 816}
705 817
706sub _render { 818sub _render {
819 my ($self) = @_;
820
707 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
708} 822}
709 823
710sub render_child { 824sub render_child {
711 my ($self) = @_; 825 my ($self) = @_;
712 826
713 $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 {
714 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 838 $self->_render;
718 }; 839 };
719} 840}
720 841
721sub _draw { 842sub _draw {
722 my ($self) = @_; 843 my ($self) = @_;
723 844
724 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
725 846
726 my $tex = $self->{texture} 847 my $tex = $self->{texture}
727 or return; 848 or return;
728 849
729 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
… …
739 860
740package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
741 862
742our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
743 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
744sub size_request { 875sub size_request {
745 my ($self) = @_; 876 my ($self) = @_;
746 877
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 879
750 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
751} 884}
752 885
753sub size_allocate { 886sub size_allocate {
754 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
755 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);
756 $self->update; 895 $self->update;
757} 896}
758 897
759sub set_offset { 898sub set_offset {
760 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
794} 933}
795 934
796sub _render { 935sub _render {
797 my ($self) = @_; 936 my ($self) = @_;
798 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
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 942
801 $self->SUPER::_render; 943 $self->SUPER::_render;
802} 944}
803 945
… …
811 my $class = shift; 953 my $class = shift;
812 954
813 my $self; 955 my $self;
814 956
815 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
816 vertical => 1, 958 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 960 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
820 }, 962 },
821 ; 963 ;
822 964
823 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 966 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
832 974
833 $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]);
834} 995}
835 996
836#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 998# update viewport offset on scroll
838 999
… …
882 1043
883our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
884 1045
885use CFClient::OpenGL; 1046use CFClient::OpenGL;
886 1047
887my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 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); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1055
891sub new { 1056sub new {
892 my $class = shift; 1057 my ($class, %arg) = @_;
893 1058
894 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
895 1060
896 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1064 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1065 can_events => 1,
902 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
903 ); 1069 );
904 1070
905 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
906 align => 0, 1072 align => 0,
907 valign => 1, 1073 valign => 1,
908 text => $self->{title}, 1074 text => $title,
909 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
910 1077
911 $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};
912} 1086}
913 1087
914sub border { 1088sub border {
915 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
916} 1090}
917 1091
918sub size_request { 1092sub size_request {
919 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
920 1097
921 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
922 1099
923 ( 1100 (
924 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
927} 1104}
928 1105
929sub size_allocate { 1106sub size_allocate {
930 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
931 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
932 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
934 1119
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
939} 1121}
940 1122
941sub button_down { 1123sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
943 1125
… …
959 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
960 1142
961 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
963 1145
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1151 };
969 1152
970 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1157 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
976 1159
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
978 1161
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
982 } 1168 1
983} 1169}
984 1170
985sub button_up { 1171sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
987 1173
988 delete $self->{motion}; 1174 !!delete $self->{motion}
989} 1175}
990 1176
991sub mouse_motion { 1177sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
993 1179
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
995} 1183}
996 1184
997sub _draw { 1185sub _draw {
998 my ($self) = @_; 1186 my ($self) = @_;
999 1187
1188 my $child = $self->{children}[0];
1189
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1192
1003 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1195
1006 my $border = $self->border; 1196 my $border = $self->border;
1007 1197
1008 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1203
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1016 1206
1017 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1210 $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); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1212 }
1028 1213
1029 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1030 1215
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1034} 1222}
1035 1223
1036############################################################################# 1224#############################################################################
1037 1225
1038package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1046sub new { 1234sub new {
1047 my $class = shift; 1235 my $class = shift;
1048 1236
1049 $class->SUPER::new ( 1237 $class->SUPER::new (
1050 col_expand => [], 1238 col_expand => [],
1051 @_ 1239 @_,
1052 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1245}
1054 1246
1055sub add { 1247sub add {
1056 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1057 1249
1058 $child->set_parent ($self); 1250 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1060 1252
1061 $child->check_size; 1253 $self->realloc;
1062} 1254}
1063 1255
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# 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?
1069sub clear { 1257sub clear {
1070 my ($self) = @_; 1258 my ($self) = @_;
1071 1259
1072 my @children = $self->children; 1260 my @children = $self->children;
1073 delete $self->{children}; 1261 delete $self->{children};
… …
1075 for (@children) { 1263 for (@children) {
1076 delete $_->{parent}; 1264 delete $_->{parent};
1077 $_->hide; 1265 $_->hide;
1078 } 1266 }
1079 1267
1080 $self->update; 1268 $self->realloc;
1081} 1269}
1082 1270
1083sub get_wh { 1271sub get_wh {
1084 my ($self) = @_; 1272 my ($self) = @_;
1085 1273
… …
1116sub size_allocate { 1304sub size_allocate {
1117 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1118 1306
1119 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1120 1308
1121 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1123 1311
1124 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1369 }
1182} 1370}
1183 1371
1184############################################################################# 1372#############################################################################
1185 1373
1186package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1375
1190our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1191 1377
1192sub size_request { 1378sub size_request {
1193 my ($self) = @_; 1379 my ($self) = @_;
1194 1380
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1196 1382 ? (
1197 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1385 )
1200 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1201} 1390}
1202 1391
1203sub size_allocate { 1392sub size_allocate {
1204 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1205 1394
1206 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1396 my $children = $self->{children};
1209 1397
1210 my @h = map $_->{req_w}, @$children; 1398 my @req;
1211 1399
1212 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1213 1401 @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 { 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 {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1415 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 } 1416 }
1228 } 1417 }
1229 1418
1230 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1231 1420
1232 my $y = 0; 1421 my $pos = 0;
1233 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1425
1238 $y += $h; 1426 $pos += $alloc;
1239 } 1427 }
1240 1428
1241 1 1429 1
1242} 1430}
1243 1431
1244############################################################################# 1432#############################################################################
1245 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
1246package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1247 1450
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1251 1452
1252sub size_request { 1453sub new {
1253 my ($self) = @_; 1454 my $class = shift;
1254 1455
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1256 1457 vertical => 1,
1257 ( 1458 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1459 )
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} 1460}
1301 1461
1302############################################################################# 1462#############################################################################
1303 1463
1304package CFClient::UI::Label; 1464package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1481 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1323 fontsize => 1, 1483 fontsize => 1,
1324 align => -1, 1484 align => -1,
1325 valign => -1, 1485 valign => -1,
1326 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1327 can_events => 0, 1488 can_events => 0,
1328 %arg 1489 %arg
1329 ); 1490 );
1330 1491
1331 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1368 1529
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1371 1532
1533 $self->realloc;
1372 $self->update; 1534 $self->update;
1373 $self->check_size;
1374} 1535}
1375 1536
1376sub set_markup { 1537sub set_markup {
1377 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1378 1539
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1544
1384 $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;
1385 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1386 1547
1548 $self->realloc;
1387 $self->update; 1549 $self->update;
1388 $self->check_size;
1389} 1550}
1390 1551
1391sub size_request { 1552sub size_request {
1392 my ($self) = @_; 1553 my ($self) = @_;
1393 1554
… …
1407 1568
1408 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1410 } 1571 }
1411 1572
1412 ( 1573 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1574}
1417 1575
1418sub size_allocate { 1576sub size_allocate {
1419 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1420 1578
1579 delete $self->{ox};
1580
1421 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1583}
1423 1584
1424sub set_fontsize { 1585sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1426 1587
1427 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1589 delete $self->{texture};
1429 1590
1430 $self->update; 1591 $self->realloc;
1431 $self->check_size;
1432} 1592}
1433 1593
1434sub _draw { 1594sub _draw {
1435 my ($self) = @_; 1595 my ($self) = @_;
1436 1596
… …
1442 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1606
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1448 1609
1610 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1452 1614
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1618 };
1459 1619
1460 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1622
… …
1488 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1489 can_hover => 1, 1649 can_hover => 1,
1490 can_focus => 1, 1650 can_focus => 1,
1491 valign => 0, 1651 valign => 0,
1492 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1493 @_ 1654 @_
1494 ) 1655 )
1495} 1656}
1496 1657
1497sub _set_text { 1658sub _set_text {
… …
1507 $self->{text} = $text; 1668 $self->{text} = $text;
1508 1669
1509 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1511 1672
1512 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1513} 1674}
1514 1675
1515sub set_text { 1676sub set_text {
1516 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1517 1678
1518 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1680 $self->_set_text ($text);
1520 $self->update; 1681
1521 $self->check_size; 1682 $self->realloc;
1522} 1683}
1523 1684
1524sub get_text { 1685sub get_text {
1525 $_[0]{text} 1686 $_[0]{text}
1526} 1687}
… …
1529 my ($self) = @_; 1690 my ($self) = @_;
1530 1691
1531 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1532 1693
1533 ($w + 1, $h) # add 1 for cursor 1694 ($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} 1695}
1541 1696
1542sub key_down { 1697sub key_down {
1543 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1544 1699
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1719 $self->_emit ('escape');
1565 } elsif ($uni) { 1720 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1567 } 1724 }
1568 1725
1569 $self->_set_text ($text); 1726 $self->_set_text ($text);
1570 $self->update; 1727
1571 $self->check_size; 1728 $self->realloc;
1729
1730 1
1572} 1731}
1573 1732
1574sub focus_in { 1733sub focus_in {
1575 my ($self) = @_; 1734 my ($self) = @_;
1576 1735
… …
1591 utf8::encode $text; 1750 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1593 1752
1594 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1595 $self->update; 1754 $self->update;
1755
1756 1
1596} 1757}
1597 1758
1598sub mouse_motion { 1759sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1600# 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
1601} 1764}
1602 1765
1603sub _draw { 1766sub _draw {
1604 my ($self) = @_; 1767 my ($self) = @_;
1605 1768
… …
1656 if ($sym == 13) { 1819 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1662 $self->update; 1825 $self->update;
1663 1826
1664 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1845 } else {
1683 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1684 } 1847 }
1685 1848
1686 } else { 1849 } else {
1687 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1688 } 1853 1
1689
1690} 1854}
1691 1855
1692############################################################################# 1856#############################################################################
1693 1857
1694package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1703 1867
1704sub new { 1868sub new {
1705 my $class = shift; 1869 my $class = shift;
1706 1870
1707 $class->SUPER::new ( 1871 $class->SUPER::new (
1708 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1709 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1711 can_hover => 1, 1876 can_hover => 1,
1712 align => 0, 1877 align => 0,
1713 valign => 0, 1878 valign => 0,
1714 can_events => 1, 1879 can_events => 1,
1715 @_ 1880 @_
1716 ) 1881 )
1717} 1882}
1718 1883
1884sub activate { }
1885
1719sub button_up { 1886sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1721 1888
1889 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1892
1725 } 1893 1
1726} 1894}
1727 1895
1728sub _draw { 1896sub _draw {
1729 my ($self) = @_; 1897 my ($self) = @_;
1730 1898
… …
1759 1927
1760sub new { 1928sub new {
1761 my $class = shift; 1929 my $class = shift;
1762 1930
1763 $class->SUPER::new ( 1931 $class->SUPER::new (
1764 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1765 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1938 state => 0,
… …
1773} 1942}
1774 1943
1775sub size_request { 1944sub size_request {
1776 my ($self) = @_; 1945 my ($self) = @_;
1777 1946
1778 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1779} 1948}
1780 1949
1781sub button_down { 1950sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1783 1952
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1788 } 1961 1
1789} 1962}
1790 1963
1791sub _draw { 1964sub _draw {
1792 my ($self) = @_; 1965 my ($self) = @_;
1793 1966
1794 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1795 1968
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1970
1798 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;
1799 1974
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1976
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1978
… …
2067 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2075 vertical => 0, 2250 vertical => 0,
2076 can_hover => 1, 2251 can_hover => 1,
2077 inner_pad => 0.02, 2252 inner_pad => 0.02,
2078 @_ 2253 @_
2079 ); 2254 );
… …
2082 $self->update; 2257 $self->update;
2083 2258
2084 $self 2259 $self
2085} 2260}
2086 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
2087sub set_value { 2273sub set_value {
2088 my ($self, $value) = @_; 2274 my ($self, $value) = @_;
2089 2275
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2277
2092 $hi = $lo + 1 if $hi <= $lo; 2278 $hi = $lo + 1 if $hi <= $lo;
2093 2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2094 $value = $lo if $value < $lo; 2282 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2283 $value = $hi - $page if $value > $hi - $page;
2096 2284
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2286 if $unit;
2099 2287
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2289
2104 if ($value != $old_value) { 2290 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2291 $self->_emit (changed => $value);
2106 $self->update; 2292 $self->update;
2107 } 2293 }
2108} 2294}
2109 2295
2110sub size_request { 2296sub size_request {
2111 my ($self) = @_; 2297 my ($self) = @_;
2112 2298
2113 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2300}
2118 2301
2119sub button_down { 2302sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2121 2304
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2124} 2310}
2125 2311
2126sub mouse_motion { 2312sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2128 2314
2129 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2317
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2319
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2321
2136 $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
2137 } 2327 1
2138} 2328}
2139 2329
2140sub update { 2330sub update {
2141 my ($self) = @_; 2331 my ($self) = @_;
2142 2332
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2334 $self->set_value ($self->{range}[0]);
2145 2335
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2147 2338
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2340
2150 $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;
2151 2343
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2344 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2345 $value = $value * $self->{scale} + $self->{offset};
2154 2346
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; 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2348 $self->{knob_w} = $knob_w;
2162 }); 2349 });
2163 2350
2164 $self->SUPER::update; 2351 $self->SUPER::update;
2165} 2352}
2166 2353
… …
2190 # draw handle 2377 # draw handle
2191 $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);
2192 2379
2193 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2194} 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 (@_) }
2195 2423
2196############################################################################# 2424#############################################################################
2197 2425
2198package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2199 2427
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2470
2243 $self->reflow; 2471 $self->reflow;
2244} 2472}
2245 2473
2246sub text_height { 2474sub text_size {
2247 my ($self, $text, $indent) = @_; 2475 my ($self, $text, $indent) = @_;
2248 2476
2249 my $layout = $self->{layout}; 2477 my $layout = $self->{layout};
2250 2478
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2481 $layout->set_markup ($text);
2254 2482
2255 ($layout->size)[1] 2483 $layout->size
2256} 2484}
2257 2485
2258sub reflow { 2486sub reflow {
2259 my ($self) = @_; 2487 my ($self) = @_;
2260 2488
2261 $self->{need_reflow}++; 2489 $self->{need_reflow}++;
2262 $self->update; 2490 $self->update;
2263} 2491}
2264 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
2265sub add_paragraph { 2508sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2267 2510
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2511 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2512 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2513 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2515 }
2275 2516
2276 $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]);
2277 $self->{children}[1]->update;
2278} 2518}
2279 2519
2280sub update { 2520sub update {
2281 my ($self) = @_; 2521 my ($self) = @_;
2282 2522
… …
2285 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2286 2526
2287 delete $self->{texture}; 2527 delete $self->{texture};
2288 2528
2289 $ROOT->on_post_alloc ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2290 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2533 my $height = 0;
2292 2534
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2294 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 }
2295 2550
2296 $self->{height} = $height; 2551 $self->{height} = $height;
2297 2552
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2554
2301 delete $self->{texture}; 2555 delete $self->{texture};
2302 } 2556 }
2303 2557
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2307 2561
2308 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2309 2563
2310 my $y0 = $top; 2564 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2312 2566
2313 my $y = 0; 2567 my $y = 0;
2314 2568
2315 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2316 2570
2317 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2318 2572
2319 glEnable GL_BLEND; 2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2576
2322 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2578 my $h = $par->[1];
2324 2579
2325 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2582 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2583 $layout->set_markup ($par->[4]);
2329 2584
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2586
2332 glRasterPos $par->[2], $y - $y0; 2587 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2589 }
2335 2590
2336 $y += $h; 2591 $y += $h;
2337 } 2592 }
… …
2404 2659
2405sub new { 2660sub new {
2406 my $class = shift; 2661 my $class = shift;
2407 2662
2408 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2409 state => 0, 2664 state => 0,
2410 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2411 @_ 2666 @_
2412 ); 2667 );
2413 2668
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2669 $self
2420} 2670}
2421 2671
2422sub toggle_flopper { 2672sub toggle_flopper {
2423 my ($self) = @_; 2673 my ($self) = @_;
2424 2674
2425 # TODO: use animation 2675 $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} 2676}
2437 2677
2438############################################################################# 2678#############################################################################
2439 2679
2440package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2453} 2693}
2454 2694
2455sub set_tooltip_from { 2695sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2457 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
2458 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2710 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2712 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2724
2476sub size_allocate { 2725sub size_allocate {
2477 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2478 2727
2479 $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 });
2480} 2747}
2481 2748
2482sub _draw { 2749sub _draw {
2483 my ($self) = @_; 2750 my ($self) = @_;
2484 2751
… …
2501 glVertex $w, $h; 2768 glVertex $w, $h;
2502 glVertex $w, 0; 2769 glVertex $w, 0;
2503 glEnd; 2770 glEnd;
2504 2771
2505 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2506 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2507} 2775}
2508 2776
2509############################################################################# 2777#############################################################################
2510 2778
… …
2516 2784
2517sub new { 2785sub new {
2518 my $class = shift; 2786 my $class = shift;
2519 2787
2520 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2521 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2522 @_, 2791 @_,
2523 ); 2792 );
2524 2793
2525 if ($self->{anim} && $self->{animspeed}) { 2794 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2795 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2821}
2553 2822
2554sub _draw { 2823sub _draw {
2555 my ($self) = @_; 2824 my ($self) = @_;
2556 2825
2557 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2558 2827
2559 my $face; 2828 my $face;
2560 2829
2561 if ($self->{frame}) { 2830 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2831 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2581 2850
2582 $self->{timer}->cancel 2851 $self->{timer}->cancel
2583 if $self->{timer}; 2852 if $self->{timer};
2584 2853
2585 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2586}
2587
2588#############################################################################
2589
2590package CFClient::UI::InventoryItem;
2591
2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749} 2855}
2750 2856
2751############################################################################# 2857#############################################################################
2752 2858
2753package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2788 2894
2789# 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)
2790sub popup { 2896sub popup {
2791 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2792 2898
2793 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2794 2900
2795 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 2902 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2798 2904
2799 $self->show; 2905 $self->show;
2800 $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);
2801} 2907}
2802 2908
2803sub mouse_motion { 2909sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2805 2911
2806 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2809} 2917}
2810 2918
2811sub button_up { 2919sub button_up {
2812 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2813 2921
2814 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 2923 undef $GRAB;
2816 $self->hide; 2924 $self->hide;
2817 2925
2818 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2820 } 2932 1
2821} 2933}
2822 2934
2823############################################################################# 2935#############################################################################
2824 2936
2825package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
… …
2885sub add { 2997sub add {
2886 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2887 2999
2888 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2890 3004
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2892 3006
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3008
… …
2928 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
2929} 3043}
2930 3044
2931############################################################################# 3045#############################################################################
2932 3046
2933package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2934 3048
2935our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 3050
2939sub new { 3051sub new {
2940 my $class = shift; 3052 my $class = shift;
2941 3053
2942 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2943 @_, 3056 @_,
2944 ) 3057 );
2945}
2946 3058
2947sub 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 {
2948 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2949 3213
2950 $self->{w} = $w; 3214 $self->clear_command_list;
2951 $self->{h} = $h; 3215 $self->{recording} = 0;
2952} 3216 $self->{rec_btn}->set_text ("start recording");
2953 3217
2954sub 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 {
2955 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}
2956 3236
2957 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2958 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
2959} 3360}
2960 3361
2961sub size_request { 3362sub size_request {
2962 my ($self) = @_; 3363 my ($self) = @_;
2963 3364
2964 ($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
2965} 3380}
2966 3381
2967sub size_allocate { 3382sub size_allocate {
2968 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2969 3384
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3385 for my $child ($self->children) {
2977 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)};
2978 3387
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
2981 3390
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3393
2988 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2989 } 3395 }
2990} 3396}
2991 3397
… …
3002} 3408}
3003 3409
3004sub update { 3410sub update {
3005 my ($self) = @_; 3411 my ($self) = @_;
3006 3412
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
3009} 3414}
3010 3415
3011sub add { 3416sub add {
3012 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
3013 3418
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3419 $_->{is_toplevel} = 1
3016 3420 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3421
3022 $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;
3023 3432
3024 while (@children) { 3433 while (@children) {
3025 my $w = pop @children; 3434 my $w = pop @children;
3026 push @children, $w->children; 3435 push @children, $w->children;
3027 $w->{visible} = 1; 3436 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3437 }
3041} 3438}
3042 3439
3043sub on_refresh { 3440sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3059 $_->() 3456 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3061 } 3458 }
3062 3459
3063 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3064 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
3065 3464
3066 for (;;) { 3465 outer:
3067 if ($self->{check_size}) { 3466 while () {
3068 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
3070 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 }
3071 } 3475 }
3072 3476
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
3074 3479
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3481 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 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}) {
3083 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3085 3500
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3087 3502
3088 $widget->{parent}->check_size
3089 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 }
3090 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3091 } 3513 }
3092 } 3514 }
3093 3515
3094 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 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)};
3097 3524
3098 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3100 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
3101 $widget->{w} = $w; 3535 $widget->{w} = $w;
3102 $widget->{h} = $h; 3536 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3537
3104 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3105 } 3540 }
3106 } 3541 }
3107 3542
3108 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3109 $_->() 3544 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3111 } 3546 }
3547
3112 3548
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3116 3552
… …
3118 glLoadIdentity; 3554 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3557 glLoadIdentity;
3122 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
3123 $self->_draw; 3566 $self->_draw;
3124} 3567}
3125 3568
3126############################################################################# 3569#############################################################################
3127 3570

Diff Legend

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