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.217 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 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 }; 849 };
697} 850}
698 851
699sub _draw { 852sub _draw {
700 my ($self) = @_; 853 my ($self) = @_;
701 854
702 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
703 856
704 my $tex = $self->{texture} 857 my $tex = $self->{texture}
705 or return; 858 or return;
706 859
707 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
710 863
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
712 865
713 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
714} 867}
… …
717 870
718package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
719 872
720our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
721 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
722sub size_request { 885sub size_request {
723 my ($self) = @_; 886 my ($self) = @_;
724 887
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 889
728 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
729} 894}
730 895
731sub size_allocate { 896sub size_allocate {
732 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 905 $self->update;
735} 906}
736 907
737sub set_offset { 908sub set_offset {
738 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
772} 943}
773 944
774sub _render { 945sub _render {
775 my ($self) = @_; 946 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 952
779 $self->SUPER::_render; 953 $self->SUPER::_render;
780} 954}
781 955
… …
784package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
785 959
786our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
787 961
788sub new { 962sub new {
789 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
790 966
791 my $self; 967 my $self;
792 968
793 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
794 vertical => 1, 970 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 972 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
798 }, 974 },
799 ; 975 ;
800 976
801 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 979 slider => $slider,
804 @_, 980 %arg,
805 ); 981 );
806 982
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
810 985
811 $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]);
812} 1012}
813 1013
814#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 1015# update viewport offset on scroll
816 1016
… …
836 1036
837 if ($self->{bg}) { 1037 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
839 1039
840 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
843 1043
844 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
845 glVertex 0 , 0; 1045 glVertex 0 , 0;
846 glVertex 0 , $h; 1046 glVertex 0 , $h;
847 glVertex $w, $h; 1047 glVertex $w, $h;
… …
860 1060
861our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
862 1062
863use CFClient::OpenGL; 1063use CFClient::OpenGL;
864 1064
865my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1072
869sub new { 1073sub new {
870 my $class = shift; 1074 my ($class, %arg) = @_;
871 1075
872 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
873 1077
874 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1081 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1082 can_events => 1,
880 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
881 ); 1086 );
882 1087
883 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
884 align => 0, 1089 align => 0,
885 valign => 1, 1090 valign => 1,
886 text => $self->{title}, 1091 text => $title,
887 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
888 1094
889 $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};
890} 1103}
891 1104
892sub border { 1105sub border {
893 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
894} 1107}
895 1108
896sub size_request { 1109sub size_request {
897 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
898 1114
899 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
900 1116
901 ( 1117 (
902 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
905} 1121}
906 1122
907sub size_allocate { 1123sub size_allocate {
908 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
912 1136
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
917} 1138}
918 1139
919sub button_down { 1140sub button_down {
920 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
921 1142
… …
937 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
938 1159
939 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
941 1162
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1167 $self->realloc;
946 }; 1168 };
947 1169
948 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1174 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
954 1176
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
956 1178
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
960 } 1187 1
961} 1188}
962 1189
963sub button_up { 1190sub button_up {
964 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
965 1192
966 delete $self->{motion}; 1193 !!delete $self->{motion}
967} 1194}
968 1195
969sub mouse_motion { 1196sub mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
971 1198
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
973} 1202}
974 1203
975sub _draw { 1204sub _draw {
976 my ($self) = @_; 1205 my ($self) = @_;
977 1206
1207 my $child = $self->{children}[0];
1208
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1211
981 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1214
984 my $border = $self->border; 1215 my $border = $self->border;
985 1216
986 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1222
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
994 1225
995 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1231 }
1006 1232
1007 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1008 1234
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1012} 1241}
1013 1242
1014############################################################################# 1243#############################################################################
1015 1244
1016package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1024sub new { 1253sub new {
1025 my $class = shift; 1254 my $class = shift;
1026 1255
1027 $class->SUPER::new ( 1256 $class->SUPER::new (
1028 col_expand => [], 1257 col_expand => [],
1029 @_ 1258 @_,
1030 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1264}
1032 1265
1033sub add { 1266sub add {
1034 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1035 1268
1036 $child->set_parent ($self); 1269 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1038 1271
1039 $child->check_size; 1272 $self->realloc;
1040} 1273}
1041 1274
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1276sub clear {
1048 my ($self) = @_; 1277 my ($self) = @_;
1049 1278
1050 my @children = $self->children; 1279 my @children = $self->children;
1051 delete $self->{children}; 1280 delete $self->{children};
… …
1053 for (@children) { 1282 for (@children) {
1054 delete $_->{parent}; 1283 delete $_->{parent};
1055 $_->hide; 1284 $_->hide;
1056 } 1285 }
1057 1286
1058 $self->update; 1287 $self->realloc;
1059} 1288}
1060 1289
1061sub get_wh { 1290sub get_wh {
1062 my ($self) = @_; 1291 my ($self) = @_;
1063 1292
… …
1094sub size_allocate { 1323sub size_allocate {
1095 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1096 1325
1097 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1098 1327
1099 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1101 1330
1102 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1388 }
1160} 1389}
1161 1390
1162############################################################################# 1391#############################################################################
1163 1392
1164package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1394
1168our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1169 1396
1170sub size_request { 1397sub size_request {
1171 my ($self) = @_; 1398 my ($self) = @_;
1172 1399
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1174 1401 ? (
1175 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1404 )
1178 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1179} 1409}
1180 1410
1181sub size_allocate { 1411sub size_allocate {
1182 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1183 1413
1184 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1415 my $children = $self->{children};
1187 1416
1188 my @h = map $_->{req_w}, @$children; 1417 my @req;
1189 1418
1190 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1191 1420 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else { 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 {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1435 }
1206 } 1436 }
1207 1437
1208 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1209 1439
1210 my $y = 0; 1440 my $pos = 0;
1211 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1444
1216 $y += $h; 1445 $pos += $alloc;
1217 } 1446 }
1218 1447
1219 1 1448 1
1220} 1449}
1221 1450
1222############################################################################# 1451#############################################################################
1223 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
1224package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1225 1469
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1229 1471
1230sub size_request { 1472sub new {
1231 my ($self) = @_; 1473 my $class = shift;
1232 1474
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1234 1476 vertical => 1,
1235 ( 1477 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1478 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1479}
1279 1480
1280############################################################################# 1481#############################################################################
1281 1482
1282package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1500 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1301 fontsize => 1, 1502 fontsize => 1,
1302 align => -1, 1503 align => -1,
1303 valign => -1, 1504 valign => -1,
1304 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1305 can_events => 0, 1507 can_events => 0,
1306 %arg 1508 %arg
1307 ); 1509 );
1308 1510
1309 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1336 1538
1337 delete $self->{texture}; 1539 delete $self->{texture};
1338 $self->SUPER::update; 1540 $self->SUPER::update;
1339} 1541}
1340 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1341sub set_text { 1551sub set_text {
1342 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1343 1553
1344 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1346 1556
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1349 1559
1560 $self->realloc;
1350 $self->update; 1561 $self->update;
1351 $self->check_size;
1352} 1562}
1353 1563
1354sub set_markup { 1564sub set_markup {
1355 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1356 1566
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1571
1362 $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;
1363 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1364 1574
1575 $self->realloc;
1365 $self->update; 1576 $self->update;
1366 $self->check_size;
1367} 1577}
1368 1578
1369sub size_request { 1579sub size_request {
1370 my ($self) = @_; 1580 my ($self) = @_;
1371 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1590
1378 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1379 1592
1380 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1596
1384 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1385 1598
1386 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1388 } 1601 }
1389 1602
1603 ($w, $h)
1390 ( 1604 }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1605}
1395 1606
1396sub size_allocate { 1607sub size_allocate {
1397 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1398 1609
1610 delete $self->{ox};
1611
1399 delete $self->{texture}; 1612 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1614}
1401 1615
1402sub set_fontsize { 1616sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1404 1618
1405 $self->{fontsize} = $fontsize; 1619 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1620 delete $self->{texture};
1407 1621
1408 $self->update; 1622 $self->realloc;
1409 $self->check_size;
1410} 1623}
1411 1624
1412sub _draw { 1625sub _draw {
1413 my ($self) = @_; 1626 my ($self) = @_;
1414 1627
… …
1420 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1637
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1426 1640
1641 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1430 1645
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1649 };
1437 1650
1438 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1440 1653
1654 glColor_premultiply @{$self->{fg}}
1441 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1442 glColor @{$self->{fg}}; 1656
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1447 1658
1448 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1449} 1660}
1450 1661
1451############################################################################# 1662#############################################################################
… …
1466 active_fg => [0, 0, 0], 1677 active_fg => [0, 0, 0],
1467 can_hover => 1, 1678 can_hover => 1,
1468 can_focus => 1, 1679 can_focus => 1,
1469 valign => 0, 1680 valign => 0,
1470 can_events => 1, 1681 can_events => 1,
1682 #text => ...
1471 @_ 1683 @_
1472 ) 1684 )
1473} 1685}
1474 1686
1475sub _set_text { 1687sub _set_text {
… …
1477 1689
1478 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1479 1691
1480 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1481 1693
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1695 $self->{text} = $text;
1486 1696
1487 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1489 1699
1490 $self->emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1491} 1702}
1492 1703
1493sub set_text { 1704sub set_text {
1494 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1495 1706
1496 $self->{cursor} = length $text; 1707 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1708 $self->_set_text ($text);
1498 $self->update; 1709
1499 $self->check_size; 1710 $self->realloc;
1500} 1711}
1501 1712
1502sub get_text { 1713sub get_text {
1503 $_[0]{text} 1714 $_[0]{text}
1504} 1715}
… …
1507 my ($self) = @_; 1718 my ($self) = @_;
1508 1719
1509 my ($w, $h) = $self->SUPER::size_request; 1720 my ($w, $h) = $self->SUPER::size_request;
1510 1721
1511 ($w + 1, $h) # add 1 for cursor 1722 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1723}
1519 1724
1520sub key_down { 1725sub key_down {
1521 my ($self, $ev) = @_; 1726 my ($self, $ev) = @_;
1522 1727
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1742 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1743 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1744 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1747 $self->_emit ('escape');
1543 } elsif ($uni) { 1748 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1545 } 1752 }
1546 1753
1547 $self->_set_text ($text); 1754 $self->_set_text ($text);
1548 $self->update; 1755
1549 $self->check_size; 1756 $self->realloc;
1757
1758 1
1550} 1759}
1551 1760
1552sub focus_in { 1761sub focus_in {
1553 my ($self) = @_; 1762 my ($self) = @_;
1554 1763
… …
1569 utf8::encode $text; 1778 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1571 1780
1572 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1573 $self->update; 1782 $self->update;
1783
1784 1
1574} 1785}
1575 1786
1576sub mouse_motion { 1787sub mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1578# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1579} 1792}
1580 1793
1581sub _draw { 1794sub _draw {
1582 my ($self) = @_; 1795 my ($self) = @_;
1583 1796
1584 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1585 1798
1586 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1589 } else { 1802 } else {
1590 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1591 } 1804 }
1592 1805
1593 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1596 glVertex 0 , 0; 1809 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
… …
1634 if ($sym == 13) { 1847 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1848 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1849 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1850 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1851 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1852 $self->_emit (activate => $txt);
1640 $self->update; 1853 $self->update;
1641 1854
1642 } elsif ($sym == CFClient::SDLK_UP) { 1855 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1856 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1857 $self->{history_saveback} = $self->get_text;
… …
1660 } else { 1873 } else {
1661 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1662 } 1875 }
1663 1876
1664 } else { 1877 } else {
1665 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1666 } 1881 1
1667
1668} 1882}
1669 1883
1670############################################################################# 1884#############################################################################
1671 1885
1672package CFClient::UI::Button; 1886package CFClient::UI::Button;
… …
1681 1895
1682sub new { 1896sub new {
1683 my $class = shift; 1897 my $class = shift;
1684 1898
1685 $class->SUPER::new ( 1899 $class->SUPER::new (
1686 padding => 4, 1900 padding_x => 4,
1901 padding_y => 4,
1687 fg => [1, 1, 1], 1902 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1903 active_fg => [0, 0, 1],
1689 can_hover => 1, 1904 can_hover => 1,
1690 align => 0, 1905 align => 0,
1691 valign => 0, 1906 valign => 0,
1692 can_events => 1, 1907 can_events => 1,
1693 @_ 1908 @_
1694 ) 1909 )
1695} 1910}
1696 1911
1912sub activate { }
1913
1697sub button_up { 1914sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1699 1916
1917 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1919 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1920
1703 } 1921 1
1704} 1922}
1705 1923
1706sub _draw { 1924sub _draw {
1707 my ($self) = @_; 1925 my ($self) = @_;
1708 1926
1709 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 1928
1715 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1718 1932
… …
1737 1951
1738sub new { 1952sub new {
1739 my $class = shift; 1953 my $class = shift;
1740 1954
1741 $class->SUPER::new ( 1955 $class->SUPER::new (
1742 padding => 2, 1956 padding_x => 2,
1957 padding_y => 2,
1743 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1959 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1960 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1961 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1962 state => 0,
… …
1751} 1966}
1752 1967
1753sub size_request { 1968sub size_request {
1754 my ($self) = @_; 1969 my ($self) = @_;
1755 1970
1756 ($self->{padding} * 2 + 6) x 2 1971 (6) x 2
1757} 1972}
1758 1973
1759sub button_down { 1974sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1975 my ($self, $ev, $x, $y) = @_;
1761 1976
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1766 } 1985 1
1767} 1986}
1768 1987
1769sub _draw { 1988sub _draw {
1770 my ($self) = @_; 1989 my ($self) = @_;
1771 1990
1772 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1773 1992
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1993 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1994
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1995 my ($w, $h) = @$self{qw(w h)};
1996
1997 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 1998
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1999 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2000
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2001 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2002
… …
1936 2157
1937 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
1939 2160
1940 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
1941 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1942 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2166
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
… …
2045 my $self = $class->SUPER::new ( 2267 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2268 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2269 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2270 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2271 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2272 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2273 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2274 min_h => $::WIDTH / 80,
2053 vertical => 0, 2275 vertical => 0,
2054 can_hover => 1, 2276 can_hover => 1,
2055 inner_pad => 0.02, 2277 inner_pad => 0.02,
2056 @_ 2278 @_
2057 ); 2279 );
… …
2060 $self->update; 2282 $self->update;
2061 2283
2062 $self 2284 $self
2063} 2285}
2064 2286
2287sub changed { }
2288
2289sub set_range {
2290 my ($self, $range) = @_;
2291
2292 ($range, $self->{range}) = ($self->{range}, $range);
2293
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}";
2296}
2297
2065sub set_value { 2298sub set_value {
2066 my ($self, $value) = @_; 2299 my ($self, $value) = @_;
2067 2300
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2301 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2302
2070 $hi = $lo + 1 if $hi <= $lo; 2303 $hi = $lo + 1 if $hi <= $lo;
2071 2304
2305 $page = $hi - $lo if $page > $hi - $lo;
2306
2072 $value = $lo if $value < $lo; 2307 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2308 $value = $hi - $page if $value > $hi - $page;
2074 2309
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2310 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2311 if $unit;
2077 2312
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2314
2082 if ($value != $old_value) { 2315 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2316 $self->_emit (changed => $value);
2084 $self->update; 2317 $self->update;
2085 } 2318 }
2086} 2319}
2087 2320
2088sub size_request { 2321sub size_request {
2089 my ($self) = @_; 2322 my ($self) = @_;
2090 2323
2091 my $w = $self->{req_w}; 2324 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2325}
2096 2326
2097sub button_down { 2327sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2099 2329
2100 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2331
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333
2101 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2102} 2335}
2103 2336
2104sub mouse_motion { 2337sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2106 2339
2107 if ($GRAB == $self) { 2340 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2342
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2344
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2346
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2115 } 2352 1
2116} 2353}
2117 2354
2118sub update { 2355sub update {
2119 my ($self) = @_; 2356 my ($self) = @_;
2120 2357
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2122 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2123 2367
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2369 my $range = ($hi - $page - $lo) || 1e-100;
2125 2370
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2371 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2372
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2373 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2374 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2375
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2376 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2377 $value = $value * $self->{scale} + $self->{offset};
2132 2378
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2380 $self->{knob_w} = $knob_w;
2140 }); 2381 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2382
2148 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2149 2384
2150 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2151 2386
… …
2168 # draw handle 2403 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2404 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2405
2171 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
2172} 2407}
2408
2409#############################################################################
2410
2411package CFClient::UI::ValSlider;
2412
2413our @ISA = CFClient::UI::HBox::;
2414
2415sub new {
2416 my ($class, %arg) = @_;
2417
2418 my $range = delete $arg{range};
2419
2420 my $self = $class->SUPER::new (
2421 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2422 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2423 to_value => sub { shift },
2424 from_value => sub { shift },
2425 %arg,
2426 );
2427
2428 $self->{slider}->connect (changed => sub {
2429 my ($self, $value) = @_;
2430 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2431 $self->{parent}->emit (changed => $value);
2432 });
2433
2434# $self->{entry}->connect (changed => sub {
2435# my ($self, $value) = @_;
2436# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2437# $self->{parent}->emit (changed => $value);
2438# });
2439
2440 $self->add ($self->{slider}, $self->{entry});
2441
2442 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2443
2444 $self
2445}
2446
2447sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) }
2173 2449
2174############################################################################# 2450#############################################################################
2175 2451
2176package CFClient::UI::TextView; 2452package CFClient::UI::TextView;
2177 2453
… …
2207 2483
2208 $self->{fontsize} = $fontsize; 2484 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2485 $self->reflow;
2210} 2486}
2211 2487
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2488sub size_allocate {
2232 my ($self, $w, $h) = @_; 2489 my ($self, $w, $h) = @_;
2233 2490
2234 $self->SUPER::size_allocate ($w, $h); 2491 $self->SUPER::size_allocate ($w, $h);
2235 2492
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2495 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2496
2240 $self->reflow; 2497 $self->reflow;
2241} 2498}
2242 2499
2500sub text_size {
2501 my ($self, $text, $indent) = @_;
2502
2503 my $layout = $self->{layout};
2504
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent);
2507 $layout->set_markup ($text);
2508
2509 $layout->size
2510}
2511
2512sub reflow {
2513 my ($self) = @_;
2514
2515 $self->{need_reflow}++;
2516 $self->update;
2517}
2518
2519sub set_offset {
2520 my ($self, $offset) = @_;
2521
2522 # todo: base offset on lines or so, not on pixels
2523 $self->{children}[1]->set_value ($offset);
2524}
2525
2526sub clear {
2527 my ($self) = @_;
2528
2529 $self->{par} = [];
2530 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532}
2533
2243sub add_paragraph { 2534sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2535 my ($self, $color, $text, $indent) = @_;
2245 2536
2246 #TODO: intelligently "reformat" paragraph 2537 for my $line (split /\n/, $text) {
2247 2538 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2539 $self->{height} += $h;
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2541 }
2251 2542
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2544}
2257 2545
2258sub update { 2546sub update {
2259 my ($self) = @_; 2547 my ($self) = @_;
2260 2548
… …
2263 return unless $self->{h} > 0; 2551 return unless $self->{h} > 0;
2264 2552
2265 delete $self->{texture}; 2553 delete $self->{texture};
2266 2554
2267 $ROOT->on_post_alloc ($self, sub { 2555 $ROOT->on_post_alloc ($self, sub {
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557
2268 if (delete $self->{need_reflow}) { 2558 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2559 my $height = 0;
2270 2560
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2272 for @{$self->{par}}; 2565 for (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567 $layout->set_width ($W - $_->[3]);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3];
2571 $_->[1] = $h;
2572 }
2573
2574 $height += $_->[1];
2575 }
2273 2576
2274 $self->{height} = $height; 2577 $self->{height} = $height;
2275 2578
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2580
2278 delete $self->{texture}; 2581 delete $self->{texture};
2279 } 2582 }
2280 2583
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2284 2587
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2289 2589
2290 my $y0 = $top; 2590 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2591 my $y1 = $top + $H;
2292 2592
2293 my $y = 0; 2593 my $y = 0;
2294 2594
2295 my $layout = $self->{layout}; 2595 my $layout = $self->{layout};
2296 2596
2297 $layout->set_font ($self->{font}) if $self->{font}; 2597 $layout->set_font ($self->{font}) if $self->{font};
2298 2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2299 for my $par (@{$self->{par}}) { 2603 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2604 my $h = $par->[1];
2301 2605
2302 if ($y0 < $y + $h && $y < $y1) { 2606 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2607 $layout->set_foreground (@{ $par->[2] });
2608 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2609 $layout->set_markup ($par->[4]);
2305 2610
2306 my ($W, $H) = $layout->size; 2611 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2612
2613 glRasterPos $par->[3], $y - $y0;
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2615 }
2309 2616
2310 $y += $h; 2617 $y += $h;
2311 } 2618 }
2312 2619
2313 glDisable GL_TEXTURE_2D; 2620 glDisable GL_BLEND;
2314 }; 2621 };
2315 }); 2622 });
2316} 2623}
2317 2624
2318sub _draw { 2625sub _draw {
2319 my ($self) = @_; 2626 my ($self) = @_;
2320 2627
2321 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2326 2633
2327 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2328 2635
2329} 2636}
… …
2378 2685
2379sub new { 2686sub new {
2380 my $class = shift; 2687 my $class = shift;
2381 2688
2382 my $self = $class->SUPER::new ( 2689 my $self = $class->SUPER::new (
2383 state => 0, 2690 state => 0,
2384 connect_activate => \&toggle_flopper, 2691 on_activate => \&toggle_flopper,
2385 @_ 2692 @_
2386 ); 2693 );
2387 2694
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2695 $self
2394} 2696}
2395 2697
2396sub toggle_flopper { 2698sub toggle_flopper {
2397 my ($self) = @_; 2699 my ($self) = @_;
2398 2700
2399 # TODO: use animation 2701 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2702}
2411 2703
2412############################################################################# 2704#############################################################################
2413 2705
2414package CFClient::UI::Tooltip; 2706package CFClient::UI::Tooltip;
… …
2427} 2719}
2428 2720
2429sub set_tooltip_from { 2721sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2722 my ($self, $widget) = @_;
2431 2723
2724 my $tooltip = $widget->{tooltip};
2725
2726 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}";
2731 }
2732
2432 $self->add (new CFClient::UI::Label 2733 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2734 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2736 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2737 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2738 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2739 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2750
2450sub size_allocate { 2751sub size_allocate {
2451 my ($self, $w, $h) = @_; 2752 my ($self, $w, $h) = @_;
2452 2753
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2754 $self->SUPER::size_allocate ($w - 4, $h - 4);
2755}
2756
2757sub visibility_change {
2758 my ($self, $visible) = @_;
2759
2760 return unless $visible;
2761
2762 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner}
2764 or return;
2765
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH;
2770
2771 $self->move_abs ($x, $y);
2772 });
2454} 2773}
2455 2774
2456sub _draw { 2775sub _draw {
2457 my ($self) = @_; 2776 my ($self) = @_;
2458 2777
… …
2475 glVertex $w, $h; 2794 glVertex $w, $h;
2476 glVertex $w, 0; 2795 glVertex $w, 0;
2477 glEnd; 2796 glEnd;
2478 2797
2479 glTranslate 2 - 0.375, 2 - 0.375; 2798 glTranslate 2 - 0.375, 2 - 0.375;
2799
2480 $self->SUPER::_draw; 2800 $self->SUPER::_draw;
2481} 2801}
2482 2802
2483############################################################################# 2803#############################################################################
2484 2804
… …
2490 2810
2491sub new { 2811sub new {
2492 my $class = shift; 2812 my $class = shift;
2493 2813
2494 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2495 aspect => 1, 2815 aspect => 1,
2816 can_events => 0,
2496 @_, 2817 @_,
2497 ); 2818 );
2498 2819
2499 if ($self->{anim} && $self->{animspeed}) { 2820 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self); 2821 Scalar::Util::weaken (my $widget = $self);
… …
2515 2836
2516sub size_request { 2837sub size_request {
2517 (32, 8) 2838 (32, 8)
2518} 2839}
2519 2840
2841sub update {
2842 my ($self) = @_;
2843
2844 return unless $self->{visible};
2845
2846 $self->SUPER::update;
2847}
2848
2520sub _draw { 2849sub _draw {
2521 my ($self) = @_; 2850 my ($self) = @_;
2522 2851
2523 return unless $::CONN;#d# manage and cache textures differently 2852 return unless $::CONN;
2524 2853
2525 my $face; 2854 my $face;
2526 2855
2527 if ($self->{frame}) { 2856 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2857 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2535 2864
2536 if ($tex) { 2865 if ($tex) {
2537 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2539 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2541 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2542 } 2871 }
2543} 2872}
2544 2873
… …
2551 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2552} 2881}
2553 2882
2554############################################################################# 2883#############################################################################
2555 2884
2556package CFClient::UI::InventoryItem; 2885package CFClient::UI::Buttonbar;
2557 2886
2558our @ISA = CFClient::UI::HBox::; 2887our @ISA = CFClient::UI::HBox::;
2559 2888
2560sub _item_to_desc { 2889# TODO: should actualyl wrap buttons and other goodies.
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2585
2586sub new {
2587 my $class = shift;
2588
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2595 my $self = $class->SUPER::new (
2596 can_hover => 1,
2597 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_;
2602
2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2611 $::CONN->send ("move $targ $item->{tag} 0");
2612 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) {
2615 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2620 [
2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2622 sub { $::CONN->send ("lock $item->{tag}") },
2623 ],
2624 );
2625
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2627 }
2628
2629 1
2630 },
2631 %args
2632 );
2633
2634
2635 $self->add (new CFClient::UI::Face
2636 can_events => 0,
2637 face => $item->{face},
2638 anim => $item->{anim},
2639 animspeed => $item->{animspeed},
2640 );
2641
2642 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2643
2644 $self->{item} = $item;
2645
2646 $self->update_item;
2647
2648 $self
2649}
2650
2651sub update_item {
2652 my ($self) = @_;
2653
2654 my $desc = _item_to_desc ($self->{item});
2655
2656 $self->{name_lbl}->set_text ($desc);
2657}
2658
2659#############################################################################
2660
2661package CFClient::UI::Inventory;
2662
2663our @ISA = CFClient::UI::ScrolledWindow::;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 scrolled => (new CFClient::UI::VBox),
2670 @_,
2671 );
2672
2673 $self
2674}
2675
2676sub set_items {
2677 my ($self, $items) = @_;
2678
2679 $self->{scrolled}->clear;
2680 return unless $items;
2681
2682 my @items = sort {
2683 ($a->{type} <=> $b->{type})
2684 or ($a->{name} cmp $b->{name})
2685 } @$items;
2686
2687 $self->{real_items} = \@items;
2688
2689 for my $item (@items) {
2690 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2691 $item->update_item ();
2692 }
2693
2694 $self->{scrolled}->add (@items);
2695
2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2697}
2698
2699sub size_request {
2700 my ($self) = @_;
2701 ($self->{req_w}, $self->{req_h});
2702}
2703 2890
2704############################################################################# 2891#############################################################################
2705 2892
2706package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2707 2894
… …
2741 2928
2742# popup given the event (must be a mouse button down event currently) 2929# popup given the event (must be a mouse button down event currently)
2743sub popup { 2930sub popup {
2744 my ($self, $ev) = @_; 2931 my ($self, $ev) = @_;
2745 2932
2746 $self->emit ("popdown"); 2933 $self->_emit ("popdown");
2747 2934
2748 # maybe save $GRAB? must be careful about events... 2935 # maybe save $GRAB? must be careful about events...
2749 $GRAB = $self; 2936 $GRAB = $self;
2750 $self->{button} = $ev->{button}; 2937 $self->{button} = $ev->{button};
2751 2938
2752 $self->show; 2939 $self->show;
2753 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2754} 2941}
2755 2942
2756sub mouse_motion { 2943sub mouse_motion {
2757 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2758 2945
2759 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2760 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2761 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2762} 2951}
2763 2952
2764sub button_up { 2953sub button_up {
2765 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2766 2955
2767 if ($ev->{button} == $self->{button}) { 2956 if ($ev->{button} == $self->{button}) {
2768 undef $GRAB; 2957 undef $GRAB;
2769 $self->hide; 2958 $self->hide;
2770 2959
2771 $self->emit ("popdown"); 2960 $self->_emit ("popdown");
2772 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2773 } 2966 1
2774} 2967}
2775 2968
2776############################################################################# 2969#############################################################################
2777 2970
2778package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2779 2972
2780our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2781 2974
2782sub new { 2975sub new {
2783 my $class = shift; 2976 my $class = shift;
2784 2977
2785 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2786 fontsize => 0.8, 3087 fontsize => 0.8,
2787 @_, 3088 @_,
2788 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2789} 3096}
2790 3097
2791sub reorder { 3098sub reorder {
2792 my ($self) = @_; 3099 my ($self) = @_;
2793 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2794 3106
2795 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2796 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2797 } 3109 }
2798 3110
… …
2801 my @items = sort { 3113 my @items = sort {
2802 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2803 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2804 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2805 3117
3118 $self->{timer}->interval (1);
3119
2806 my $count = 10 + 1; 3120 my $count = 10 + 1;
2807 for my $item (@items) { 3121 for my $item (@items) {
2808 last unless --$count; 3122 last unless --$count;
2809 3123
2810 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2811 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2812 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2813 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2814 : $item->{text}; 3128 : $item->{text};
2815 3129
… …
2823 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2824 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2825 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2826 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2827 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2828 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2829 can_events => 1, 3143 can_events => 1,
2830 can_hover => 1 3144 can_hover => 1
2831 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2832 } 3158 }
2833 3159
2834 $self->clear; 3160 $self->clear;
2835 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2836} 3162}
… …
2839 my ($self, $text, %arg) = @_; 3165 my ($self, $text, %arg) = @_;
2840 3166
2841 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2842 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2843 3169
3170 return unless $text;
3171
2844 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2845 3173
2846 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2847 3175
2848 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2849 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
2879 3207
2880 $self->reorder; 3208 $self->reorder;
2881 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
2882} 3210}
2883 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
2884############################################################################# 3220#############################################################################
2885 3221
2886package CFClient::UI::Root; 3222package CFClient::UI::Inventory;
2887 3223
2888our @ISA = CFClient::UI::Container::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
2889
2890use CFClient::OpenGL;
2891 3225
2892sub new { 3226sub new {
2893 my $class = shift; 3227 my $class = shift;
2894 3228
2895 $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
2896 @_, 3471 @_,
2897 ) 3472 )
2898} 3473}
2899 3474
2900sub configure { 3475# XXX: Do sorting? Argl...
2901 my ($self, $x, $y, $w, $h) = @_; 3476sub add_spell {
2902
2903 $self->{w} = $w;
2904 $self->{h} = $h;
2905}
2906
2907sub check_size {
2908 my ($self) = @_; 3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
2909 3479
2910 $self->size_allocate ($self->{w}, $self->{h}) 3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2911 if $self->{w}; 3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root;
3518
3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3522
3523use CFClient::OpenGL;
3524
3525sub new {
3526 my $class = shift;
3527
3528 my $self = $class->SUPER::new (
3529 visible => 1,
3530 @_,
3531 );
3532
3533 Scalar::Util::weaken ($self->{root} = $self);
3534
3535 $self
2912} 3536}
2913 3537
2914sub size_request { 3538sub size_request {
2915 my ($self) = @_; 3539 my ($self) = @_;
2916 3540
2917 ($self->{w}, $self->{h}) 3541 ($self->{w}, $self->{h})
3542}
3543
3544sub _to_pixel {
3545 my ($coord, $size, $max) = @_;
3546
3547 $coord =
3548 $coord eq "center" ? ($max - $size) * 0.5
3549 : $coord eq "max" ? $max
3550 : $coord;
3551
3552 $coord = 0 if $coord < 0;
3553 $coord = $max - $size if $coord > $max - $size;
3554
3555 int $coord + 0.5
2918} 3556}
2919 3557
2920sub size_allocate { 3558sub size_allocate {
2921 my ($self, $w, $h) = @_; 3559 my ($self, $w, $h) = @_;
2922 3560
2923 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2924 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2925
2926 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2927 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2928
2929 for my $child ($self->children) { 3561 for my $child ($self->children) {
2930 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2931 3563
2932 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3564 $X = $child->{force_x} if exists $child->{force_x};
2933 if exists $child->{req_x}; 3565 $Y = $child->{force_y} if exists $child->{force_y};
2934 3566
2935 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3567 $X = _to_pixel $X, $W, $self->{w};
2936 if exists $child->{req_y}; 3568 $Y = _to_pixel $Y, $H, $self->{h};
2937
2938 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2939 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2940 3569
2941 $child->configure ($X, $Y, $W, $H); 3570 $child->configure ($X, $Y, $W, $H);
2942 } 3571 }
2943} 3572}
2944 3573
… …
2955} 3584}
2956 3585
2957sub update { 3586sub update {
2958 my ($self) = @_; 3587 my ($self) = @_;
2959 3588
2960 $self->check_size;
2961 $::WANT_REFRESH++; 3589 $::WANT_REFRESH++;
2962} 3590}
2963 3591
2964sub add { 3592sub add {
2965 my ($self, @children) = @_; 3593 my ($self, @children) = @_;
2966 3594
2967 for my $child (@children) {
2968 $child->{toplevel} = 1; 3595 $_->{is_toplevel} = 1
2969 3596 for @children;
2970 # integerise window positions
2971 $child->{x} = int $child->{x};
2972 $child->{y} = int $child->{y};
2973 }
2974 3597
2975 $self->SUPER::add (@children); 3598 $self->SUPER::add (@children);
3599}
3600
3601sub remove {
3602 my ($self, @children) = @_;
3603
3604 $self->SUPER::remove (@children);
3605
3606 delete $self->{is_toplevel}
3607 for @children;
3608
3609 while (@children) {
3610 my $w = pop @children;
3611 push @children, $w->children;
3612 $w->set_invisible;
3613 }
2976} 3614}
2977 3615
2978sub on_refresh { 3616sub on_refresh {
2979 my ($self, $id, $cb) = @_; 3617 my ($self, $id, $cb) = @_;
2980 3618
… …
2993 while ($self->{refresh_hook}) { 3631 while ($self->{refresh_hook}) {
2994 $_->() 3632 $_->()
2995 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
2996 } 3634 }
2997 3635
2998 if ($self->{check_size}) { 3636 if ($self->{realloc}) {
2999 my @queue = ([], []); 3637 my %queue;
3638 my @queue;
3639 my $widget;
3000 3640
3001 for (;;) { 3641 outer:
3002 if ($self->{check_size}) { 3642 while () {
3003 # heuristic: check containers last 3643 if (my $realloc = delete $self->{realloc}) {
3004 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3644 for $widget (values %$realloc) {
3005 for values %{delete $self->{check_size}} 3645 $widget->{visible} or next; # do not resize invisible widgets
3646
3647 $queue{$widget+0}++ and next; # duplicates are common
3648
3649 push @{ $queue[$widget->{visible}] }, $widget;
3650 }
3006 } 3651 }
3007 3652
3008 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3653 while () {
3654 @queue or last outer;
3009 3655
3010 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3656 $widget = pop @{ $queue[-1] || [] }
3011 ? @$widget{qw(user_w user_h)} 3657 and last;
3012 : $widget->size_request;
3013
3014 if (delete $widget->{force_alloc}
3015 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3016 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3017 3658
3659 pop @queue;
3660 }
3661
3662 delete $queue{$widget+0};
3663
3664 my ($w, $h) = $widget->size_request;
3665
3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3671
3672 $w = $widget->{force_w} if exists $widget->{force_w};
3673 $h = $widget->{force_h} if exists $widget->{force_h};
3674
3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3676 || delete $widget->{force_realloc}) {
3018 $widget->{req_w} = $w; 3677 $widget->{req_w} = $w;
3019 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3020 3679
3021 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3680 $self->{size_alloc}{$widget+0} = $widget;
3022 3681
3023 $widget->{parent}->check_size
3024 if $widget->{parent}; 3682 if (my $parent = $widget->{parent}) {
3683 $self->{realloc}{$parent+0} = $parent
3684 unless $queue{$parent+0};
3685
3686 $parent->{force_size_alloc} = 1;
3687 $self->{size_alloc}{$parent+0} = $parent;
3688 }
3025 } 3689 }
3690
3691 delete $self->{realloc}{$widget+0};
3026 } 3692 }
3027 } 3693 }
3028 3694
3029 while ($self->{size_alloc}) { 3695 while (my $size_alloc = delete $self->{size_alloc}) {
3030 for (values %{delete $self->{size_alloc}}) { 3696 my @queue = sort { $b->{visible} <=> $a->{visible} }
3031 my ($widget, $w, $h) = @$_; 3697 values %$size_alloc;
3698
3699 while () {
3700 my $widget = pop @queue || last;
3701
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3032 3703
3033 $w = 0 if $w < 0; 3704 $w = 0 if $w < 0;
3034 $h = 0 if $h < 0; 3705 $h = 0 if $h < 0;
3035 3706
3707 $w = int $w + 0.5;
3708 $h = int $h + 0.5;
3709
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w};
3712 $widget->{old_h} = $widget->{h};
3713
3036 $widget->{w} = $w; 3714 $widget->{w} = $w;
3037 $widget->{h} = $h; 3715 $widget->{h} = $h;
3038 $widget->size_allocate ($w, $h); 3716
3039 $widget->emit (size_allocate => $w, $h); 3717 $widget->emit (size_allocate => $w, $h);
3718 }
3040 } 3719 }
3041 } 3720 }
3042 3721
3043 while ($self->{post_alloc_hook}) { 3722 while ($self->{post_alloc_hook}) {
3044 $_->() 3723 $_->()
3045 for values %{delete $self->{post_alloc_hook}}; 3724 for values %{delete $self->{post_alloc_hook}};
3046 } 3725 }
3047 3726
3727
3048 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3728 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3049 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3050 glClear GL_COLOR_BUFFER_BIT; 3730 glClear GL_COLOR_BUFFER_BIT;
3051 3731
3052 glMatrixMode GL_PROJECTION; 3732 glMatrixMode GL_PROJECTION;
3053 glLoadIdentity; 3733 glLoadIdentity;
3054 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3055 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3056 glLoadIdentity; 3736 glLoadIdentity;
3057 3737
3738 {
3739 package CFClient::UI::Base;
3740
3741 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h});
3743 }
3744
3058 $self->_draw; 3745 $self->_draw;
3059} 3746}
3060 3747
3061############################################################################# 3748#############################################################################
3062 3749

Diff Legend

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