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.213 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 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} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $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} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $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 {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
281} 381}
282 382
283sub set_max_size { 383sub set_max_size {
284 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
285 385
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
288} 390}
289 391
290sub set_tooltip { 392sub set_tooltip {
291 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
292 399
293 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
294 401
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 425 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
320 427
321 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
322 429
323 $self->emit (focus_in => $focus); 430 $self->_emit (focus_in => $focus);
324 431
325 $focus->update if $focus; 432 $focus->update if $focus;
326 $FOCUS->update; 433 $FOCUS->update;
327} 434}
328 435
… …
331 438
332 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
333 440
334 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
335 442
336 $self->emit (focus_out => $focus); 443 $self->_emit (focus_out => $focus);
337 444
338 $focus->update if $focus; #? 445 $focus->update if $focus; #?
339}
340 446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
448 unless $FOCUS;
449}
450
341sub mouse_motion { } 451sub mouse_motion { 0 }
342sub button_up { } 452sub button_up { 0 }
343sub key_down { } 453sub key_down { 0 }
344sub key_up { } 454sub key_up { 0 }
345 455
346sub button_down { 456sub button_down {
347 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
348 458
349 $self->focus_in; 459 $self->focus_in;
350}
351 460
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 537
358sub draw { 538sub draw {
359 my ($self) = @_; 539 my ($self) = @_;
360 540
361 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362 552
363 glPushMatrix; 553 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367 555
368 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372 glEnable GL_BLEND; 558 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS; 560 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 561 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
392 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
393 glPopMatrix; 579 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
396} 585}
397 586
398sub _draw { 587sub _draw {
399 my ($self) = @_; 588 my ($self) = @_;
400 589
401 warn "no draw defined for $self\n"; 590 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} 591}
451 592
452sub DESTROY { 593sub DESTROY {
453 my ($self) = @_; 594 my ($self) = @_;
454 595
… …
486 627
487 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
489 630
490 glEnable GL_BLEND; 631 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 633 glColor_premultiply @$color;
493 634
494 glBegin GL_QUADS; 635 glBegin GL_QUADS;
495 glVertex 0 , 0; 636 glVertex 0 , 0;
496 glVertex 0 , $h; 637 glVertex 0 , $h;
497 glVertex $w, $h; 638 glVertex $w, $h;
… …
512 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
514} 655}
515 656
516sub size_request { 657sub size_request {
517 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
518} 661}
519 662
520sub draw { } 663sub draw { }
521 664
522############################################################################# 665#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
527 670
528sub new { 671sub new {
529 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
530 673
531 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
532 675
533 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
534 children => [], 677 children => [],
535 can_events => 0, 678 can_events => 0,
536 %arg, 679 %arg,
537 ); 680 );
681
538 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
539 684
540 $self 685 $self
541} 686}
542 687
543sub add { 688sub add {
… …
551 $self->{children} = [ 696 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
554 ]; 699 ];
555 700
556 $self->check_size (1); 701 $self->realloc;
557 $self->update;
558} 702}
559 703
560sub children { 704sub children {
561 @{ $_[0]{children} } 705 @{ $_[0]{children} }
562} 706}
… …
567 delete $child->{parent}; 711 delete $child->{parent};
568 $child->hide; 712 $child->hide;
569 713
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 715
572 $self->check_size; 716 $self->realloc;
573 $self->update;
574} 717}
575 718
576sub clear { 719sub clear {
577 my ($self) = @_; 720 my ($self) = @_;
578 721
… …
582 for (@$children) { 725 for (@$children) {
583 delete $_->{parent}; 726 delete $_->{parent};
584 $_->hide; 727 $_->hide;
585 } 728 }
586 729
587 $self->check_size; 730 $self->realloc;
588 $self->update;
589} 731}
590 732
591sub find_widget { 733sub find_widget {
592 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
593 735
594 $x -= $self->{x}; 736 $x -= $self->{x};
595 $y -= $self->{y}; 737 $y -= $self->{y};
596 738
597 my $res; 739 my $res;
598 740
599 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
601 and return $res; 743 and return $res;
602 } 744 }
603 745
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
653 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
654} 796}
655 797
656############################################################################# 798#############################################################################
657 799
800# back-buffered drawing area
801
658package CFClient::UI::Window; 802package CFClient::UI::Window;
659 803
660our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
661 805
662use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
680 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 825 $self->update;
682} 826}
683 827
684sub _render { 828sub _render {
829 my ($self) = @_;
830
685 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
686} 832}
687 833
688sub render_child { 834sub render_child {
689 my ($self) = @_; 835 my ($self) = @_;
690 836
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
694 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
695 $self->_render; 848 $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 }; 849 };
704} 850}
705 851
706sub _draw { 852sub _draw {
707 my ($self) = @_; 853 my ($self) = @_;
708 854
709 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
710 856
711 my $tex = $self->{texture} 857 my $tex = $self->{texture}
712 or return; 858 or return;
713 859
714 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
… …
724 870
725package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
726 872
727our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
728 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
729sub size_request { 885sub size_request {
730 my ($self) = @_; 886 my ($self) = @_;
731 887
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 889
735 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
736} 894}
737 895
738sub size_allocate { 896sub size_allocate {
739 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
740 898
899 my $child = $self->child;
900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
904 $self->child->configure (0, 0, $w, $h);
741 $self->update; 905 $self->update;
742} 906}
743 907
744sub set_offset { 908sub set_offset {
745 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
779} 943}
780 944
781sub _render { 945sub _render {
782 my ($self) = @_; 946 my ($self) = @_;
783 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 952
786 $self->SUPER::_render; 953 $self->SUPER::_render;
787} 954}
788 955
… …
791package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
792 959
793our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
794 961
795sub new { 962sub new {
796 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
797 966
798 my $self; 967 my $self;
799 968
800 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
801 vertical => 1, 970 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 972 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
805 }, 974 },
806 ; 975 ;
807 976
808 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 978 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 979 slider => $slider,
811 @_, 980 %arg,
812 ); 981 );
813 982
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
817 985
818 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub size_allocate {
1006 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819} 1012}
820 1013
821#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 1015# update viewport offset on scroll
823 1016
… …
843 1036
844 if ($self->{bg}) { 1037 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
846 1039
847 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
849 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
850 1043
851 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
852 glVertex 0 , 0; 1045 glVertex 0 , 0;
853 glVertex 0 , $h; 1046 glVertex 0 , $h;
854 glVertex $w, $h; 1047 glVertex $w, $h;
… …
867 1060
868our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
869 1062
870use CFClient::OpenGL; 1063use CFClient::OpenGL;
871 1064
872my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 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); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875 1072
876sub new { 1073sub new {
877 my $class = shift; 1074 my ($class, %arg) = @_;
878 1075
879 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
880 1077
881 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1081 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1082 can_events => 1,
887 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
888 ); 1086 );
889 1087
890 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
891 align => 0, 1089 align => 0,
892 valign => 1, 1090 valign => 1,
893 text => $self->{title}, 1091 text => $title,
894 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
895 1094
896 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
897} 1103}
898 1104
899sub border { 1105sub border {
900 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
901} 1107}
902 1108
903sub size_request { 1109sub size_request {
904 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
905 1114
906 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
907 1116
908 ( 1117 (
909 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
912} 1121}
913 1122
914sub size_allocate { 1123sub size_allocate {
915 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
916 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
917 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
919 1136
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
921 if $self->{title};
922
923 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
924} 1138}
925 1139
926sub button_down { 1140sub button_down {
927 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
928 1142
… …
944 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
945 1159
946 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
948 1162
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size; 1167 $self->realloc;
953 }; 1168 };
954 1169
955 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1174 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
961 1176
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
963 1178
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
966 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
967 } 1187 1
968} 1188}
969 1189
970sub button_up { 1190sub button_up {
971 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
972 1192
973 delete $self->{motion}; 1193 !!delete $self->{motion}
974} 1194}
975 1195
976sub mouse_motion { 1196sub mouse_motion {
977 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
978 1198
979 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
980} 1202}
981 1203
982sub _draw { 1204sub _draw {
983 my ($self) = @_; 1205 my ($self) = @_;
984 1206
1207 my $child = $self->{children}[0];
1208
985 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
987 1211
988 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1214
991 my $border = $self->border; 1215 my $border = $self->border;
992 1216
993 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1222
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1001 1225
1002 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1229 $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); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1231 }
1013 1232
1014 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1015 1234
1016 $self->{title}->draw if $self->{title};
1017
1018 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1019} 1241}
1020 1242
1021############################################################################# 1243#############################################################################
1022 1244
1023package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1031sub new { 1253sub new {
1032 my $class = shift; 1254 my $class = shift;
1033 1255
1034 $class->SUPER::new ( 1256 $class->SUPER::new (
1035 col_expand => [], 1257 col_expand => [],
1036 @_ 1258 @_,
1037 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1264}
1039 1265
1040sub add { 1266sub add {
1041 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1042 1268
1043 $child->set_parent ($self); 1269 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1045 1271
1046 $child->check_size; 1272 $self->realloc;
1047} 1273}
1048 1274
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# TODO: move to container class maybe? send childs a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1054sub clear { 1276sub clear {
1055 my ($self) = @_; 1277 my ($self) = @_;
1056 1278
1057 my @children = $self->children; 1279 my @children = $self->children;
1058 delete $self->{children}; 1280 delete $self->{children};
… …
1060 for (@children) { 1282 for (@children) {
1061 delete $_->{parent}; 1283 delete $_->{parent};
1062 $_->hide; 1284 $_->hide;
1063 } 1285 }
1064 1286
1065 $self->update; 1287 $self->realloc;
1066} 1288}
1067 1289
1068sub get_wh { 1290sub get_wh {
1069 my ($self) = @_; 1291 my ($self) = @_;
1070 1292
… …
1101sub size_allocate { 1323sub size_allocate {
1102 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1103 1325
1104 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1105 1327
1106 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1108 1330
1109 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1388 }
1167} 1389}
1168 1390
1169############################################################################# 1391#############################################################################
1170 1392
1171package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1394
1175our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1176 1396
1177sub size_request { 1397sub size_request {
1178 my ($self) = @_; 1398 my ($self) = @_;
1179 1399
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1181 1401 ? (
1182 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1404 )
1185 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1186} 1409}
1187 1410
1188sub size_allocate { 1411sub size_allocate {
1189 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1190 1413
1191 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1415 my $children = $self->{children};
1194 1416
1195 my @h = map $_->{req_w}, @$children; 1417 my @req;
1196 1418
1197 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1198 1420 @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 { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1434 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 } 1435 }
1213 } 1436 }
1214 1437
1215 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1216 1439
1217 my $y = 0; 1440 my $pos = 0;
1218 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1444
1223 $y += $h; 1445 $pos += $alloc;
1224 } 1446 }
1225 1447
1226 1 1448 1
1227} 1449}
1228 1450
1229############################################################################# 1451#############################################################################
1230 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1231package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1232 1469
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1236 1471
1237sub size_request { 1472sub new {
1238 my ($self) = @_; 1473 my $class = shift;
1239 1474
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1241 1476 vertical => 1,
1242 ( 1477 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1478 )
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} 1479}
1286 1480
1287############################################################################# 1481#############################################################################
1288 1482
1289package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1500 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1308 fontsize => 1, 1502 fontsize => 1,
1309 align => -1, 1503 align => -1,
1310 valign => -1, 1504 valign => -1,
1311 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1312 can_events => 0, 1507 can_events => 0,
1313 %arg 1508 %arg
1314 ); 1509 );
1315 1510
1316 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1343 1538
1344 delete $self->{texture}; 1539 delete $self->{texture};
1345 $self->SUPER::update; 1540 $self->SUPER::update;
1346} 1541}
1347 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1348sub set_text { 1550sub set_text {
1349 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1350 1552
1351 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1352 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1353 1555
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1356 1559
1560 $self->realloc;
1357 $self->update; 1561 $self->update;
1358 $self->check_size;
1359} 1562}
1360 1563
1361sub set_markup { 1564sub set_markup {
1362 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1363 1566
… …
1366 1569
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1571
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1371 1575
1576 $self->realloc;
1372 $self->update; 1577 $self->update;
1373 $self->check_size;
1374} 1578}
1375 1579
1376sub size_request { 1580sub size_request {
1377 my ($self) = @_; 1581 my ($self) = @_;
1378 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1379 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1380 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1384 1591
1385 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1386 1593
1387 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1388 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1389 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1390 1597
1391 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1392 1599
1393 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1395 } 1602 }
1396 1603
1604 ($w, $h)
1397 ( 1605 }
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1606}
1402 1607
1403sub size_allocate { 1608sub size_allocate {
1404 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1405 1610
1611 delete $self->{ox};
1612
1406 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1615}
1408 1616
1409sub set_fontsize { 1617sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1411 1619
1412 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1621 delete $self->{texture};
1414 1622
1415 $self->update; 1623 $self->realloc;
1416 $self->check_size;
1417} 1624}
1418 1625
1419sub _draw { 1626sub _draw {
1420 my ($self) = @_; 1627 my ($self) = @_;
1421 1628
… …
1427 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1638
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1433 1641
1642 unless (exists $self->{ox}) {
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1437 1646
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1443 }; 1650 };
1444 1651
1445 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447 1654
1655 glColor_premultiply @{$self->{fg}}
1448 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1449 glColor @{$self->{fg}}; 1657
1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1454 1659
1455 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1456} 1661}
1457 1662
1458############################################################################# 1663#############################################################################
… …
1473 active_fg => [0, 0, 0], 1678 active_fg => [0, 0, 0],
1474 can_hover => 1, 1679 can_hover => 1,
1475 can_focus => 1, 1680 can_focus => 1,
1476 valign => 0, 1681 valign => 0,
1477 can_events => 1, 1682 can_events => 1,
1683 #text => ...
1478 @_ 1684 @_
1479 ) 1685 )
1480} 1686}
1481 1687
1482sub _set_text { 1688sub _set_text {
… …
1484 1690
1485 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1486 1692
1487 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1488 1694
1489 delete $self->{texture};
1490
1491 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1492 $self->{text} = $text; 1696 $self->{text} = $text;
1493 1697
1494 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1496 1701
1497 $self->emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1498} 1706}
1499 1707
1500sub set_text { 1708sub set_text {
1501 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1502 1710
1503 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1712 $self->_set_text ($text);
1505 $self->update;
1506 $self->check_size;
1507} 1713}
1508 1714
1509sub get_text { 1715sub get_text {
1510 $_[0]{text} 1716 $_[0]{text}
1511} 1717}
… …
1514 my ($self) = @_; 1720 my ($self) = @_;
1515 1721
1516 my ($w, $h) = $self->SUPER::size_request; 1722 my ($w, $h) = $self->SUPER::size_request;
1517 1723
1518 ($w + 1, $h) # add 1 for cursor 1724 ($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} 1725}
1526 1726
1527sub key_down { 1727sub key_down {
1528 my ($self, $ev) = @_; 1728 my ($self, $ev) = @_;
1529 1729
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1744 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1745 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1746 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1749 $self->_emit ('escape');
1550 } elsif ($uni) { 1750 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1552 } 1754 }
1553 1755
1554 $self->_set_text ($text); 1756 $self->_set_text ($text);
1555 $self->update; 1757
1556 $self->check_size; 1758 $self->realloc;
1759
1760 1
1557} 1761}
1558 1762
1559sub focus_in { 1763sub focus_in {
1560 my ($self) = @_; 1764 my ($self) = @_;
1561 1765
… …
1576 utf8::encode $text; 1780 utf8::encode $text;
1577 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1578 1782
1579 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1580 $self->update; 1784 $self->update;
1785
1786 1
1581} 1787}
1582 1788
1583sub mouse_motion { 1789sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1585# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1586} 1794}
1587 1795
1588sub _draw { 1796sub _draw {
1589 my ($self) = @_; 1797 my ($self) = @_;
1590 1798
1591 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1592 1800
1593 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1594 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1595 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1596 } else { 1804 } else {
1597 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1598 } 1806 }
1599 1807
1600 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1601 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1602 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1603 glVertex 0 , 0; 1811 glVertex 0 , 0;
1604 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1605 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1606 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1641 if ($sym == 13) { 1849 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1850 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1851 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1852 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1853 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1854 $self->_emit (activate => $txt);
1647 $self->update; 1855 $self->update;
1648 1856
1649 } elsif ($sym == CFClient::SDLK_UP) { 1857 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1858 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1859 $self->{history_saveback} = $self->get_text;
… …
1667 } else { 1875 } else {
1668 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1669 } 1877 }
1670 1878
1671 } else { 1879 } else {
1672 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1673 } 1883 1
1674
1675} 1884}
1676 1885
1677############################################################################# 1886#############################################################################
1678 1887
1679package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1688 1897
1689sub new { 1898sub new {
1690 my $class = shift; 1899 my $class = shift;
1691 1900
1692 $class->SUPER::new ( 1901 $class->SUPER::new (
1693 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1694 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1696 can_hover => 1, 1906 can_hover => 1,
1697 align => 0, 1907 align => 0,
1698 valign => 0, 1908 valign => 0,
1699 can_events => 1, 1909 can_events => 1,
1700 @_ 1910 @_
1701 ) 1911 )
1702} 1912}
1703 1913
1914sub activate { }
1915
1704sub button_up { 1916sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1706 1918
1919 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1921 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate"); 1922
1710 } 1923 1
1711} 1924}
1712 1925
1713sub _draw { 1926sub _draw {
1714 my ($self) = @_; 1927 my ($self) = @_;
1715 1928
1716 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1717
1718 if ($GRAB == $self) {
1719 $self->{fg} = $self->{active_fg};
1720 }
1721 1930
1722 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1724 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1725 1934
… …
1744 1953
1745sub new { 1954sub new {
1746 my $class = shift; 1955 my $class = shift;
1747 1956
1748 $class->SUPER::new ( 1957 $class->SUPER::new (
1749 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1750 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1964 state => 0,
… …
1758} 1968}
1759 1969
1760sub size_request { 1970sub size_request {
1761 my ($self) = @_; 1971 my ($self) = @_;
1762 1972
1763 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1764} 1974}
1765 1975
1766sub button_down { 1976sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1768 1978
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1773 } 1987 1
1774} 1988}
1775 1989
1776sub _draw { 1990sub _draw {
1777 my ($self) = @_; 1991 my ($self) = @_;
1778 1992
1779 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1780 1994
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1996
1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1784 2000
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 2002
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 2004
… …
1943 2159
1944 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
1945 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
1946 2162
1947 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1948 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1949 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1951 2168
1952 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1953 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2052 my $self = $class->SUPER::new ( 2269 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2274 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2060 vertical => 0, 2277 vertical => 0,
2061 can_hover => 1, 2278 can_hover => 1,
2062 inner_pad => .05, 2279 inner_pad => 0.02,
2063 @_ 2280 @_
2064 ); 2281 );
2065 2282
2066 $self->set_value ($self->{range}[0]); 2283 $self->set_value ($self->{range}[0]);
2067 $self->update; 2284 $self->update;
2068 2285
2069 $self 2286 $self
2070} 2287}
2071 2288
2289sub changed { }
2290
2291sub set_range {
2292 my ($self, $range) = @_;
2293
2294 ($range, $self->{range}) = ($self->{range}, $range);
2295
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}";
2298}
2299
2072sub set_value { 2300sub set_value {
2073 my ($self, $value) = @_; 2301 my ($self, $value) = @_;
2074 2302
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2303 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2304
2077 $hi = $lo + 1 if $hi <= $lo; 2305 $hi = $lo + 1 if $hi <= $lo;
2078 2306
2307 $page = $hi - $lo if $page > $hi - $lo;
2308
2079 $value = $lo if $value < $lo; 2309 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2310 $value = $hi - $page if $value > $hi - $page;
2081 2311
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2312 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2313 if $unit;
2084 2314
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2316
2089 if ($value != $old_value) { 2317 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2318 $self->_emit (changed => $value);
2091 $self->update; 2319 $self->update;
2092 } 2320 }
2093} 2321}
2094 2322
2095sub size_request { 2323sub size_request {
2096 my ($self) = @_; 2324 my ($self) = @_;
2097 2325
2098 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2327}
2103 2328
2104sub button_down { 2329sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2106 2331
2107 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2333
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335
2108 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2109} 2337}
2110 2338
2111sub mouse_motion { 2339sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2113 2341
2114 if ($GRAB == $self) { 2342 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2344
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2346
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2348
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2122 } 2354 1
2123} 2355}
2124 2356
2125sub update { 2357sub update {
2126 my ($self) = @_; 2358 my ($self) = @_;
2127 2359
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2129 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2130 2369
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2371 my $range = ($hi - $page - $lo) || 1e-100;
2132 2372
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2373 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2374
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2375 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2376 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2377
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2378 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2379 $value = $value * $self->{scale} + $self->{offset};
2139 2380
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; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2382 $self->{knob_w} = $knob_w;
2147 }); 2383 }
2148
2149 $self->SUPER::update;
2150}
2151
2152sub _draw {
2153 my ($self) = @_;
2154 2384
2155 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2156 2386
2157 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2158 2388
2159 if ($self->{vertical}) { 2389 if ($self->{vertical}) {
2160 # draw a vertical slider like a rotated horizontal slider 2390 # draw a vertical slider like a rotated horizontal slider
2161 2391
2392 glTranslate 1, 0, 0;
2162 glRotate 90, 0, 0, 1; 2393 glRotate 90, 0, 0, 1;
2163 glTranslate 0, 1, 0;
2164 } 2394 }
2165 2395
2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2396 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2397 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168 2398
… …
2175 # draw handle 2405 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2406 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2407
2178 glDisable GL_TEXTURE_2D; 2408 glDisable GL_TEXTURE_2D;
2179} 2409}
2410
2411#############################################################################
2412
2413package CFClient::UI::ValSlider;
2414
2415our @ISA = CFClient::UI::HBox::;
2416
2417sub new {
2418 my ($class, %arg) = @_;
2419
2420 my $range = delete $arg{range};
2421
2422 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift },
2426 from_value => sub { shift },
2427 %arg,
2428 );
2429
2430 $self->{slider}->connect (changed => sub {
2431 my ($self, $value) = @_;
2432 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2433 $self->{parent}->emit (changed => $value);
2434 });
2435
2436# $self->{entry}->connect (changed => sub {
2437# my ($self, $value) = @_;
2438# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2439# $self->{parent}->emit (changed => $value);
2440# });
2441
2442 $self->add ($self->{slider}, $self->{entry});
2443
2444 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2445
2446 $self
2447}
2448
2449sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) }
2180 2451
2181############################################################################# 2452#############################################################################
2182 2453
2183package CFClient::UI::TextView; 2454package CFClient::UI::TextView;
2184 2455
… …
2214 2485
2215 $self->{fontsize} = $fontsize; 2486 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2487 $self->reflow;
2217} 2488}
2218 2489
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 { 2490sub size_allocate {
2239 my ($self, $w, $h) = @_; 2491 my ($self, $w, $h) = @_;
2240 2492
2241 $self->SUPER::size_allocate ($w, $h); 2493 $self->SUPER::size_allocate ($w, $h);
2242 2494
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2497 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2498
2247 $self->reflow; 2499 $self->reflow;
2248} 2500}
2249 2501
2502sub text_size {
2503 my ($self, $text, $indent) = @_;
2504
2505 my $layout = $self->{layout};
2506
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent);
2509 $layout->set_markup ($text);
2510
2511 $layout->size
2512}
2513
2514sub reflow {
2515 my ($self) = @_;
2516
2517 $self->{need_reflow}++;
2518 $self->update;
2519}
2520
2521sub set_offset {
2522 my ($self, $offset) = @_;
2523
2524 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset);
2526}
2527
2528sub clear {
2529 my ($self) = @_;
2530
2531 $self->{par} = [];
2532 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534}
2535
2250sub add_paragraph { 2536sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2537 my ($self, $color, $text, $indent) = @_;
2252 2538
2253 #TODO: intelligently "reformat" paragraph 2539 for my $line (split /\n/, $text) {
2254 2540 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2541 $self->{height} += $h;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2543 }
2258 2544
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2546}
2264 2547
2265sub update { 2548sub update {
2266 my ($self) = @_; 2549 my ($self) = @_;
2267 2550
… …
2270 return unless $self->{h} > 0; 2553 return unless $self->{h} > 0;
2271 2554
2272 delete $self->{texture}; 2555 delete $self->{texture};
2273 2556
2274 $ROOT->on_post_alloc ($self, sub { 2557 $ROOT->on_post_alloc ($self, sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559
2275 if (delete $self->{need_reflow}) { 2560 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2561 my $height = 0;
2277 2562
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2279 for @{$self->{par}}; 2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2280 2578
2281 $self->{height} = $height; 2579 $self->{height} = $height;
2282 2580
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2582
2285 delete $self->{texture}; 2583 delete $self->{texture};
2286 } 2584 }
2287 2585
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2587 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2291 2589
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]; 2590 my $top = int $self->{children}[1]{range}[0];
2296 2591
2297 my $y0 = $top; 2592 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2593 my $y1 = $top + $H;
2299 2594
2300 my $y = 0; 2595 my $y = 0;
2301 2596
2302 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2303 2598
2304 $layout->set_font ($self->{font}) if $self->{font}; 2599 $layout->set_font ($self->{font}) if $self->{font};
2305 2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2306 for my $par (@{$self->{par}}) { 2605 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2606 my $h = $par->[1];
2308 2607
2309 if ($y0 < $y + $h && $y < $y1) { 2608 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2611 $layout->set_markup ($par->[4]);
2312 2612
2313 my ($W, $H) = $layout->size; 2613 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2614
2615 glRasterPos $par->[3], $y - $y0;
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2617 }
2316 2618
2317 $y += $h; 2619 $y += $h;
2318 } 2620 }
2319 2621
2320 glDisable GL_TEXTURE_2D; 2622 glDisable GL_BLEND;
2321 }; 2623 };
2322 }); 2624 });
2323} 2625}
2324 2626
2325sub _draw { 2627sub _draw {
2326 my ($self) = @_; 2628 my ($self) = @_;
2327 2629
2328 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2333 2635
2334 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2335 2637
… …
2385 2687
2386sub new { 2688sub new {
2387 my $class = shift; 2689 my $class = shift;
2388 2690
2389 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2390 state => 0, 2692 state => 0,
2391 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2392 @_ 2694 @_
2393 ); 2695 );
2394 2696
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2697 $self
2401} 2698}
2402 2699
2403sub toggle_flopper { 2700sub toggle_flopper {
2404 my ($self) = @_; 2701 my ($self) = @_;
2405 2702
2406 # TODO: use animation 2703 $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} 2704}
2418 2705
2419############################################################################# 2706#############################################################################
2420 2707
2421package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2434} 2721}
2435 2722
2436sub set_tooltip_from { 2723sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2438 2725
2726 my $tooltip = $widget->{tooltip};
2727
2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2439 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2738 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2740 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2752
2457sub size_allocate { 2753sub size_allocate {
2458 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2459 2755
2460 $self->SUPER::size_allocate ($w - 4, $h - 4); 2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2461} 2775}
2462 2776
2463sub _draw { 2777sub _draw {
2464 my ($self) = @_; 2778 my ($self) = @_;
2465 2779
… …
2482 glVertex $w, $h; 2796 glVertex $w, $h;
2483 glVertex $w, 0; 2797 glVertex $w, 0;
2484 glEnd; 2798 glEnd;
2485 2799
2486 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2487 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2488} 2803}
2489 2804
2490############################################################################# 2805#############################################################################
2491 2806
… …
2496use CFClient::OpenGL; 2811use CFClient::OpenGL;
2497 2812
2498sub new { 2813sub new {
2499 my $class = shift; 2814 my $class = shift;
2500 2815
2501 $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2502 aspect => 1, 2817 aspect => 1,
2818 can_events => 0,
2503 @_, 2819 @_,
2504 ) 2820 );
2821
2822 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self);
2824
2825 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1,
2828 interval => $self->{animspeed},
2829 cb => sub {
2830 ++$widget->{frame};
2831 $widget->update;
2832 },
2833 );
2834 }
2835
2836 $self
2505} 2837}
2506 2838
2507sub size_request { 2839sub size_request {
2508 (32, 8) 2840 (32, 8)
2509} 2841}
2510 2842
2843sub update {
2844 my ($self) = @_;
2845
2846 return unless $self->{visible};
2847
2848 $self->SUPER::update;
2849}
2850
2511sub _draw { 2851sub _draw {
2512 my ($self) = @_; 2852 my ($self) = @_;
2513 2853
2514 return unless $::CONN;#d# manage and cache textures differently 2854 return unless $::CONN;
2855
2856 my $face;
2857
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}];
2860
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2866
2517 # TODO animation
2518 if ($tex) { 2867 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2524 } 2873 }
2525} 2874}
2526 2875
2876sub DESTROY {
2877 my ($self) = @_;
2878
2879 $self->{timer}->cancel
2880 if $self->{timer};
2881
2882 $self->SUPER::DESTROY;
2883}
2884
2527############################################################################# 2885#############################################################################
2528 2886
2529package CFClient::UI::InventoryItem; 2887package CFClient::UI::Buttonbar;
2530 2888
2531our @ISA = CFClient::UI::HBox::; 2889our @ISA = CFClient::UI::HBox::;
2532 2890
2533sub _item_to_desc { 2891# TODO: should actualyl wrap buttons and other goodies.
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
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}
2676 2892
2677############################################################################# 2893#############################################################################
2678 2894
2679package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2680 2896
… …
2714 2930
2715# popup given the event (must be a mouse button down event currently) 2931# popup given the event (must be a mouse button down event currently)
2716sub popup { 2932sub popup {
2717 my ($self, $ev) = @_; 2933 my ($self, $ev) = @_;
2718 2934
2719 $self->emit ("popdown"); 2935 $self->_emit ("popdown");
2720 2936
2721 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2938 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2724 2940
2725 $self->show; 2941 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727} 2943}
2728 2944
2729sub mouse_motion { 2945sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2731 2947
2732 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2735} 2953}
2736 2954
2737sub button_up { 2955sub button_up {
2738 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2739 2957
2740 if ($ev->{button} == $self->{button}) { 2958 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2959 undef $GRAB;
2742 $self->hide; 2960 $self->hide;
2743 2961
2744 $self->emit ("popdown"); 2962 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2746 } 2968 1
2747} 2969}
2748 2970
2749############################################################################# 2971#############################################################################
2750 2972
2751package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2752 2974
2753our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2754 2976
2755sub new { 2977sub new {
2756 my $class = shift; 2978 my $class = shift;
2757 2979
2758 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2759 fontsize => 0.8, 3089 fontsize => 0.8,
2760 @_, 3090 @_,
2761 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
2762} 3098}
2763 3099
2764sub reorder { 3100sub reorder {
2765 my ($self) = @_; 3101 my ($self) = @_;
2766 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
2767 3108
2768 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 } 3111 }
2771 3112
… …
2774 my @items = sort { 3115 my @items = sort {
2775 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2778 3119
3120 $self->{timer}->interval (1);
3121
2779 my $count = 10 + 1; 3122 my $count = 10 + 1;
2780 for my $item (@items) { 3123 for my $item (@items) {
2781 last unless --$count; 3124 last unless --$count;
2782 3125
2783 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text}; 3130 : $item->{text};
2788 3131
… …
2796 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2802 can_events => 1, 3145 can_events => 1,
2803 can_hover => 1 3146 can_hover => 1
2804 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
2805 } 3160 }
2806 3161
2807 $self->clear; 3162 $self->clear;
2808 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2809} 3164}
… …
2812 my ($self, $text, %arg) = @_; 3167 my ($self, $text, %arg) = @_;
2813 3168
2814 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2816 3171
3172 return unless $text;
3173
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2818 3175
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 3177
2821 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2852 3209
2853 $self->reorder; 3210 $self->reorder;
2854 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2855} 3212}
2856 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2857############################################################################# 3222#############################################################################
2858 3223
2859package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2860 3225
2861our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 3227
2865sub new { 3228sub new {
2866 my $class = shift; 3229 my $class = shift;
2867 3230
2868 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
2869 @_, 3473 @_,
2870 ) 3474 )
2871} 3475}
2872 3476
2873sub configure { 3477# XXX: Do sorting? Argl...
2874 my ($self, $x, $y, $w, $h) = @_; 3478sub add_spell {
2875
2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2879
2880sub check_size {
2881 my ($self) = @_; 3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
2882 3481
2883 $self->size_allocate ($self->{w}, $self->{h}) 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2884 if $self->{w}; 3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
2885} 3538}
2886 3539
2887sub size_request { 3540sub size_request {
2888 my ($self) = @_; 3541 my ($self) = @_;
2889 3542
2890 ($self->{w}, $self->{h}) 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
2891} 3558}
2892 3559
2893sub size_allocate { 3560sub size_allocate {
2894 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2895 3562
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) { 3563 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3565
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
2907 3568
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3570 $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 3571
2914 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
2915 } 3573 }
2916} 3574}
2917 3575
… …
2928} 3586}
2929 3587
2930sub update { 3588sub update {
2931 my ($self) = @_; 3589 my ($self) = @_;
2932 3590
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
2935} 3592}
2936 3593
2937sub add { 3594sub add {
2938 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
2939 3596
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3597 $_->{is_toplevel} = 1
2942 3598 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3599
2948 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3601}
3602
3603sub remove {
3604 my ($self, @children) = @_;
3605
3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3610
3611 while (@children) {
3612 my $w = pop @children;
3613 push @children, $w->children;
3614 $w->set_invisible;
3615 }
2949} 3616}
2950 3617
2951sub on_refresh { 3618sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3619 my ($self, $id, $cb) = @_;
2953 3620
… …
2966 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
2967 $_->() 3634 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
2969 } 3636 }
2970 3637
2971 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
2972 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
2973 3642
2974 for (;;) { 3643 outer:
2975 if ($self->{check_size}) { 3644 while () {
2976 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
2978 for values %{delete $self->{check_size}} 3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
2979 } 3653 }
2980 3654
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
2982 3657
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3659 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 3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
2991 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
2993 3681
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
2995 3683
2996 $widget->{parent}->check_size
2997 if $widget->{parent}; 3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
2998 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
2999 } 3694 }
3000 } 3695 }
3001 3696
3002 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 my ($widget, $w, $h) = @$_; 3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3005 3705
3006 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3008 3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3009 $widget->{w} = $w; 3716 $widget->{w} = $w;
3010 $widget->{h} = $h; 3717 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3718
3012 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3013 } 3721 }
3014 } 3722 }
3015 3723
3016 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3017 $_->() 3725 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3019 } 3727 }
3020 3728
3729
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3024 3733
3025 glMatrixMode GL_PROJECTION; 3734 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3735 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3738 glLoadIdentity;
3030 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
3031 $self->_draw; 3747 $self->_draw;
3032} 3748}
3033 3749
3034############################################################################# 3750#############################################################################
3035 3751

Diff Legend

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