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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
212 return if $self->{parent}; 250 return if $self->{parent};
213 251
214 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
215} 253}
216 254
217sub hide { 255sub set_visible {
218 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
219 279
220 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
222 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
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
223 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
224 if $self->{parent}; 313 if $self->{parent};
225} 314}
226 315
227sub move { 316sub move_abs {
228 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
229 318
230 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
231 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
232 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
233 322
234 $self->update; 323 $self->update;
235} 324}
236 325
237sub set_size { 326sub set_size {
238 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
239 328
240 $self->{user_w} = $w; 329 $self->{force_w} = $w;
241 $self->{user_h} = $h; 330 $self->{force_h} = $h;
242 331
243 $self->check_size; 332 $self->realloc;
244} 333}
245 334
246sub size_request { 335sub size_request {
247 require Carp; 336 require Carp;
248 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
250 339
251sub configure { 340sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
253 342
254 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
257 348
258 # use alignment to adjust x, y 349 # use alignment to adjust x, y
259 350
260 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 353 }
265 354
266 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 356 $self->{x} = $x;
268 $self->{y} = $y; 357 $self->{y} = $y;
269 $self->update; 358 $self->update;
270 } 359 }
271 360
272 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
274 }
275}
276 363
277sub size_allocate { 364 $self->{alloc_w} = $w;
278 # nothing to be done 365 $self->{alloc_h} = $h;
279}
280 366
281sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
282 my ($self) = @_; 368 }
283
284 $self->check_size (1);
285 $self->update;
286} 369}
287 370
288sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
289} 377}
290 378
291sub set_max_size { 379sub set_max_size {
292 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
293 381
294 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
296} 386}
297 387
298sub set_tooltip { 388sub set_tooltip {
299 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
300 390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
394 return if $self->{tooltip} eq $tooltip;
395
301 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
302 397
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
306 } 401 }
307} 402}
308 403
309# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
310sub coord2local { 405sub coord2local {
… …
318 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
319 414
320 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
321} 416}
322 417
323sub focus_in { 418sub invoke_focus_in {
324 my ($self) = @_; 419 my ($self) = @_;
325 420
326 return if $FOCUS == $self; 421 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
328 423
329 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
330 425
331 $self->emit (focus_in => $focus);
332
333 $focus->update if $focus; 426 $focus->update if $focus;
334 $FOCUS->update; 427 $FOCUS->update;
335}
336 428
429 0
430}
431
337sub focus_out { 432sub invoke_focus_out {
338 my ($self) = @_; 433 my ($self) = @_;
339 434
340 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
341 436
342 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
343 438
344 $self->emit (focus_out => $focus);
345
346 $focus->update if $focus; #? 439 $focus->update if $focus; #?
347}
348 440
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS;
443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
349sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
350sub button_up { } 454sub invoke_button_up { 1 }
351sub key_down { } 455sub invoke_key_down { 1 }
352sub key_up { } 456sub invoke_key_up { 1 }
353 457
354sub button_down { 458sub invoke_button_down {
355 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
356 460
357 $self->focus_in; 461 $self->grab_focus;
358}
359 462
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
364sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
479
480sub find_widget {
481 my ($self, $x, $y) = @_;
482
483 return () unless $self->{can_events};
484
485 return $self
486 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489 ()
490}
491
492sub set_parent {
493 my ($self, $parent) = @_;
494
495 Scalar::Util::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible};
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365 530
366sub draw { 531sub draw {
367 my ($self) = @_; 532 my ($self) = @_;
368 533
369 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370 545
371 glPushMatrix; 546 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 548
376 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 551 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 553 glBegin GL_QUADS;
383 glVertex $x , $y;
384 glVertex $x + $self->{w}, $y;
385 glVertex $x + $self->{w}, $y + $self->{h};
386 glVertex $x , $y + $self->{h};
387 glEnd;
388 glDisable GL_BLEND;
389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 554 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 555 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 556 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 557 glVertex 0 , $self->{h};
400 glEnd; 558 glEnd;
559 glDisable GL_BLEND;
560 }
561
562 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix;
564 glColor 1, 1, 0, 1;
565 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1;
571 glEnd;
401 glPopMatrix; 572 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
404} 578}
405 579
406sub _draw { 580sub _draw {
407 my ($self) = @_; 581 my ($self) = @_;
408 582
409 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
410} 584}
411 585
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458}
459
460sub DESTROY { 586sub DESTROY {
461 my ($self) = @_; 587 my ($self) = @_;
462 588
463 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
464 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
465} 593}
466 594
467############################################################################# 595#############################################################################
468 596
469package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
494 622
495 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
497 625
498 glEnable GL_BLEND; 626 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 628 glColor_premultiply @$color;
501 629
502 glBegin GL_QUADS; 630 glBegin GL_QUADS;
503 glVertex 0 , 0; 631 glVertex 0 , 0;
504 glVertex 0 , $h; 632 glVertex 0 , $h;
505 glVertex $w, $h; 633 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
522} 650}
523 651
524sub size_request { 652sub size_request {
525 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
526} 656}
527 657
528sub draw { } 658sub draw { }
529 659
530############################################################################# 660#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
535 665
536sub new { 666sub new {
537 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
538 668
539 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
540 670
541 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
542 children => [], 672 children => [],
543 can_events => 0, 673 can_events => 0,
544 %arg, 674 %arg,
545 ); 675 );
676
546 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
547 679
548 $self 680 $self
549} 681}
550 682
551sub add { 683sub add {
… …
559 $self->{children} = [ 691 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
562 ]; 694 ];
563 695
564 $self->check_size (1); 696 $self->realloc;
565 $self->update;
566} 697}
567 698
568sub children { 699sub children {
569 @{ $_[0]{children} } 700 @{ $_[0]{children} }
570} 701}
… …
575 delete $child->{parent}; 706 delete $child->{parent};
576 $child->hide; 707 $child->hide;
577 708
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 710
580 $self->check_size; 711 $self->realloc;
581 $self->update;
582} 712}
583 713
584sub clear { 714sub clear {
585 my ($self) = @_; 715 my ($self) = @_;
586 716
… …
590 for (@$children) { 720 for (@$children) {
591 delete $_->{parent}; 721 delete $_->{parent};
592 $_->hide; 722 $_->hide;
593 } 723 }
594 724
595 $self->check_size; 725 $self->realloc;
596 $self->update;
597} 726}
598 727
599sub find_widget { 728sub find_widget {
600 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
601 730
602 $x -= $self->{x}; 731 $x -= $self->{x};
603 $y -= $self->{y}; 732 $y -= $self->{y};
604 733
605 my $res; 734 my $res;
606 735
607 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
609 and return $res; 738 and return $res;
610 } 739 }
611 740
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633} 762}
634 763
635sub add { 764sub add {
636 my ($self, $child) = @_; 765 my ($self, $child) = @_;
637 766
638 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
639
640 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
641} 769}
642 770
643sub remove { 771sub remove {
644 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
653 781
654sub size_request { 782sub size_request {
655 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
656} 784}
657 785
658sub size_allocate { 786sub invoke_size_allocate {
659 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
660 788
661 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
662} 792}
663 793
664############################################################################# 794#############################################################################
795
796# back-buffered drawing area
665 797
666package CFClient::UI::Window; 798package CFClient::UI::Window;
667 799
668our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
669 801
… …
680 812
681 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
682 $self->SUPER::update; 814 $self->SUPER::update;
683} 815}
684 816
685sub size_allocate { 817sub invoke_size_allocate {
686 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
687 819
688 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
690} 823}
691 824
692sub _render { 825sub _render {
826 my ($self) = @_;
827
693 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
694} 829}
695 830
696sub render_child { 831sub render_child {
697 my ($self) = @_; 832 my ($self) = @_;
698 833
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
702 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
703 $self->_render; 845 $self->_render;
704 }; 846 };
705} 847}
706 848
707sub _draw { 849sub _draw {
708 my ($self) = @_; 850 my ($self) = @_;
709 851
710 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
711 853
712 my $tex = $self->{texture} 854 my $tex = $self->{texture}
713 or return; 855 or return;
714 856
715 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
718 860
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 862
721 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
722} 864}
… …
725 867
726package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
727 869
728our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
729 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
730sub size_request { 882sub size_request {
731 my ($self) = @_; 883 my ($self) = @_;
732 884
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 886
736 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
737} 888 $h = 10 if $self->{scroll_y};
738 889
890 ($w, $h)
891}
892
739sub size_allocate { 893sub invoke_size_allocate {
740 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
741 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
742 $self->update; 902 $self->update;
903
904 1
743} 905}
744 906
745sub set_offset { 907sub set_offset {
746 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
747 909
… …
780} 942}
781 943
782sub _render { 944sub _render {
783 my ($self) = @_; 945 my ($self) = @_;
784 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 951
787 $self->SUPER::_render; 952 $self->SUPER::_render;
788} 953}
789 954
… …
792package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
793 958
794our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
795 960
796sub new { 961sub new {
797 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
798 965
799 my $self; 966 my $self;
800 967
801 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
802 vertical => 1, 969 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 971 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
806 }, 973 },
807 ; 974 ;
808 975
809 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 978 slider => $slider,
812 @_, 979 %arg,
813 ); 980 );
814 981
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
818 984
819 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
820} 1011}
821 1012
822#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1014# update viewport offset on scroll
824 1015
… …
844 1035
845 if ($self->{bg}) { 1036 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
847 1038
848 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
851 1042
852 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
853 glVertex 0 , 0; 1044 glVertex 0 , 0;
854 glVertex 0 , $h; 1045 glVertex 0 , $h;
855 glVertex $w, $h; 1046 glVertex $w, $h;
… …
868 1059
869our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
870 1061
871use CFClient::OpenGL; 1062use CFClient::OpenGL;
872 1063
873my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1071
877sub new { 1072sub new {
878 my $class = shift; 1073 my ($class, %arg) = @_;
879
880 # TODO: user_x, user_y, overwrite moveto?
881 1074
882 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1078 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1079 can_events => 1,
888 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
889 ); 1083 );
890 1084
891 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
892 align => 0, 1086 align => 0,
893 valign => 1, 1087 valign => 1,
894 text => $self->{title}, 1088 text => $self->{title},
895 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
896 1100
897 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
898} 1110}
899 1111
900sub border { 1112sub border {
901 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
902} 1114}
903 1115
904sub size_request { 1116sub size_request {
905 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
906 1124
907 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
908 1126
909 ( 1127 (
910 $w + $self->border * 2, 1128 $w + $self->border * 2,
911 $h + $self->border * 2, 1129 $h + $self->border * 2,
912 ) 1130 )
913} 1131}
914 1132
915sub size_allocate { 1133sub invoke_size_allocate {
916 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
917 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
918 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
920 1146
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
925}
926 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
927sub button_down { 1155sub invoke_button_down {
928 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
929 1157
930 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
931 my $border = $self->border; 1159 my $border = $self->border;
932 1160
… …
945 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
946 1174
947 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
949 1177
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1182 $self->realloc;
954 }; 1183 };
955 1184
956 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1189 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
962 1191
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
964 1193
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
968 } 1202 1
969} 1203}
970 1204
971sub button_up { 1205sub invoke_button_up {
972 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
973 1207
974 delete $self->{motion}; 1208 ! ! delete $self->{motion}
975} 1209}
976 1210
977sub mouse_motion { 1211sub invoke_mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
979 1213
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
981} 1217}
982 1218
983sub _draw { 1219sub _draw {
984 my ($self) = @_; 1220 my ($self) = @_;
985 1221
1222 my $child = $self->{children}[0];
1223
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1226
989 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1229
992 my $border = $self->border; 1230 my $border = $self->border;
993 1231
994 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1237
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1002 1240
1003 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1246 }
1014 1247
1015 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1016 1249
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1020} 1261}
1021 1262
1022############################################################################# 1263#############################################################################
1023 1264
1024package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1032sub new { 1273sub new {
1033 my $class = shift; 1274 my $class = shift;
1034 1275
1035 $class->SUPER::new ( 1276 $class->SUPER::new (
1036 col_expand => [], 1277 col_expand => [],
1037 @_ 1278 @_,
1038 ) 1279 )
1280}
1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1284}
1040 1285
1041sub add { 1286sub add {
1042 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1043 1288
1044 $child->set_parent ($self); 1289 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1046 1291
1047 $child->check_size; 1292 $self->realloc;
1048} 1293}
1049 1294
1050sub children { 1295sub remove {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
1052}
1053 1297
1298 # TODO: not yet implemented
1299}
1300
1054# TODO: move to container class maybe? send childs a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1302sub clear {
1056 my ($self) = @_; 1303 my ($self) = @_;
1057 1304
1058 my @children = $self->children; 1305 my @children = $self->children;
1059 delete $self->{children}; 1306 delete $self->{children};
… …
1061 for (@children) { 1308 for (@children) {
1062 delete $_->{parent}; 1309 delete $_->{parent};
1063 $_->hide; 1310 $_->hide;
1064 } 1311 }
1065 1312
1066 $self->update; 1313 $self->realloc;
1067} 1314}
1068 1315
1069sub get_wh { 1316sub get_wh {
1070 my ($self) = @_; 1317 my ($self) = @_;
1071 1318
… …
1097 (sum @$ws), 1344 (sum @$ws),
1098 (sum @$hs), 1345 (sum @$hs),
1099 ) 1346 )
1100} 1347}
1101 1348
1102sub size_allocate { 1349sub invoke_size_allocate {
1103 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1104 1351
1105 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1106 1353
1107 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1109 1356
1110 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1139 } 1386 }
1140 1387
1141 $y += $row_h; 1388 $y += $row_h;
1142 } 1389 }
1143 1390
1391 1
1144} 1392}
1145 1393
1146sub find_widget { 1394sub find_widget {
1147 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1148 1396
… …
1167 } 1415 }
1168} 1416}
1169 1417
1170############################################################################# 1418#############################################################################
1171 1419
1420package CFClient::UI::Box;
1421
1422our @ISA = CFClient::UI::Container::;
1423
1424sub size_request {
1425 my ($self) = @_;
1426
1427 $self->{vertical}
1428 ? (
1429 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1430 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1431 )
1432 : (
1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1435 )
1436}
1437
1438sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children};
1443
1444 my @req;
1445
1446 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children;
1448 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1450 my $req = List::Util::sum @req;
1451
1452 if ($req > $space) {
1453 # ah well, not enough space
1454 $_ *= $space / $req for @req;
1455 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1457
1458 $space = ($space - $req) / $expand; # remaining space to give away
1459
1460 $req[$_] += $space * $children->[$_]{expand}
1461 for 0 .. $#$children;
1462 }
1463 }
1464
1465 CFClient::UI::harmonize \@req;
1466
1467 my $pos = 0;
1468 for (0 .. $#$children) {
1469 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471
1472 $pos += $alloc;
1473 }
1474
1475 1
1476}
1477
1478#############################################################################
1479
1172package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1173 1481
1174# TODO: wrap into common Box base class
1175
1176our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1177 1483
1178sub size_request { 1484sub new {
1179 my ($self) = @_; 1485 my $class = shift;
1180 1486
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1182 1488 vertical => 0,
1183 ( 1489 @_,
1184 (List::Util::sum map $_->[0], @alloc),
1185 (List::Util::max map $_->[1], @alloc),
1186 ) 1490 )
1187} 1491}
1188 1492
1189sub size_allocate {
1190 my ($self, $w, $h) = @_;
1191
1192 ($h, $w) = ($w, $h);
1193
1194 my $children = $self->{children};
1195
1196 my @h = map $_->{req_w}, @$children;
1197
1198 my $req_h = List::Util::sum @h;
1199
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children;
1205 $exp ||= 1;
1206
1207 for (0 .. $#$children) {
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 }
1214 }
1215
1216 CFClient::UI::harmonize \@h;
1217
1218 my $y = 0;
1219 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_];
1222 $child->configure ($y, 0, $h, $w);
1223
1224 $y += $h;
1225 }
1226
1227 1
1228}
1229
1230############################################################################# 1493#############################################################################
1231 1494
1232package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1233 1496
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1237 1498
1238sub size_request { 1499sub new {
1239 my ($self) = @_; 1500 my $class = shift;
1240 1501
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1242 1503 vertical => 1,
1243 ( 1504 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1505 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1506}
1287 1507
1288############################################################################# 1508#############################################################################
1289 1509
1290package CFClient::UI::Label; 1510package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1527 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1309 fontsize => 1, 1529 fontsize => 1,
1310 align => -1, 1530 align => -1,
1311 valign => -1, 1531 valign => -1,
1312 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1313 can_events => 0, 1534 can_events => 0,
1314 %arg 1535 %arg
1315 ); 1536 );
1316 1537
1317 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1344 1565
1345 delete $self->{texture}; 1566 delete $self->{texture};
1346 $self->SUPER::update; 1567 $self->SUPER::update;
1347} 1568}
1348 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1349sub set_text { 1577sub set_text {
1350 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1351 1579
1352 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1354 1582
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1357 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1358 $self->update; 1588 $self->update;
1359 $self->check_size;
1360} 1589}
1361 1590
1362sub set_markup { 1591sub set_markup {
1363 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1364 1593
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1598
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1372 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1373 $self->update; 1604 $self->update;
1374 $self->check_size;
1375} 1605}
1376 1606
1377sub size_request { 1607sub size_request {
1378 my ($self) = @_; 1608 my ($self) = @_;
1379 1609
1610 $self->{size_req} ||= do {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1616
1386 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1387 1618
1388 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1622
1392 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1393 1624
1394 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1396 } 1630 };
1397 1631
1398 ( 1632 @{ $self->{size_req} }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1633}
1403 1634
1404sub size_allocate { 1635sub invoke_size_allocate {
1405 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1406 1637
1638 delete $self->{ox};
1639
1407 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1408} 1644}
1409 1645
1410sub set_fontsize { 1646sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1412 1648
1413 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1650 delete $self->{texture};
1415 1651
1416 $self->update; 1652 $self->realloc;
1417 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1418} 1661}
1419 1662
1420sub _draw { 1663sub _draw {
1421 my ($self) = @_; 1664 my ($self) = @_;
1422 1665
… …
1428 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1675
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1434 1678
1679 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1438 1683
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1687 };
1445 1688
1446 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1448 1693
1449 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1450 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1452 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1454 } 1701 }
1455 1702
1456 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1457} 1704}
1458 1705
… …
1474 active_fg => [0, 0, 0], 1721 active_fg => [0, 0, 0],
1475 can_hover => 1, 1722 can_hover => 1,
1476 can_focus => 1, 1723 can_focus => 1,
1477 valign => 0, 1724 valign => 0,
1478 can_events => 1, 1725 can_events => 1,
1726 #text => ...
1727 #hidden => "*",
1479 @_ 1728 @_
1480 ) 1729 )
1481} 1730}
1482 1731
1483sub _set_text { 1732sub _set_text {
… …
1485 1734
1486 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1487 1736
1488 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1489 1738
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1740 $self->{text} = $text;
1494 1741
1495 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1497 1745
1498 $self->emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1499} 1750}
1500 1751
1501sub set_text { 1752sub set_text {
1502 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1503 1754
1504 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1756 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1757}
1509 1758
1510sub get_text { 1759sub get_text {
1511 $_[0]{text} 1760 $_[0]{text}
1512} 1761}
… …
1517 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1518 1767
1519 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1520} 1769}
1521 1770
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526}
1527
1528sub key_down { 1771sub invoke_key_down {
1529 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1530 1773
1531 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1532 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1533 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1548 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1793 $self->emit ('escape');
1551 } elsif ($uni) { 1794 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1553 } 1798 }
1554 1799
1555 $self->_set_text ($text); 1800 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558}
1559 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1560sub focus_in { 1807sub invoke_focus_in {
1561 my ($self) = @_; 1808 my ($self) = @_;
1562 1809
1563 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1564 1811
1565 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1566} 1813}
1567 1814
1568sub button_down { 1815sub invoke_button_down {
1569 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1570 1817
1571 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1572 1819
1573 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1574 1821
1575 # byte-index to char-index 1822 # byte-index to char-index
1576 my $text = $self->{text}; 1823 my $text = $self->{text};
1577 utf8::encode $text; 1824 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1579 1826
1580 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1581 $self->update; 1828 $self->update;
1829
1830 1
1582} 1831}
1583 1832
1584sub mouse_motion { 1833sub invoke_mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1587} 1838}
1588 1839
1589sub _draw { 1840sub _draw {
1590 my ($self) = @_; 1841 my ($self) = @_;
1591 1842
1592 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1593 1844
1594 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1597 } else { 1848 } else {
1598 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1599 } 1850 }
1600 1851
1601 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1855 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1632 1883
1633our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1634 1885
1635use CFClient::OpenGL; 1886use CFClient::OpenGL;
1636 1887
1637sub key_down { 1888sub invoke_key_down {
1638 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1639 1890
1640 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1641 1892
1642 if ($sym == 13) { 1893 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1645 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1899 $self->emit (activate => $txt);
1648 $self->update; 1900 $self->update;
1649 1901
… …
1668 } else { 1920 } else {
1669 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1670 } 1922 }
1671 1923
1672 } else { 1924 } else {
1673 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1674 } 1928 1
1675
1676} 1929}
1677 1930
1678############################################################################# 1931#############################################################################
1679 1932
1680package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1689 1942
1690sub new { 1943sub new {
1691 my $class = shift; 1944 my $class = shift;
1692 1945
1693 $class->SUPER::new ( 1946 $class->SUPER::new (
1694 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1695 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1697 can_hover => 1, 1951 can_hover => 1,
1698 align => 0, 1952 align => 0,
1699 valign => 0, 1953 valign => 0,
1700 can_events => 1, 1954 can_events => 1,
1701 @_ 1955 @_
1702 ) 1956 )
1703} 1957}
1704 1958
1705sub button_up { 1959sub invoke_button_up {
1706 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1707 1961
1962 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1964 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1965
1711 } 1966 1
1712} 1967}
1713 1968
1714sub _draw { 1969sub _draw {
1715 my ($self) = @_; 1970 my ($self) = @_;
1716 1971
1717 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1973
1723 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1726 1977
… …
1731 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1732} 1983}
1733 1984
1734############################################################################# 1985#############################################################################
1735 1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
2019}
2020
2021#############################################################################
2022
1736package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1737 2024
1738our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1739 2026
1740my @tex = 2027my @tex =
… …
1745 2032
1746sub new { 2033sub new {
1747 my $class = shift; 2034 my $class = shift;
1748 2035
1749 $class->SUPER::new ( 2036 $class->SUPER::new (
1750 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1751 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 2043 state => 0,
… …
1759} 2047}
1760 2048
1761sub size_request { 2049sub size_request {
1762 my ($self) = @_; 2050 my ($self) = @_;
1763 2051
1764 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1765} 2053}
1766 2054
1767sub button_down { 2055sub invoke_button_down {
1768 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1769 2057
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1774 } 2066 1
1775} 2067}
1776 2068
1777sub _draw { 2069sub _draw {
1778 my ($self) = @_; 2070 my ($self) = @_;
1779 2071
1780 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1781 2073
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2075
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2079
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2081
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2083
… …
1944 2238
1945 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
1947 2241
1948 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2247
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2348 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2353 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2061 vertical => 0, 2356 vertical => 0,
2062 can_hover => 1, 2357 can_hover => 1,
2063 inner_pad => 0.02, 2358 inner_pad => 0.02,
2064 @_ 2359 @_
2065 ); 2360 );
… …
2068 $self->update; 2363 $self->update;
2069 2364
2070 $self 2365 $self
2071} 2366}
2072 2367
2368sub set_range {
2369 my ($self, $range) = @_;
2370
2371 ($range, $self->{range}) = ($self->{range}, $range);
2372
2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2377}
2378
2073sub set_value { 2379sub set_value {
2074 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2075 2381
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2382 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2383
2078 $hi = $lo + 1 if $hi <= $lo; 2384 $hi = $lo + 1 if $hi <= $lo;
2079 2385
2386 $page = $hi - $lo if $page > $hi - $lo;
2387
2080 $value = $lo if $value < $lo; 2388 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2389 $value = $hi - $page if $value > $hi - $page;
2082 2390
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2391 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2392 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087 2393
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2395
2090 if ($value != $old_value) { 2396 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2397 $self->emit (changed => $value);
… …
2094} 2400}
2095 2401
2096sub size_request { 2402sub size_request {
2097 my ($self) = @_; 2403 my ($self) = @_;
2098 2404
2099 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2406}
2104 2407
2105sub button_down { 2408sub invoke_button_down {
2106 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2107 2410
2108 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2412
2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414
2109 $self->mouse_motion ($ev, $x, $y); 2415 $self->invoke_mouse_motion ($ev, $x, $y)
2110} 2416}
2111 2417
2112sub mouse_motion { 2418sub invoke_mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2114 2420
2115 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2423
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2425
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2427
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2123 } 2433 1
2124} 2434}
2125 2435
2126sub update { 2436sub update {
2127 my ($self) = @_; 2437 my ($self) = @_;
2128 2438
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2131 2448
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2450 my $range = ($hi - $page - $lo) || 1e-100;
2133 2451
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2452 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2453
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2454 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2455 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2456
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2457 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2458 $value = $value * $self->{scale} + $self->{offset};
2140 2459
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2461 $self->{knob_w} = $knob_w;
2148 }); 2462 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2463
2156 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2157 2465
2158 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2159 2467
… …
2179 glDisable GL_TEXTURE_2D; 2487 glDisable GL_TEXTURE_2D;
2180} 2488}
2181 2489
2182############################################################################# 2490#############################################################################
2183 2491
2492package CFClient::UI::ValSlider;
2493
2494our @ISA = CFClient::UI::HBox::;
2495
2496sub new {
2497 my ($class, %arg) = @_;
2498
2499 my $range = delete $arg{range};
2500
2501 my $self = $class->SUPER::new (
2502 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2503 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2504 to_value => sub { shift },
2505 from_value => sub { shift },
2506 %arg,
2507 );
2508
2509 $self->{slider}->connect (changed => sub {
2510 my ($self, $value) = @_;
2511 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2512 $self->{parent}->emit (changed => $value);
2513 });
2514
2515# $self->{entry}->connect (changed => sub {
2516# my ($self, $value) = @_;
2517# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2518# $self->{parent}->emit (changed => $value);
2519# });
2520
2521 $self->add ($self->{slider}, $self->{entry});
2522
2523 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2524
2525 $self
2526}
2527
2528sub set_range { shift->{slider}->set_range (@_) }
2529sub set_value { shift->{slider}->set_value (@_) }
2530
2531#############################################################################
2532
2184package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2185 2534
2186our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2187 2536
2188use CFClient::OpenGL; 2537use CFClient::OpenGL;
2189 2538
… …
2191 my $class = shift; 2540 my $class = shift;
2192 2541
2193 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2194 fontsize => 1, 2543 fontsize => 1,
2195 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2196 #font => default_font 2546 #font => default_font
2197 @_, 2547 @_,
2198 2548
2199 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2200 par => [], 2550 par => [],
… …
2215 2565
2216 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2217 $self->reflow; 2567 $self->reflow;
2218} 2568}
2219 2569
2220sub size_allocate { 2570sub invoke_size_allocate {
2221 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2222
2223 $self->SUPER::size_allocate ($w, $h);
2224 2572
2225 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2228 2577
2229 $self->reflow; 2578 $self->reflow;
2230}
2231 2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2581}
2582
2232sub text_height { 2583sub text_size {
2233 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2234 2585
2235 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2236 2587
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2240 2592
2241 ($layout->size)[1] 2593 $layout->size
2242} 2594}
2243 2595
2244sub reflow { 2596sub reflow {
2245 my ($self) = @_; 2597 my ($self) = @_;
2246 2598
2247 $self->{need_reflow}++; 2599 $self->{need_reflow}++;
2248 $self->update; 2600 $self->update;
2249} 2601}
2250 2602
2603sub set_offset {
2604 my ($self, $offset) = @_;
2605
2606 # todo: base offset on lines or so, not on pixels
2607 $self->{children}[1]->set_value ($offset);
2608}
2609
2610sub clear {
2611 my ($self) = @_;
2612
2613 $self->{par} = [];
2614 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616}
2617
2251sub add_paragraph { 2618sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2619 my ($self, $color, $text, $indent) = @_;
2253 2620
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2621 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2622 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2623 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2625 }
2261 2626
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2628}
2265 2629
2266sub update { 2630sub update {
2267 my ($self) = @_; 2631 my ($self) = @_;
2268 2632
… …
2270 2634
2271 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2272 2636
2273 delete $self->{texture}; 2637 delete $self->{texture};
2274 2638
2275 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641
2276 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2643 my $height = 0;
2278 2644
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2280 for @{$self->{par}}; 2649 for (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653 $layout->set_markup ($_->[4]);
2654 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3];
2656 $_->[1] = $h;
2657 }
2658
2659 $height += $_->[1];
2660 }
2281 2661
2282 $self->{height} = $height; 2662 $self->{height} = $height;
2283 2663
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update; 2665
2286
2287 delete $self->{texture}; 2666 delete $self->{texture};
2288 } 2667 }
2289 2668
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2293 2672
2294 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2295 2674
2296 my $y0 = $top; 2675 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2676 my $y1 = $top + $H;
2298 2677
2299 my $y = 0; 2678 my $y = 0;
2300 2679
2301 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2302 2681
2303 $layout->set_font ($self->{font}) if $self->{font}; 2682 $layout->set_font ($self->{font}) if $self->{font};
2304 2683
2305 glEnable GL_BLEND; 2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2687
2308 for my $par (@{$self->{par}}) { 2688 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2689 my $h = $par->[1];
2310 2690
2311 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2692 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2314 $layout->set_markup ($par->[3]); 2695 $layout->set_markup ($par->[4]);
2315 2696
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2698
2318 glRasterPos $par->[2], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2701 }
2321 2702
2322 $y += $h; 2703 $y += $h;
2323 } 2704 }
… …
2330sub _draw { 2711sub _draw {
2331 my ($self) = @_; 2712 my ($self) = @_;
2332 2713
2333 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2338 2719
2339 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2340 2721
2341} 2722}
… …
2390 2771
2391sub new { 2772sub new {
2392 my $class = shift; 2773 my $class = shift;
2393 2774
2394 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2395 state => 0, 2776 state => 0,
2396 connect_activate => \&toggle_flopper, 2777 on_activate => \&toggle_flopper,
2397 @_ 2778 @_
2398 ); 2779 );
2399 2780
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2781 $self
2406} 2782}
2407 2783
2408sub toggle_flopper { 2784sub toggle_flopper {
2409 my ($self) = @_; 2785 my ($self) = @_;
2410 2786
2411 # TODO: use animation 2787 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2788}
2423 2789
2424############################################################################# 2790#############################################################################
2425 2791
2426package CFClient::UI::Tooltip; 2792package CFClient::UI::Tooltip;
… …
2439} 2805}
2440 2806
2441sub set_tooltip_from { 2807sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2443 2809
2810 my $tooltip = $widget->{tooltip};
2811
2812 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}";
2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2821
2444 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2825 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2827 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2458 2836
2459 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2460} 2838}
2461 2839
2462sub size_allocate { 2840sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2464 2842
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2844}
2845
2846sub invoke_visibility_change {
2847 my ($self, $visible) = @_;
2848
2849 return unless $visible;
2850
2851 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner}
2853 or return;
2854
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w};
2859
2860 $self->move_abs ($x, $y);
2861 });
2466} 2862}
2467 2863
2468sub _draw { 2864sub _draw {
2469 my ($self) = @_; 2865 my ($self) = @_;
2470 2866
… …
2487 glVertex $w, $h; 2883 glVertex $w, $h;
2488 glVertex $w, 0; 2884 glVertex $w, 0;
2489 glEnd; 2885 glEnd;
2490 2886
2491 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2492 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2493} 2890}
2494 2891
2495############################################################################# 2892#############################################################################
2496 2893
… …
2502 2899
2503sub new { 2900sub new {
2504 my $class = shift; 2901 my $class = shift;
2505 2902
2506 my $self = $class->SUPER::new ( 2903 my $self = $class->SUPER::new (
2507 aspect => 1, 2904 aspect => 1,
2905 can_events => 0,
2508 @_, 2906 @_,
2509 ); 2907 );
2510 2908
2511 if ($self->{anim} && $self->{animspeed}) { 2909 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2910 Scalar::Util::weaken (my $widget = $self);
… …
2527 2925
2528sub size_request { 2926sub size_request {
2529 (32, 8) 2927 (32, 8)
2530} 2928}
2531 2929
2930sub update {
2931 my ($self) = @_;
2932
2933 return unless $self->{visible};
2934
2935 $self->SUPER::update;
2936}
2937
2532sub _draw { 2938sub _draw {
2533 my ($self) = @_; 2939 my ($self) = @_;
2534 2940
2535 return unless $::CONN;#d# manage and cache textures differently 2941 return unless $::CONN;
2536 2942
2537 my $face; 2943 my $face;
2538 2944
2539 if ($self->{frame}) { 2945 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2946 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 2953
2548 if ($tex) { 2954 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2554 } 2960 }
2555} 2961}
2556 2962
2557sub DESTROY { 2963sub destroy {
2558 my ($self) = @_; 2964 my ($self) = @_;
2559 2965
2560 $self->{timer}->cancel 2966 $self->{timer}->cancel
2561 if $self->{timer}; 2967 if $self->{timer};
2562 2968
2563 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2564} 2970}
2565 2971
2566############################################################################# 2972#############################################################################
2567 2973
2568package CFClient::UI::InventoryItem; 2974package CFClient::UI::Buttonbar;
2569 2975
2570our @ISA = CFClient::UI::HBox::; 2976our @ISA = CFClient::UI::HBox::;
2571 2977
2572sub _item_to_desc { 2978# TODO: should actualyl wrap buttons and other goodies.
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720 2979
2721############################################################################# 2980#############################################################################
2722 2981
2723package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2724 2983
… …
2736 ); 2995 );
2737 2996
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2739 2998
2740 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2742 3001
2743 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2744 if (!ref $widget) { 3003 if (!ref $widget) {
2745 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2746 can_hover => 1, 3005 can_hover => 1,
2747 can_events => 1, 3006 can_events => 1,
2748 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2749 } 3009 }
2750 3010
2751 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2752 3012
2753 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2765 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 3026 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2768 3028
2769 $self->show; 3029 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 3031}
2772 3032
2773sub mouse_motion { 3033sub invoke_mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2775 3035
2776 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2779}
2780 3039
3040 0
3041}
3042
2781sub button_up { 3043sub invoke_button_up {
2782 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2783 3045
2784 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 3047 undef $GRAB;
2786 $self->hide; 3048 $self->hide;
2787 3049
2788 $self->emit ("popdown"); 3050 $self->emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2790 } 3056 1
2791} 3057}
2792 3058
2793############################################################################# 3059#############################################################################
2794 3060
2795package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2796 3062
2797our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2798 3064
2799sub new { 3065sub new {
2800 my $class = shift; 3066 my $class = shift;
2801 3067
2802 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3235 fontsize => 0.8,
2804 @_, 3236 @_,
2805 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2806} 3244}
2807 3245
2808sub reorder { 3246sub reorder {
2809 my ($self) = @_; 3247 my ($self) = @_;
2810 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2811 3254
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3257 }
2815 3258
… …
2818 my @items = sort { 3261 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2822 3265
3266 $self->{timer}->interval (1);
3267
2823 my $count = 10 + 1; 3268 my $count = 10 + 1;
2824 for my $item (@items) { 3269 for my $item (@items) {
2825 last unless --$count; 3270 last unless --$count;
2826 3271
2827 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3276 : $item->{text};
2832 3277
… …
2840 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3291 can_events => 1,
2847 can_hover => 1 3292 can_hover => 1
2848 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2849 } 3306 }
2850 3307
2851 $self->clear; 3308 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2853} 3310}
… …
2856 my ($self, $text, %arg) = @_; 3313 my ($self, $text, %arg) = @_;
2857 3314
2858 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2860 3317
3318 return unless $text;
3319
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3321
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3323
2865 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2867 $item->{count}++; 3326 $item->{count}++;
2868 } else { 3327 } else {
2869 $item->{count} = 1; 3328 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2871 } 3330 }
2872 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2873 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2874 delete $item->{label}; 3333 delete $item->{label};
2875 } else { 3334 } else {
2876 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2877 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2896 3355
2897 $self->reorder; 3356 $self->reorder;
2898 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2899} 3358}
2900 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2901############################################################################# 3368#############################################################################
2902 3369
2903package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
2904 3371
2905our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3373
2909sub new { 3374sub new {
2910 my $class = shift; 3375 my $class = shift;
2911 3376
2912 $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
2913 @_, 3620 @_,
2914 ) 3621 )
2915} 3622}
2916 3623
2917sub configure { 3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3625
2920 $self->{w} = $w; 3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2921 $self->{h} = $h; 3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2922} 3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2923 3636
2924sub check_size { 3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
2925 my ($self) = @_; 3710 my ($self, $spell) = @_;
2926 3711
2927 $self->size_allocate ($self->{w}, $self->{h}) 3712 $self->{spell}->{$spell->{name}} = $spell;
2928 if $self->{w}; 3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3732package CFClient::UI::Root;
3733
3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3737
3738use CFClient::OpenGL;
3739
3740sub new {
3741 my $class = shift;
3742
3743 my $self = $class->SUPER::new (
3744 visible => 1,
3745 @_,
3746 );
3747
3748 Scalar::Util::weaken ($self->{root} = $self);
3749
3750 $self
2929} 3751}
2930 3752
2931sub size_request { 3753sub size_request {
2932 my ($self) = @_; 3754 my ($self) = @_;
2933 3755
2934 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
2935} 3757}
2936 3758
3759sub _to_pixel {
3760 my ($coord, $size, $max) = @_;
3761
3762 $coord =
3763 $coord eq "center" ? ($max - $size) * 0.5
3764 : $coord eq "max" ? $max
3765 : $coord;
3766
3767 $coord = 0 if $coord < 0;
3768 $coord = $max - $size if $coord > $max - $size;
3769
3770 int $coord + 0.5
3771}
3772
2937sub size_allocate { 3773sub invoke_size_allocate {
2938 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
2939
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945 3775
2946 for my $child ($self->children) { 3776 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3778
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
2951 3781
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3784
2958 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
2959 } 3786 }
3787
3788 1
2960} 3789}
2961 3790
2962sub coord2local { 3791sub coord2local {
2963 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
2964 3793
… …
2972} 3801}
2973 3802
2974sub update { 3803sub update {
2975 my ($self) = @_; 3804 my ($self) = @_;
2976 3805
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
2979} 3807}
2980 3808
2981sub add { 3809sub add {
2982 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
2983 3811
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3812 $_->{is_toplevel} = 1
2986 3813 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3814
2992 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3816}
3817
3818sub remove {
3819 my ($self, @children) = @_;
3820
3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3825
3826 while (@children) {
3827 my $w = pop @children;
3828 push @children, $w->children;
3829 $w->set_invisible;
3830 }
2993} 3831}
2994 3832
2995sub on_refresh { 3833sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3834 my ($self, $id, $cb) = @_;
2997 3835
… …
3010 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
3011 $_->() 3849 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3013 } 3851 }
3014 3852
3015 if ($self->{check_size}) { 3853 if ($self->{realloc}) {
3016 my @queue = ([], []); 3854 my %queue;
3855 my @queue;
3856 my $widget;
3017 3857
3018 for (;;) { 3858 outer:
3019 if ($self->{check_size}) { 3859 while () {
3020 # heuristic: check containers last 3860 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3861 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3862 $widget->{visible} or next; # do not resize invisible widgets
3863
3864 $queue{$widget+0}++ and next; # duplicates are common
3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3023 } 3868 }
3024 3869
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3870 while () {
3871 @queue or last outer;
3026 3872
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3873 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3874 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 3875
3876 pop @queue;
3877 }
3878
3879 delete $queue{$widget+0};
3880
3881 my ($w, $h) = $widget->size_request;
3882
3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3888
3889 $w = $widget->{force_w} if exists $widget->{force_w};
3890 $h = $widget->{force_h} if exists $widget->{force_h};
3891
3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3893 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3894 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3037 3896
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3897 $self->{size_alloc}{$widget+0} = $widget;
3039 3898
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3899 if (my $parent = $widget->{parent}) {
3900 $self->{realloc}{$parent+0} = $parent
3901 unless $queue{$parent+0};
3902
3903 $parent->{force_size_alloc} = 1;
3904 $self->{size_alloc}{$parent+0} = $parent;
3905 }
3042 } 3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3043 } 3909 }
3044 } 3910 }
3045 3911
3046 while ($self->{size_alloc}) { 3912 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3914 values %$size_alloc;
3915
3916 while () {
3917 my $widget = pop @queue || last;
3918
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3920
3050 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3052 3923
3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3926
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3053 $widget->{w} = $w; 3931 $widget->{w} = $w;
3054 $widget->{h} = $h; 3932 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3933
3056 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3057 } 3936 }
3058 } 3937 }
3059 3938
3060 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3061 $_->() 3940 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3063 } 3942 }
3943
3064 3944
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3068 3948
… …
3070 glLoadIdentity; 3950 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3953 glLoadIdentity;
3074 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3075 $self->_draw; 3962 $self->_draw;
3076} 3963}
3077 3964
3078############################################################################# 3965#############################################################################
3079 3966

Diff Legend

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