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.214 by root, Wed May 17 22:59:13 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, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
694 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
695 $self->_render; 834 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 835 };
704} 836}
705 837
706sub _draw { 838sub _draw {
707 my ($self) = @_; 839 my ($self) = @_;
708 840
709 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
710 842
711 my $tex = $self->{texture} 843 my $tex = $self->{texture}
712 or return; 844 or return;
713 845
714 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 848 glColor 1, 1, 1, 1;
717 849
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 851
720 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
721} 853}
… …
724 856
725package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
726 858
727our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
728 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
729sub size_request { 871sub size_request {
730 my ($self) = @_; 872 my ($self) = @_;
731 873
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 875
735 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
736} 880}
737 881
738sub size_allocate { 882sub size_allocate {
739 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
740 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);
741 $self->update; 891 $self->update;
742} 892}
743 893
744sub set_offset { 894sub set_offset {
745 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
779} 929}
780 930
781sub _render { 931sub _render {
782 my ($self) = @_; 932 my ($self) = @_;
783 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
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 938
786 $self->SUPER::_render; 939 $self->SUPER::_render;
787} 940}
788 941
… …
796 my $class = shift; 949 my $class = shift;
797 950
798 my $self; 951 my $self;
799 952
800 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
801 vertical => 1, 954 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 956 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
805 }, 958 },
806 ; 959 ;
807 960
808 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 963 slider => $slider,
811 @_, 964 @_,
812 ); 965 );
813 966
814 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
817 970
818 $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]);
819} 991}
820 992
821#TODO# update range on size_allocate depending on child 993#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 994# update viewport offset on scroll
823 995
… …
867 1039
868our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
869 1041
870use CFClient::OpenGL; 1042use CFClient::OpenGL;
871 1043
872my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 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);
875 1051
876sub new { 1052sub new {
877 my $class = shift; 1053 my $class = shift;
878 1054
879 # TODO: user_x, user_y, overwrite moveto?
880
881 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1058 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
887 @_ 1062 @_
888 ); 1063 );
889 1064
890 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 1066 align => 0,
… …
944 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
945 1120
946 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
948 1123
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size;
953 }; 1129 };
954 1130
955 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1135 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
961 1137
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
963 1139
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update;
966 }; 1141 };
967 } 1142 }
968} 1143}
969 1144
970sub button_up { 1145sub button_up {
… …
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1165
991 my $border = $self->border; 1166 my $border = $self->border;
992 1167
993 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1173
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
1001 1176
1002 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1182 }
1013 1183
1014 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
1015 1185
… …
1031sub new { 1201sub new {
1032 my $class = shift; 1202 my $class = shift;
1033 1203
1034 $class->SUPER::new ( 1204 $class->SUPER::new (
1035 col_expand => [], 1205 col_expand => [],
1036 @_ 1206 @_,
1037 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1212}
1039 1213
1040sub add { 1214sub add {
1041 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1042 1216
1043 $child->set_parent ($self); 1217 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1045 1219
1046 $child->check_size; 1220 $self->realloc;
1047} 1221}
1048 1222
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# 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?
1054sub clear { 1224sub clear {
1055 my ($self) = @_; 1225 my ($self) = @_;
1056 1226
1057 my @children = $self->children; 1227 my @children = $self->children;
1058 delete $self->{children}; 1228 delete $self->{children};
… …
1060 for (@children) { 1230 for (@children) {
1061 delete $_->{parent}; 1231 delete $_->{parent};
1062 $_->hide; 1232 $_->hide;
1063 } 1233 }
1064 1234
1065 $self->update; 1235 $self->realloc;
1066} 1236}
1067 1237
1068sub get_wh { 1238sub get_wh {
1069 my ($self) = @_; 1239 my ($self) = @_;
1070 1240
… …
1101sub size_allocate { 1271sub size_allocate {
1102 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1103 1273
1104 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1105 1275
1106 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1108 1278
1109 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1336 }
1167} 1337}
1168 1338
1169############################################################################# 1339#############################################################################
1170 1340
1171package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1342
1175our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1176 1344
1177sub size_request { 1345sub size_request {
1178 my ($self) = @_; 1346 my ($self) = @_;
1179 1347
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1181 1349 ? (
1182 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1352 )
1185 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1186} 1357}
1187 1358
1188sub size_allocate { 1359sub size_allocate {
1189 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1190 1361
1191 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1363 my $children = $self->{children};
1194 1364
1195 my @h = map $_->{req_w}, @$children; 1365 my @req;
1196 1366
1197 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1198 1368 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } 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 {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1383 }
1213 } 1384 }
1214 1385
1215 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1216 1387
1217 my $y = 0; 1388 my $pos = 0;
1218 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1392
1223 $y += $h; 1393 $pos += $alloc;
1224 } 1394 }
1225 1395
1226 1 1396 1
1227} 1397}
1228 1398
1229############################################################################# 1399#############################################################################
1230 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
1231package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1232 1417
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1236 1419
1237sub size_request { 1420sub new {
1238 my ($self) = @_; 1421 my $class = shift;
1239 1422
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1241 1424 vertical => 1,
1242 ( 1425 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1426 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1427}
1286 1428
1287############################################################################# 1429#############################################################################
1288 1430
1289package CFClient::UI::Label; 1431package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1448 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1308 fontsize => 1, 1450 fontsize => 1,
1309 align => -1, 1451 align => -1,
1310 valign => -1, 1452 valign => -1,
1311 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1312 can_events => 0, 1455 can_events => 0,
1313 %arg 1456 %arg
1314 ); 1457 );
1315 1458
1316 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1353 1496
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1356 1499
1500 $self->realloc;
1357 $self->update; 1501 $self->update;
1358 $self->check_size;
1359} 1502}
1360 1503
1361sub set_markup { 1504sub set_markup {
1362 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1363 1506
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1511
1369 $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;
1370 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1371 1514
1515 $self->realloc;
1372 $self->update; 1516 $self->update;
1373 $self->check_size;
1374} 1517}
1375 1518
1376sub size_request { 1519sub size_request {
1377 my ($self) = @_; 1520 my ($self) = @_;
1378 1521
… …
1392 1535
1393 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1395 } 1538 }
1396 1539
1397 ( 1540 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1541}
1402 1542
1403sub size_allocate { 1543sub size_allocate {
1404 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1405 1545
1406 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1548}
1408 1549
1409sub set_fontsize { 1550sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1411 1552
1412 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1554 delete $self->{texture};
1414 1555
1415 $self->update; 1556 $self->realloc;
1416 $self->check_size;
1417} 1557}
1418 1558
1419sub _draw { 1559sub _draw {
1420 my ($self) = @_; 1560 my ($self) = @_;
1421 1561
… …
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1571
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433 1573
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1437 1577
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1441 1581
1442 $tex 1582 $tex
1443 }; 1583 };
1444 1584
… …
1473 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1474 can_hover => 1, 1614 can_hover => 1,
1475 can_focus => 1, 1615 can_focus => 1,
1476 valign => 0, 1616 valign => 0,
1477 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1478 @_ 1619 @_
1479 ) 1620 )
1480} 1621}
1481 1622
1482sub _set_text { 1623sub _set_text {
… …
1492 $self->{text} = $text; 1633 $self->{text} = $text;
1493 1634
1494 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1496 1637
1497 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1498} 1639}
1499 1640
1500sub set_text { 1641sub set_text {
1501 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1502 1643
1503 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1645 $self->_set_text ($text);
1505 $self->update; 1646
1506 $self->check_size; 1647 $self->realloc;
1507} 1648}
1508 1649
1509sub get_text { 1650sub get_text {
1510 $_[0]{text} 1651 $_[0]{text}
1511} 1652}
… …
1514 my ($self) = @_; 1655 my ($self) = @_;
1515 1656
1516 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1517 1658
1518 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1660}
1526 1661
1527sub key_down { 1662sub key_down {
1528 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1529 1664
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1683 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1684 $self->_emit ('escape');
1550 } elsif ($uni) { 1685 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1687 }
1553 1688
1554 $self->_set_text ($text); 1689 $self->_set_text ($text);
1555 $self->update; 1690
1556 $self->check_size; 1691 $self->realloc;
1557} 1692}
1558 1693
1559sub focus_in { 1694sub focus_in {
1560 my ($self) = @_; 1695 my ($self) = @_;
1561 1696
… …
1641 if ($sym == 13) { 1776 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1647 $self->update; 1782 $self->update;
1648 1783
1649 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1688 1823
1689sub new { 1824sub new {
1690 my $class = shift; 1825 my $class = shift;
1691 1826
1692 $class->SUPER::new ( 1827 $class->SUPER::new (
1693 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1694 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1696 can_hover => 1, 1832 can_hover => 1,
1697 align => 0, 1833 align => 0,
1698 valign => 0, 1834 valign => 0,
1699 can_events => 1, 1835 can_events => 1,
1700 @_ 1836 @_
1701 ) 1837 )
1702} 1838}
1703 1839
1840sub activate { }
1841
1704sub button_up { 1842sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1706 1844
1845 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1848}
1712 1849
1713sub _draw { 1850sub _draw {
1714 my ($self) = @_; 1851 my ($self) = @_;
1715 1852
… …
1744 1881
1745sub new { 1882sub new {
1746 my $class = shift; 1883 my $class = shift;
1747 1884
1748 $class->SUPER::new ( 1885 $class->SUPER::new (
1749 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1750 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1890 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1891 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1892 state => 0,
… …
1758} 1896}
1759 1897
1760sub size_request { 1898sub size_request {
1761 my ($self) = @_; 1899 my ($self) = @_;
1762 1900
1763 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1764} 1902}
1765 1903
1766sub button_down { 1904sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1768 1906
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1773 } 1911 }
1774} 1912}
1775 1913
1776sub _draw { 1914sub _draw {
1777 my ($self) = @_; 1915 my ($self) = @_;
1778 1916
1779 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1780 1918
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1920
1783 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;
1784 1924
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1926
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1928
… …
2052 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2195 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2196 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2060 vertical => 0, 2200 vertical => 0,
2061 can_hover => 1, 2201 can_hover => 1,
2062 inner_pad => .05, 2202 inner_pad => 0.02,
2063 @_ 2203 @_
2064 ); 2204 );
2065 2205
2066 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2067 $self->update; 2207 $self->update;
2068 2208
2069 $self 2209 $self
2070} 2210}
2071 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
2072sub set_value { 2223sub set_value {
2073 my ($self, $value) = @_; 2224 my ($self, $value) = @_;
2074 2225
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2227
2077 $hi = $lo + 1 if $hi <= $lo; 2228 $hi = $lo + 1 if $hi <= $lo;
2078 2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2079 $value = $lo if $value < $lo; 2232 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2233 $value = $hi - $page if $value > $hi - $page;
2081 2234
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2236 if $unit;
2084 2237
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2239
2089 if ($value != $old_value) { 2240 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2241 $self->_emit (changed => $value);
2091 $self->update; 2242 $self->update;
2092 } 2243 }
2093} 2244}
2094 2245
2095sub size_request { 2246sub size_request {
2096 my ($self) = @_; 2247 my ($self) = @_;
2097 2248
2098 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2250}
2103 2251
2104sub button_down { 2252sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2106 2254
2107 $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
2108 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2109} 2260}
2110 2261
2111sub mouse_motion { 2262sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2267
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2269
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2271
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2273 }
2123} 2274}
2124 2275
2125sub update { 2276sub update {
2126 my ($self) = @_; 2277 my ($self) = @_;
2127 2278
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2280 $self->set_value ($self->{range}[0]);
2130 2281
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2132 2284
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2286
2135 $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;
2136 2289
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2290 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2291 $value = $value * $self->{scale} + $self->{offset};
2139 2292
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2294 $self->{knob_w} = $knob_w;
2147 }); 2295 });
2148 2296
2149 $self->SUPER::update; 2297 $self->SUPER::update;
2150} 2298}
2151 2299
… …
2175 # draw handle 2323 # draw handle
2176 $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);
2177 2325
2178 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2179} 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 (@_) }
2180 2369
2181############################################################################# 2370#############################################################################
2182 2371
2183package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2184 2373
… …
2214 2403
2215 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2405 $self->reflow;
2217} 2406}
2218 2407
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2408sub size_allocate {
2239 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2240 2410
2241 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2242 2412
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2416
2247 $self->reflow; 2417 $self->reflow;
2248} 2418}
2249 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
2250sub add_paragraph { 2454sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2252 2456
2253 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2254 2458 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2258 2462
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2464}
2264 2465
2265sub update { 2466sub update {
2266 my ($self) = @_; 2467 my ($self) = @_;
2267 2468
… …
2270 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2271 2472
2272 delete $self->{texture}; 2473 delete $self->{texture};
2273 2474
2274 $ROOT->on_post_alloc ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2275 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2479 my $height = 0;
2277 2480
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2279 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 }
2280 2496
2281 $self->{height} = $height; 2497 $self->{height} = $height;
2282 2498
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2500
2285 delete $self->{texture}; 2501 delete $self->{texture};
2286 } 2502 }
2287 2503
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2291 2507
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2508 my $top = int $self->{children}[1]{range}[0];
2296 2509
2297 my $y0 = $top; 2510 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2299 2512
2300 my $y = 0; 2513 my $y = 0;
2301 2514
2302 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2303 2516
2304 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2305 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
2306 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2524 my $h = $par->[1];
2308 2525
2309 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2312 2530
2313 my ($W, $H) = $layout->size; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 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;
2315 } 2535 }
2316 2536
2317 $y += $h; 2537 $y += $h;
2318 } 2538 }
2319 2539
2320 glDisable GL_TEXTURE_2D; 2540 glDisable GL_BLEND;
2321 }; 2541 };
2322 }); 2542 });
2323} 2543}
2324 2544
2325sub _draw { 2545sub _draw {
2326 my ($self) = @_; 2546 my ($self) = @_;
2327 2547
2328 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2331 $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});
2332 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2333 2553
2334 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2335 2555
2336} 2556}
… …
2385 2605
2386sub new { 2606sub new {
2387 my $class = shift; 2607 my $class = shift;
2388 2608
2389 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2390 state => 0, 2610 state => 0,
2391 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2392 @_ 2612 @_
2393 ); 2613 );
2394 2614
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2615 $self
2401} 2616}
2402 2617
2403sub toggle_flopper { 2618sub toggle_flopper {
2404 my ($self) = @_; 2619 my ($self) = @_;
2405 2620
2406 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2622}
2418 2623
2419############################################################################# 2624#############################################################################
2420 2625
2421package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2434} 2639}
2435 2640
2436sub set_tooltip_from { 2641sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2438 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
2439 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2656 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2658 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2670
2457sub size_allocate { 2671sub size_allocate {
2458 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2459 2673
2460 $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 });
2461} 2693}
2462 2694
2463sub _draw { 2695sub _draw {
2464 my ($self) = @_; 2696 my ($self) = @_;
2465 2697
… …
2482 glVertex $w, $h; 2714 glVertex $w, $h;
2483 glVertex $w, 0; 2715 glVertex $w, 0;
2484 glEnd; 2716 glEnd;
2485 2717
2486 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2487 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2488} 2721}
2489 2722
2490############################################################################# 2723#############################################################################
2491 2724
… …
2496use CFClient::OpenGL; 2729use CFClient::OpenGL;
2497 2730
2498sub new { 2731sub new {
2499 my $class = shift; 2732 my $class = shift;
2500 2733
2501 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2502 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2503 @_, 2737 @_,
2504 ) 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
2505} 2755}
2506 2756
2507sub size_request { 2757sub size_request {
2508 (32, 8) 2758 (32, 8)
2509} 2759}
2510 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2511sub _draw { 2769sub _draw {
2512 my ($self) = @_; 2770 my ($self) = @_;
2513 2771
2514 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
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2784
2517 # TODO animation
2518 if ($tex) { 2785 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2524 } 2791 }
2525} 2792}
2526 2793
2527############################################################################# 2794sub DESTROY {
2528
2529package CFClient::UI::InventoryItem;
2530
2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_; 2795 my ($self) = @_;
2535 2796
2536 my $desc = 2797 $self->{timer}->cancel
2537 $item->{nrof} < 2 2798 if $self->{timer};
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540 2799
2541 $item->{flags} & Crossfire::Protocol::F_OPEN 2800 $self->SUPER::DESTROY;
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675} 2801}
2676 2802
2677############################################################################# 2803#############################################################################
2678 2804
2679package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2714 2840
2715# 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)
2716sub popup { 2842sub popup {
2717 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2718 2844
2719 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2720 2846
2721 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2848 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2724 2850
2725 $self->show; 2851 $self->show;
2726 $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);
2727} 2853}
2728 2854
2729sub mouse_motion { 2855sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2731 2857
… …
2739 2865
2740 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2867 undef $GRAB;
2742 $self->hide; 2868 $self->hide;
2743 2869
2744 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2746 } 2872 }
2747} 2873}
2748 2874
2749############################################################################# 2875#############################################################################
… …
2811sub add { 2937sub add {
2812 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2813 2939
2814 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2816 2944
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 2946
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 2948
… …
2854 $self->SUPER::reconfigure; 2982 $self->SUPER::reconfigure;
2855} 2983}
2856 2984
2857############################################################################# 2985#############################################################################
2858 2986
2859package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2860 2988
2861our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 2990
2865sub new { 2991sub new {
2866 my $class = shift; 2992 my $class = shift;
2867 2993
2868 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2869 @_, 2996 @_,
2870 ) 2997 );
2871}
2872 2998
2873sub 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 {
2874 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2875 3148
2876 $self->{w} = $w; 3149 $self->clear_command_list;
2877 $self->{h} = $h; 3150 $self->{recording} = 0;
2878} 3151 $self->{rec_btn}->set_text ("start recording");
2879 3152
2880sub 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 {
2881 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}
2882 3171
2883 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2884 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
2885} 3295}
2886 3296
2887sub size_request { 3297sub size_request {
2888 my ($self) = @_; 3298 my ($self) = @_;
2889 3299
2890 ($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
2891} 3315}
2892 3316
2893sub size_allocate { 3317sub size_allocate {
2894 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2895 3319
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3320 for my $child ($self->children) {
2903 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)};
2904 3322
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
2907 3325
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3327 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3328
2914 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2915 } 3330 }
2916} 3331}
2917 3332
… …
2928} 3343}
2929 3344
2930sub update { 3345sub update {
2931 my ($self) = @_; 3346 my ($self) = @_;
2932 3347
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2935} 3349}
2936 3350
2937sub add { 3351sub add {
2938 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
2939 3353
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3354 $_->{is_toplevel} = 1
2942 3355 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3356
2948 $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 }
2949} 3373}
2950 3374
2951sub on_refresh { 3375sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2953 3377
… …
2966 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2967 $_->() 3391 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2969 } 3393 }
2970 3394
2971 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
2972 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
2973 3399
2974 for (;;) { 3400 outer:
2975 if ($self->{check_size}) { 3401 while () {
2976 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
2978 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 }
2979 } 3410 }
2980 3411
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
2982 3414
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3416 and last;
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990 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}) {
2991 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
2993 3435
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
2995 3437
2996 $widget->{parent}->check_size
2997 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 }
2998 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
2999 } 3448 }
3000 } 3449 }
3001 3450
3002 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 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)};
3005 3459
3006 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
3008 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
3009 $widget->{w} = $w; 3470 $widget->{w} = $w;
3010 $widget->{h} = $h; 3471 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3472
3012 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
3013 } 3475 }
3014 } 3476 }
3015 3477
3016 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
3017 $_->() 3479 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
3019 } 3481 }
3020 3482
3483
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
3024 3487
3025 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3489 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3492 glLoadIdentity;
3030 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
3031 $self->_draw; 3501 $self->_draw;
3032} 3502}
3033 3503
3034############################################################################# 3504#############################################################################
3035 3505

Diff Legend

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