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.215 by root, Fri May 19 03:49:48 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 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 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
281} 376}
282 377
283sub set_max_size { 378sub set_max_size {
284 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 383}
289 384
290sub set_tooltip { 385sub set_tooltip {
291 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
292 392
293 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
294 394
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 418 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
320 420
321 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
322 422
323 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
324 424
325 $focus->update if $focus; 425 $focus->update if $focus;
326 $FOCUS->update; 426 $FOCUS->update;
327} 427}
328 428
… …
331 431
332 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
333 433
334 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
335 435
336 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
337 437
338 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
339} 442}
340 443
341sub mouse_motion { } 444sub mouse_motion { }
342sub button_up { } 445sub button_up { }
343sub key_down { } 446sub key_down { }
344sub key_up { } 447sub key_up { }
345 448
346sub button_down { 449sub button_down {
347 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
348 451
349 $self->focus_in; 452 $self->focus_in;
350} 453}
351 454
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 528
358sub draw { 529sub draw {
359 my ($self) = @_; 530 my ($self) = @_;
360 531
361 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
362 541
363 glPushMatrix; 542 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 544 $self->_draw;
366 glPopMatrix; 545 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
379 glEnd; 558 glEnd;
380 glDisable GL_BLEND; 559 glDisable GL_BLEND;
381 } 560 }
382 561
383 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 563 glPushMatrix;
385 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 567 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
392 glEnd; 571 glEnd;
393 glPopMatrix; 572 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 574 }
396} 575}
397 576
398sub _draw { 577sub _draw {
399 my ($self) = @_; 578 my ($self) = @_;
400 579
401 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 581}
451 582
452sub DESTROY { 583sub DESTROY {
453 my ($self) = @_; 584 my ($self) = @_;
454 585
… …
512 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
514} 645}
515 646
516sub size_request { 647sub size_request {
517 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
518} 651}
519 652
520sub draw { } 653sub draw { }
521 654
522############################################################################# 655#############################################################################
… …
551 $self->{children} = [ 684 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
554 ]; 687 ];
555 688
556 $self->check_size (1); 689 $self->realloc;
557 $self->update;
558} 690}
559 691
560sub children { 692sub children {
561 @{ $_[0]{children} } 693 @{ $_[0]{children} }
562} 694}
… …
567 delete $child->{parent}; 699 delete $child->{parent};
568 $child->hide; 700 $child->hide;
569 701
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 703
572 $self->check_size; 704 $self->realloc;
573 $self->update;
574} 705}
575 706
576sub clear { 707sub clear {
577 my ($self) = @_; 708 my ($self) = @_;
578 709
… …
582 for (@$children) { 713 for (@$children) {
583 delete $_->{parent}; 714 delete $_->{parent};
584 $_->hide; 715 $_->hide;
585 } 716 }
586 717
587 $self->check_size; 718 $self->realloc;
588 $self->update;
589} 719}
590 720
591sub find_widget { 721sub find_widget {
592 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
593 723
… …
680 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 811 $self->update;
682} 812}
683 813
684sub _render { 814sub _render {
815 my ($self) = @_;
816
685 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
686} 818}
687 819
688sub render_child { 820sub render_child {
689 my ($self) = @_; 821 my ($self) = @_;
690 822
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0.5, 0.5, 0.5, 1; 824 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
694 833
695 $self->_render; 834 $self->_render;
696 }; 835 };
697} 836}
698 837
699sub _draw { 838sub _draw {
700 my ($self) = @_; 839 my ($self) = @_;
701 840
702 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
703 842
704 my $tex = $self->{texture} 843 my $tex = $self->{texture}
705 or return; 844 or return;
706 845
707 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
… …
717 856
718package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
719 858
720our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
721 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
722sub size_request { 871sub size_request {
723 my ($self) = @_; 872 my ($self) = @_;
724 873
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 875
728 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
729} 880}
730 881
731sub size_allocate { 882sub size_allocate {
732 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
733 884
885 my $child = $self->child;
886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
890 $self->child->configure (0, 0, $w, $h);
734 $self->update; 891 $self->update;
735} 892}
736 893
737sub set_offset { 894sub set_offset {
738 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
772} 929}
773 930
774sub _render { 931sub _render {
775 my ($self) = @_; 932 my ($self) = @_;
776 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 938
779 $self->SUPER::_render; 939 $self->SUPER::_render;
780} 940}
781 941
… …
789 my $class = shift; 949 my $class = shift;
790 950
791 my $self; 951 my $self;
792 952
793 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
794 vertical => 1, 954 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 956 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
798 }, 958 },
799 ; 959 ;
800 960
801 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 963 slider => $slider,
804 @_, 964 @_,
805 ); 965 );
806 966
807 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
810 970
811 $self 971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 991}
813 992
814#TODO# update range on size_allocate depending on child 993#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 994# update viewport offset on scroll
816 995
… …
860 1039
861our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
862 1041
863use CFClient::OpenGL; 1042use CFClient::OpenGL;
864 1043
865my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1051
869sub new { 1052sub new {
870 my $class = shift; 1053 my $class = shift;
871 1054
872 # TODO: user_x, user_y, overwrite moveto?
873
874 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1058 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
880 @_ 1062 @_
881 ); 1063 );
882 1064
883 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 1066 align => 0,
… …
937 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
938 1120
939 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
941 1123
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1129 };
947 1130
948 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1135 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
954 1137
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
956 1139
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1141 };
960 } 1142 }
961} 1143}
962 1144
963sub button_up { 1145sub button_up {
… …
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1165
984 my $border = $self->border; 1166 my $border = $self->border;
985 1167
986 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1173
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
994 1176
995 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1182 }
1006 1183
1007 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
1008 1185
… …
1024sub new { 1201sub new {
1025 my $class = shift; 1202 my $class = shift;
1026 1203
1027 $class->SUPER::new ( 1204 $class->SUPER::new (
1028 col_expand => [], 1205 col_expand => [],
1029 @_ 1206 @_,
1030 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1212}
1032 1213
1033sub add { 1214sub add {
1034 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1035 1216
1036 $child->set_parent ($self); 1217 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1038 1219
1039 $child->check_size; 1220 $self->realloc;
1040} 1221}
1041 1222
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1224sub clear {
1048 my ($self) = @_; 1225 my ($self) = @_;
1049 1226
1050 my @children = $self->children; 1227 my @children = $self->children;
1051 delete $self->{children}; 1228 delete $self->{children};
… …
1053 for (@children) { 1230 for (@children) {
1054 delete $_->{parent}; 1231 delete $_->{parent};
1055 $_->hide; 1232 $_->hide;
1056 } 1233 }
1057 1234
1058 $self->update; 1235 $self->realloc;
1059} 1236}
1060 1237
1061sub get_wh { 1238sub get_wh {
1062 my ($self) = @_; 1239 my ($self) = @_;
1063 1240
… …
1094sub size_allocate { 1271sub size_allocate {
1095 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1096 1273
1097 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1098 1275
1099 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1101 1278
1102 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1336 }
1160} 1337}
1161 1338
1162############################################################################# 1339#############################################################################
1163 1340
1164package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1342
1168our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1169 1344
1170sub size_request { 1345sub size_request {
1171 my ($self) = @_; 1346 my ($self) = @_;
1172 1347
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1174 1349 ? (
1175 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1352 )
1178 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1179} 1357}
1180 1358
1181sub size_allocate { 1359sub size_allocate {
1182 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1183 1361
1184 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1363 my $children = $self->{children};
1187 1364
1188 my @h = map $_->{req_w}, @$children; 1365 my @req;
1189 1366
1190 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1191 1368 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1383 }
1206 } 1384 }
1207 1385
1208 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1209 1387
1210 my $y = 0; 1388 my $pos = 0;
1211 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1392
1216 $y += $h; 1393 $pos += $alloc;
1217 } 1394 }
1218 1395
1219 1 1396 1
1220} 1397}
1221 1398
1222############################################################################# 1399#############################################################################
1223 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1224package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1225 1417
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1229 1419
1230sub size_request { 1420sub new {
1231 my ($self) = @_; 1421 my $class = shift;
1232 1422
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1234 1424 vertical => 1,
1235 ( 1425 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1426 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1427}
1279 1428
1280############################################################################# 1429#############################################################################
1281 1430
1282package CFClient::UI::Label; 1431package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1448 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1301 fontsize => 1, 1450 fontsize => 1,
1302 align => -1, 1451 align => -1,
1303 valign => -1, 1452 valign => -1,
1304 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1305 can_events => 0, 1455 can_events => 0,
1306 %arg 1456 %arg
1307 ); 1457 );
1308 1458
1309 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1346 1496
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1349 1499
1500 $self->realloc;
1350 $self->update; 1501 $self->update;
1351 $self->check_size;
1352} 1502}
1353 1503
1354sub set_markup { 1504sub set_markup {
1355 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1356 1506
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1511
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1364 1514
1515 $self->realloc;
1365 $self->update; 1516 $self->update;
1366 $self->check_size;
1367} 1517}
1368 1518
1369sub size_request { 1519sub size_request {
1370 my ($self) = @_; 1520 my ($self) = @_;
1371 1521
… …
1385 1535
1386 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1388 } 1538 }
1389 1539
1390 ( 1540 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1541}
1395 1542
1396sub size_allocate { 1543sub size_allocate {
1397 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1398 1545
1399 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1548}
1401 1549
1402sub set_fontsize { 1550sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1404 1552
1405 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1554 delete $self->{texture};
1407 1555
1408 $self->update; 1556 $self->realloc;
1409 $self->check_size;
1410} 1557}
1411 1558
1412sub _draw { 1559sub _draw {
1413 my ($self) = @_; 1560 my ($self) = @_;
1414 1561
… …
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1571
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426 1573
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1430 1577
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1434 1581
1435 $tex 1582 $tex
1436 }; 1583 };
1437 1584
… …
1466 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1467 can_hover => 1, 1614 can_hover => 1,
1468 can_focus => 1, 1615 can_focus => 1,
1469 valign => 0, 1616 valign => 0,
1470 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1471 @_ 1619 @_
1472 ) 1620 )
1473} 1621}
1474 1622
1475sub _set_text { 1623sub _set_text {
… …
1485 $self->{text} = $text; 1633 $self->{text} = $text;
1486 1634
1487 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1489 1637
1490 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1491} 1639}
1492 1640
1493sub set_text { 1641sub set_text {
1494 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1495 1643
1496 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1645 $self->_set_text ($text);
1498 $self->update; 1646
1499 $self->check_size; 1647 $self->realloc;
1500} 1648}
1501 1649
1502sub get_text { 1650sub get_text {
1503 $_[0]{text} 1651 $_[0]{text}
1504} 1652}
… …
1507 my ($self) = @_; 1655 my ($self) = @_;
1508 1656
1509 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1510 1658
1511 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1660}
1519 1661
1520sub key_down { 1662sub key_down {
1521 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1522 1664
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1683 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1684 $self->_emit ('escape');
1543 } elsif ($uni) { 1685 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1687 }
1546 1688
1547 $self->_set_text ($text); 1689 $self->_set_text ($text);
1548 $self->update; 1690
1549 $self->check_size; 1691 $self->realloc;
1550} 1692}
1551 1693
1552sub focus_in { 1694sub focus_in {
1553 my ($self) = @_; 1695 my ($self) = @_;
1554 1696
… …
1634 if ($sym == 13) { 1776 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1640 $self->update; 1782 $self->update;
1641 1783
1642 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1681 1823
1682sub new { 1824sub new {
1683 my $class = shift; 1825 my $class = shift;
1684 1826
1685 $class->SUPER::new ( 1827 $class->SUPER::new (
1686 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1687 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1689 can_hover => 1, 1832 can_hover => 1,
1690 align => 0, 1833 align => 0,
1691 valign => 0, 1834 valign => 0,
1692 can_events => 1, 1835 can_events => 1,
1693 @_ 1836 @_
1694 ) 1837 )
1695} 1838}
1696 1839
1840sub activate { }
1841
1697sub button_up { 1842sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1699 1844
1845 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1848}
1705 1849
1706sub _draw { 1850sub _draw {
1707 my ($self) = @_; 1851 my ($self) = @_;
1708 1852
… …
1737 1881
1738sub new { 1882sub new {
1739 my $class = shift; 1883 my $class = shift;
1740 1884
1741 $class->SUPER::new ( 1885 $class->SUPER::new (
1742 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1743 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1890 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1891 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1892 state => 0,
… …
1751} 1896}
1752 1897
1753sub size_request { 1898sub size_request {
1754 my ($self) = @_; 1899 my ($self) = @_;
1755 1900
1756 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1757} 1902}
1758 1903
1759sub button_down { 1904sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1761 1906
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1766 } 1911 }
1767} 1912}
1768 1913
1769sub _draw { 1914sub _draw {
1770 my ($self) = @_; 1915 my ($self) = @_;
1771 1916
1772 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1773 1918
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1920
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 1924
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1926
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1928
… …
2045 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2195 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2196 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2053 vertical => 0, 2200 vertical => 0,
2054 can_hover => 1, 2201 can_hover => 1,
2055 inner_pad => .05, 2202 inner_pad => 0.02,
2056 @_ 2203 @_
2057 ); 2204 );
2058 2205
2059 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2060 $self->update; 2207 $self->update;
2061 2208
2062 $self 2209 $self
2063} 2210}
2064 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2065sub set_value { 2223sub set_value {
2066 my ($self, $value) = @_; 2224 my ($self, $value) = @_;
2067 2225
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2227
2070 $hi = $lo + 1 if $hi <= $lo; 2228 $hi = $lo + 1 if $hi <= $lo;
2071 2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2072 $value = $lo if $value < $lo; 2232 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2233 $value = $hi - $page if $value > $hi - $page;
2074 2234
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2236 if $unit;
2077 2237
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2239
2082 if ($value != $old_value) { 2240 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2241 $self->_emit (changed => $value);
2084 $self->update; 2242 $self->update;
2085 } 2243 }
2086} 2244}
2087 2245
2088sub size_request { 2246sub size_request {
2089 my ($self) = @_; 2247 my ($self) = @_;
2090 2248
2091 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2250}
2096 2251
2097sub button_down { 2252sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2099 2254
2100 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
2101 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2102} 2260}
2103 2261
2104sub mouse_motion { 2262sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2267
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2269
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2271
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2273 }
2116} 2274}
2117 2275
2118sub update { 2276sub update {
2119 my ($self) = @_; 2277 my ($self) = @_;
2120 2278
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2280 $self->set_value ($self->{range}[0]);
2123 2281
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2125 2284
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2286
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2289
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2290 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2291 $value = $value * $self->{scale} + $self->{offset};
2132 2292
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2294 $self->{knob_w} = $knob_w;
2140 }); 2295 });
2141 2296
2142 $self->SUPER::update; 2297 $self->SUPER::update;
2143} 2298}
2144 2299
… …
2168 # draw handle 2323 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2325
2171 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2172} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
2173 2369
2174############################################################################# 2370#############################################################################
2175 2371
2176package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2177 2373
… …
2207 2403
2208 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2405 $self->reflow;
2210} 2406}
2211 2407
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2408sub size_allocate {
2232 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2233 2410
2234 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2235 2412
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2416
2240 $self->reflow; 2417 $self->reflow;
2241} 2418}
2242 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2243sub add_paragraph { 2454sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2245 2456
2246 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2247 2458 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2251 2462
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2464}
2257 2465
2258sub update { 2466sub update {
2259 my ($self) = @_; 2467 my ($self) = @_;
2260 2468
… …
2263 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2264 2472
2265 delete $self->{texture}; 2473 delete $self->{texture};
2266 2474
2267 $ROOT->on_post_alloc ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2268 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2479 my $height = 0;
2270 2480
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2272 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2273 2496
2274 $self->{height} = $height; 2497 $self->{height} = $height;
2275 2498
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2500
2278 delete $self->{texture}; 2501 delete $self->{texture};
2279 } 2502 }
2280 2503
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2284 2507
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2508 my $top = int $self->{children}[1]{range}[0];
2289 2509
2290 my $y0 = $top; 2510 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2292 2512
2293 my $y = 0; 2513 my $y = 0;
2294 2514
2295 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2296 2516
2297 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2298 2518
2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522
2299 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2524 my $h = $par->[1];
2301 2525
2302 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2305 2530
2306 my ($W, $H) = $layout->size; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2532
2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2535 }
2309 2536
2310 $y += $h; 2537 $y += $h;
2311 } 2538 }
2312 2539
2313 glDisable GL_TEXTURE_2D; 2540 glDisable GL_BLEND;
2314 }; 2541 };
2315 }); 2542 });
2316} 2543}
2317 2544
2318sub _draw { 2545sub _draw {
2319 my ($self) = @_; 2546 my ($self) = @_;
2320 2547
2321 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2324 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2326 2553
2327 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2328 2555
2329} 2556}
… …
2378 2605
2379sub new { 2606sub new {
2380 my $class = shift; 2607 my $class = shift;
2381 2608
2382 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2383 state => 0, 2610 state => 0,
2384 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2385 @_ 2612 @_
2386 ); 2613 );
2387 2614
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2615 $self
2394} 2616}
2395 2617
2396sub toggle_flopper { 2618sub toggle_flopper {
2397 my ($self) = @_; 2619 my ($self) = @_;
2398 2620
2399 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2622}
2411 2623
2412############################################################################# 2624#############################################################################
2413 2625
2414package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2427} 2639}
2428 2640
2429sub set_tooltip_from { 2641sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2431 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2432 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2656 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2658 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2670
2450sub size_allocate { 2671sub size_allocate {
2451 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2452 2673
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2454} 2693}
2455 2694
2456sub _draw { 2695sub _draw {
2457 my ($self) = @_; 2696 my ($self) = @_;
2458 2697
… …
2475 glVertex $w, $h; 2714 glVertex $w, $h;
2476 glVertex $w, 0; 2715 glVertex $w, 0;
2477 glEnd; 2716 glEnd;
2478 2717
2479 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2480 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2481} 2721}
2482 2722
2483############################################################################# 2723#############################################################################
2484 2724
… …
2489use CFClient::OpenGL; 2729use CFClient::OpenGL;
2490 2730
2491sub new { 2731sub new {
2492 my $class = shift; 2732 my $class = shift;
2493 2733
2494 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2495 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2496 @_, 2737 @_,
2497 ) 2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2498} 2755}
2499 2756
2500sub size_request { 2757sub size_request {
2501 (32, 8) 2758 (32, 8)
2502} 2759}
2503 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2504sub _draw { 2769sub _draw {
2505 my ($self) = @_; 2770 my ($self) = @_;
2506 2771
2507 return unless $::CONN;#d# manage and cache textures differently 2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2784
2510 # TODO animation
2511 if ($tex) { 2785 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2517 } 2791 }
2518} 2792}
2519 2793
2520############################################################################# 2794sub DESTROY {
2521
2522package CFClient::UI::InventoryItem;
2523
2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_; 2795 my ($self) = @_;
2528 2796
2529 my $desc = 2797 $self->{timer}->cancel
2530 $item->{nrof} < 2 2798 if $self->{timer};
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533 2799
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2800 $self->SUPER::DESTROY;
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668} 2801}
2669 2802
2670############################################################################# 2803#############################################################################
2671 2804
2672package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2707 2840
2708# popup given the event (must be a mouse button down event currently) 2841# popup given the event (must be a mouse button down event currently)
2709sub popup { 2842sub popup {
2710 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2711 2844
2712 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2713 2846
2714 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2848 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2717 2850
2718 $self->show; 2851 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 2853}
2721 2854
2722sub mouse_motion { 2855sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2724 2857
… …
2732 2865
2733 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2867 undef $GRAB;
2735 $self->hide; 2868 $self->hide;
2736 2869
2737 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2739 } 2872 }
2740} 2873}
2741 2874
2742############################################################################# 2875#############################################################################
… …
2804sub add { 2937sub add {
2805 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2806 2939
2807 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2809 2944
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2946
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2948
… …
2847 $self->SUPER::reconfigure; 2982 $self->SUPER::reconfigure;
2848} 2983}
2849 2984
2850############################################################################# 2985#############################################################################
2851 2986
2852package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2853 2988
2854our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2855
2856use CFClient::OpenGL;
2857 2990
2858sub new { 2991sub new {
2859 my $class = shift; 2992 my $class = shift;
2860 2993
2861 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2862 @_, 2996 @_,
2863 ) 2997 );
2864}
2865 2998
2866sub configure { 2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
2867 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2868 3148
2869 $self->{w} = $w; 3149 $self->clear_command_list;
2870 $self->{h} = $h; 3150 $self->{recording} = 0;
2871} 3151 $self->{rec_btn}->set_text ("start recording");
2872 3152
2873sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
2874 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
2875 3171
2876 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2877 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2878} 3295}
2879 3296
2880sub size_request { 3297sub size_request {
2881 my ($self) = @_; 3298 my ($self) = @_;
2882 3299
2883 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
2884} 3315}
2885 3316
2886sub size_allocate { 3317sub size_allocate {
2887 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2888 3319
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3320 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3322
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
2900 3325
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3327 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3328
2907 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2908 } 3330 }
2909} 3331}
2910 3332
… …
2921} 3343}
2922 3344
2923sub update { 3345sub update {
2924 my ($self) = @_; 3346 my ($self) = @_;
2925 3347
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2928} 3349}
2929 3350
2930sub add { 3351sub add {
2931 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
2932 3353
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3354 $_->{is_toplevel} = 1
2935 3355 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3356
2941 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2942} 3373}
2943 3374
2944sub on_refresh { 3375sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2946 3377
… …
2959 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2960 $_->() 3391 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2962 } 3393 }
2963 3394
2964 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
2965 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
2966 3399
2967 for (;;) { 3400 outer:
2968 if ($self->{check_size}) { 3401 while () {
2969 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
2972 } 3410 }
2973 3411
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
2975 3414
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3416 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
2986 3435
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
2988 3437
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
2991 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
2992 } 3448 }
2993 } 3449 }
2994 3450
2995 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 my ($widget, $w, $h) = @$_; 3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998 3459
2999 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
3001 3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3002 $widget->{w} = $w; 3470 $widget->{w} = $w;
3003 $widget->{h} = $h; 3471 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3472
3005 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
3006 } 3475 }
3007 } 3476 }
3008 3477
3009 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
3010 $_->() 3479 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
3012 } 3481 }
3013 3482
3483
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
3017 3487
3018 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3489 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3492 glLoadIdentity;
3023 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
3024 $self->_draw; 3501 $self->_draw;
3025} 3502}
3026 3503
3027############################################################################# 3504#############################################################################
3028 3505

Diff Legend

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