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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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 {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 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};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
286 }
287}
288 363
289sub size_allocate { 364 $self->{alloc_w} = $w;
290 # nothing to be done 365 $self->{alloc_h} = $h;
291}
292 366
293sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
294 my ($self) = @_; 368 }
295
296 $self->check_size (1);
297 $self->update;
298} 369}
299 370
300sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
301} 377}
302 378
303sub set_max_size { 379sub set_max_size {
304 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
305 381
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
308} 386}
309 387
310sub set_tooltip { 388sub set_tooltip {
311 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
312 390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
394 return if $self->{tooltip} eq $tooltip;
395
313 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
314 397
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 401 }
319} 402}
320 403
321# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
322sub coord2local { 405sub coord2local {
… …
330 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
331 414
332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
333} 416}
334 417
335sub focus_in { 418sub invoke_focus_in {
336 my ($self) = @_; 419 my ($self) = @_;
337 420
338 return if $FOCUS == $self; 421 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
340 423
341 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
342 425
343 $self->emit (focus_in => $focus);
344
345 $focus->update if $focus; 426 $focus->update if $focus;
346 $FOCUS->update; 427 $FOCUS->update;
347}
348 428
429 0
430}
431
349sub focus_out { 432sub invoke_focus_out {
350 my ($self) = @_; 433 my ($self) = @_;
351 434
352 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
353 436
354 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
355 438
356 $self->emit (focus_out => $focus);
357
358 $focus->update if $focus; #? 439 $focus->update if $focus; #?
359}
360 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
361sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
362sub button_up { } 454sub invoke_button_up { 1 }
363sub key_down { } 455sub invoke_key_down { 1 }
364sub key_up { } 456sub invoke_key_up { 1 }
365 457
366sub button_down { 458sub invoke_button_down {
367 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
368 460
369 $self->focus_in; 461 $self->grab_focus;
370}
371 462
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
376sub 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
377 530
378sub draw { 531sub draw {
379 my ($self) = @_; 532 my ($self) = @_;
380 533
381 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);
382 545
383 glPushMatrix; 546 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 548
388 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 551 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 553 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 554 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 555 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 556 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 557 glVertex 0 , $self->{h};
412 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;
413 glPopMatrix; 572 glPopMatrix;
414 #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;
415 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
416} 578}
417 579
418sub _draw { 580sub _draw {
419 my ($self) = @_; 581 my ($self) = @_;
420 582
421 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
422} 584}
423 585
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472}
473
474sub DESTROY { 586sub DESTROY {
475 my ($self) = @_; 587 my ($self) = @_;
476 588
477 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
478 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
479} 593}
480 594
481############################################################################# 595#############################################################################
482 596
483package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
508 622
509 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
511 625
512 glEnable GL_BLEND; 626 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 628 glColor_premultiply @$color;
515 629
516 glBegin GL_QUADS; 630 glBegin GL_QUADS;
517 glVertex 0 , 0; 631 glVertex 0 , 0;
518 glVertex 0 , $h; 632 glVertex 0 , $h;
519 glVertex $w, $h; 633 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
536} 650}
537 651
538sub size_request { 652sub size_request {
539 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
540} 656}
541 657
542sub draw { } 658sub draw { }
543 659
544############################################################################# 660#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
549 665
550sub new { 666sub new {
551 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
552 668
553 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
554 670
555 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
556 children => [], 672 children => [],
557 can_events => 0, 673 can_events => 0,
558 %arg, 674 %arg,
559 ); 675 );
676
560 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
561 679
562 $self 680 $self
563} 681}
564 682
565sub add { 683sub add {
… …
573 $self->{children} = [ 691 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
576 ]; 694 ];
577 695
578 $self->check_size (1); 696 $self->realloc;
579 $self->update;
580} 697}
581 698
582sub children { 699sub children {
583 @{ $_[0]{children} } 700 @{ $_[0]{children} }
584} 701}
… …
589 delete $child->{parent}; 706 delete $child->{parent};
590 $child->hide; 707 $child->hide;
591 708
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 710
594 $self->check_size; 711 $self->realloc;
595 $self->update;
596} 712}
597 713
598sub clear { 714sub clear {
599 my ($self) = @_; 715 my ($self) = @_;
600 716
… …
604 for (@$children) { 720 for (@$children) {
605 delete $_->{parent}; 721 delete $_->{parent};
606 $_->hide; 722 $_->hide;
607 } 723 }
608 724
609 $self->check_size; 725 $self->realloc;
610 $self->update;
611} 726}
612 727
613sub find_widget { 728sub find_widget {
614 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
615 730
616 $x -= $self->{x}; 731 $x -= $self->{x};
617 $y -= $self->{y}; 732 $y -= $self->{y};
618 733
619 my $res; 734 my $res;
620 735
621 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
623 and return $res; 738 and return $res;
624 } 739 }
625 740
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
647} 762}
648 763
649sub add { 764sub add {
650 my ($self, $child) = @_; 765 my ($self, $child) = @_;
651 766
652 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
653
654 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
655} 769}
656 770
657sub remove { 771sub remove {
658 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
667 781
668sub size_request { 782sub size_request {
669 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
670} 784}
671 785
672sub size_allocate { 786sub invoke_size_allocate {
673 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
674 788
675 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
676} 792}
677 793
678############################################################################# 794#############################################################################
795
796# back-buffered drawing area
679 797
680package CFClient::UI::Window; 798package CFClient::UI::Window;
681 799
682our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
683 801
… …
694 812
695 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
696 $self->SUPER::update; 814 $self->SUPER::update;
697} 815}
698 816
699sub size_allocate { 817sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
701 819
702 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
704} 823}
705 824
706sub _render { 825sub _render {
826 my ($self) = @_;
827
707 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
708} 829}
709 830
710sub render_child { 831sub render_child {
711 my ($self) = @_; 832 my ($self) = @_;
712 833
713 $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 {
714 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 845 $self->_render;
718 }; 846 };
719} 847}
720 848
721sub _draw { 849sub _draw {
722 my ($self) = @_; 850 my ($self) = @_;
723 851
724 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
725 853
726 my $tex = $self->{texture} 854 my $tex = $self->{texture}
727 or return; 855 or return;
728 856
729 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
732 860
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 862
735 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
736} 864}
… …
739 867
740package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
741 869
742our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
743 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
744sub size_request { 882sub size_request {
745 my ($self) = @_; 883 my ($self) = @_;
746 884
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 886
750 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
751} 888 $h = 10 if $self->{scroll_y};
752 889
890 ($w, $h)
891}
892
753sub size_allocate { 893sub invoke_size_allocate {
754 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
755 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);
756 $self->update; 902 $self->update;
903
904 1
757} 905}
758 906
759sub set_offset { 907sub set_offset {
760 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
761 909
… …
794} 942}
795 943
796sub _render { 944sub _render {
797 my ($self) = @_; 945 my ($self) = @_;
798 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
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 951
801 $self->SUPER::_render; 952 $self->SUPER::_render;
802} 953}
803 954
… …
806package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
807 958
808our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
809 960
810sub new { 961sub new {
811 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
812 965
813 my $self; 966 my $self;
814 967
815 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
816 vertical => 1, 969 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 971 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
820 }, 973 },
821 ; 974 ;
822 975
823 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 978 slider => $slider,
826 @_, 979 %arg,
827 ); 980 );
828 981
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
832 984
833 $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)
834} 1011}
835 1012
836#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1014# update viewport offset on scroll
838 1015
… …
858 1035
859 if ($self->{bg}) { 1036 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
861 1038
862 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
865 1042
866 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
867 glVertex 0 , 0; 1044 glVertex 0 , 0;
868 glVertex 0 , $h; 1045 glVertex 0 , $h;
869 glVertex $w, $h; 1046 glVertex $w, $h;
… …
882 1059
883our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
884 1061
885use CFClient::OpenGL; 1062use CFClient::OpenGL;
886 1063
887my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 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);
890 1071
891sub new { 1072sub new {
892 my $class = shift; 1073 my ($class, %arg) = @_;
893
894 # TODO: user_x, user_y, overwrite moveto?
895 1074
896 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1078 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1079 can_events => 1,
902 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
903 ); 1083 );
904 1084
905 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
906 align => 0, 1086 align => 0,
907 valign => 1, 1087 valign => 1,
908 text => $self->{title}, 1088 text => $self->{title},
909 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 }
910 1100
911 $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};
912} 1110}
913 1111
914sub border { 1112sub border {
915 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
916} 1114}
917 1115
918sub size_request { 1116sub size_request {
919 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};
920 1124
921 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
922 1126
923 ( 1127 (
924 $w + $self->border * 2, 1128 $w + $self->border * 2,
925 $h + $self->border * 2, 1129 $h + $self->border * 2,
926 ) 1130 )
927} 1131}
928 1132
929sub size_allocate { 1133sub invoke_size_allocate {
930 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
931 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
932 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
934 1146
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
939}
940 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
941sub button_down { 1155sub invoke_button_down {
942 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
943 1157
944 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
945 my $border = $self->border; 1159 my $border = $self->border;
946 1160
… …
959 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
960 1174
961 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
963 1177
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1182 $self->realloc;
968 }; 1183 };
969 1184
970 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1189 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
976 1191
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
978 1193
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
982 } 1202 1
983} 1203}
984 1204
985sub button_up { 1205sub invoke_button_up {
986 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
987 1207
988 delete $self->{motion}; 1208 ! ! delete $self->{motion}
989} 1209}
990 1210
991sub mouse_motion { 1211sub invoke_mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
993 1213
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
995} 1217}
996 1218
997sub _draw { 1219sub _draw {
998 my ($self) = @_; 1220 my ($self) = @_;
999 1221
1222 my $child = $self->{children}[0];
1223
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1226
1003 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1229
1006 my $border = $self->border; 1230 my $border = $self->border;
1007 1231
1008 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1237
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1016 1240
1017 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1246 }
1028 1247
1029 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1030 1249
1031 $self->{title}->draw if $self->{title};
1032
1033 $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};
1034} 1261}
1035 1262
1036############################################################################# 1263#############################################################################
1037 1264
1038package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1046sub new { 1273sub new {
1047 my $class = shift; 1274 my $class = shift;
1048 1275
1049 $class->SUPER::new ( 1276 $class->SUPER::new (
1050 col_expand => [], 1277 col_expand => [],
1051 @_ 1278 @_,
1052 ) 1279 )
1280}
1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1284}
1054 1285
1055sub add { 1286sub add {
1056 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1057 1288
1058 $child->set_parent ($self); 1289 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1060 1291
1061 $child->check_size; 1292 $self->realloc;
1062} 1293}
1063 1294
1064sub children { 1295sub remove {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
1066}
1067 1297
1298 # TODO: not yet implemented
1299}
1300
1068# 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?
1069sub clear { 1302sub clear {
1070 my ($self) = @_; 1303 my ($self) = @_;
1071 1304
1072 my @children = $self->children; 1305 my @children = $self->children;
1073 delete $self->{children}; 1306 delete $self->{children};
… …
1075 for (@children) { 1308 for (@children) {
1076 delete $_->{parent}; 1309 delete $_->{parent};
1077 $_->hide; 1310 $_->hide;
1078 } 1311 }
1079 1312
1080 $self->update; 1313 $self->realloc;
1081} 1314}
1082 1315
1083sub get_wh { 1316sub get_wh {
1084 my ($self) = @_; 1317 my ($self) = @_;
1085 1318
… …
1111 (sum @$ws), 1344 (sum @$ws),
1112 (sum @$hs), 1345 (sum @$hs),
1113 ) 1346 )
1114} 1347}
1115 1348
1116sub size_allocate { 1349sub invoke_size_allocate {
1117 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1118 1351
1119 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1120 1353
1121 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1123 1356
1124 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1153 } 1386 }
1154 1387
1155 $y += $row_h; 1388 $y += $row_h;
1156 } 1389 }
1157 1390
1391 1
1158} 1392}
1159 1393
1160sub find_widget { 1394sub find_widget {
1161 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1162 1396
… …
1181 } 1415 }
1182} 1416}
1183 1417
1184############################################################################# 1418#############################################################################
1185 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
1186package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1187 1481
1188# TODO: wrap into common Box base class
1189
1190our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1191 1483
1192sub size_request { 1484sub new {
1193 my ($self) = @_; 1485 my $class = shift;
1194 1486
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1196 1488 vertical => 0,
1197 ( 1489 @_,
1198 (List::Util::sum map $_->[0], @alloc),
1199 (List::Util::max map $_->[1], @alloc),
1200 ) 1490 )
1201} 1491}
1202 1492
1203sub size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 ($h, $w) = ($w, $h);
1207
1208 my $children = $self->{children};
1209
1210 my @h = map $_->{req_w}, @$children;
1211
1212 my $req_h = List::Util::sum @h;
1213
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children;
1219 $exp ||= 1;
1220
1221 for (0 .. $#$children) {
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 }
1228 }
1229
1230 CFClient::UI::harmonize \@h;
1231
1232 my $y = 0;
1233 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_];
1236 $child->configure ($y, 0, $h, $w);
1237
1238 $y += $h;
1239 }
1240
1241 1
1242}
1243
1244############################################################################# 1493#############################################################################
1245 1494
1246package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1247 1496
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1251 1498
1252sub size_request { 1499sub new {
1253 my ($self) = @_; 1500 my $class = shift;
1254 1501
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1256 1503 vertical => 1,
1257 ( 1504 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1505 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1506}
1301 1507
1302############################################################################# 1508#############################################################################
1303 1509
1304package CFClient::UI::Label; 1510package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1527 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1323 fontsize => 1, 1529 fontsize => 1,
1324 align => -1, 1530 align => -1,
1325 valign => -1, 1531 valign => -1,
1326 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1327 can_events => 0, 1534 can_events => 0,
1328 %arg 1535 %arg
1329 ); 1536 );
1330 1537
1331 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1358 1565
1359 delete $self->{texture}; 1566 delete $self->{texture};
1360 $self->SUPER::update; 1567 $self->SUPER::update;
1361} 1568}
1362 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1363sub set_text { 1577sub set_text {
1364 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1365 1579
1366 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1368 1582
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1371 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1372 $self->update; 1588 $self->update;
1373 $self->check_size;
1374} 1589}
1375 1590
1376sub set_markup { 1591sub set_markup {
1377 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1378 1593
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1598
1384 $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;
1385 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1386 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1387 $self->update; 1604 $self->update;
1388 $self->check_size;
1389} 1605}
1390 1606
1391sub size_request { 1607sub size_request {
1392 my ($self) = @_; 1608 my ($self) = @_;
1393 1609
1610 $self->{size_req} ||= do {
1394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1395 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1399 1616
1400 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1401 1618
1402 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1403 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1404 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1405 1622
1406 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1407 1624
1408 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1410 } 1630 };
1411 1631
1412 ( 1632 @{ $self->{size_req} }
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1633}
1417 1634
1418sub size_allocate { 1635sub invoke_size_allocate {
1419 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1420 1637
1638 delete $self->{ox};
1639
1421 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1422} 1644}
1423 1645
1424sub set_fontsize { 1646sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1426 1648
1427 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1650 delete $self->{texture};
1429 1651
1430 $self->update; 1652 $self->realloc;
1431 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1432} 1661}
1433 1662
1434sub _draw { 1663sub _draw {
1435 my ($self) = @_; 1664 my ($self) = @_;
1436 1665
… …
1442 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1675
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1448 1678
1679 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1452 1683
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1687 };
1459 1688
1460 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1461 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};
1462 1693
1463 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1464 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1466 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1468 } 1701 }
1469 1702
1470 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1471} 1704}
1472 1705
… …
1488 active_fg => [0, 0, 0], 1721 active_fg => [0, 0, 0],
1489 can_hover => 1, 1722 can_hover => 1,
1490 can_focus => 1, 1723 can_focus => 1,
1491 valign => 0, 1724 valign => 0,
1492 can_events => 1, 1725 can_events => 1,
1726 #text => ...
1727 #hidden => "*",
1493 @_ 1728 @_
1494 ) 1729 )
1495} 1730}
1496 1731
1497sub _set_text { 1732sub _set_text {
… …
1499 1734
1500 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1501 1736
1502 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1503 1738
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1740 $self->{text} = $text;
1508 1741
1509 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1511 1745
1512 $self->emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1513} 1750}
1514 1751
1515sub set_text { 1752sub set_text {
1516 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1517 1754
1518 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1756 $self->_set_text ($text);
1520 $self->update;
1521 $self->check_size;
1522} 1757}
1523 1758
1524sub get_text { 1759sub get_text {
1525 $_[0]{text} 1760 $_[0]{text}
1526} 1761}
… …
1531 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1532 1767
1533 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1534} 1769}
1535 1770
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540}
1541
1542sub key_down { 1771sub invoke_key_down {
1543 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1544 1773
1545 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1546 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1547 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1562 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1793 $self->emit ('escape');
1565 } elsif ($uni) { 1794 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1567 } 1798 }
1568 1799
1569 $self->_set_text ($text); 1800 $self->_set_text ($text);
1570 $self->update;
1571 $self->check_size;
1572}
1573 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1574sub focus_in { 1807sub invoke_focus_in {
1575 my ($self) = @_; 1808 my ($self) = @_;
1576 1809
1577 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1578 1811
1579 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1580} 1813}
1581 1814
1582sub button_down { 1815sub invoke_button_down {
1583 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1584 1817
1585 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1586 1819
1587 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1588 1821
1589 # byte-index to char-index 1822 # byte-index to char-index
1590 my $text = $self->{text}; 1823 my $text = $self->{text};
1591 utf8::encode $text; 1824 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1593 1826
1594 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1595 $self->update; 1828 $self->update;
1829
1830 1
1596} 1831}
1597 1832
1598sub mouse_motion { 1833sub invoke_mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1600# 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
1601} 1838}
1602 1839
1603sub _draw { 1840sub _draw {
1604 my ($self) = @_; 1841 my ($self) = @_;
1605 1842
1606 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1607 1844
1608 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1611 } else { 1848 } else {
1612 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1613 } 1850 }
1614 1851
1615 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1855 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1646 1883
1647our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1648 1885
1649use CFClient::OpenGL; 1886use CFClient::OpenGL;
1650 1887
1651sub key_down { 1888sub invoke_key_down {
1652 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1653 1890
1654 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1655 1892
1656 if ($sym == 13) { 1893 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1659 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1899 $self->emit (activate => $txt);
1662 $self->update; 1900 $self->update;
1663 1901
… …
1682 } else { 1920 } else {
1683 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1684 } 1922 }
1685 1923
1686 } else { 1924 } else {
1687 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1688 } 1928 1
1689
1690} 1929}
1691 1930
1692############################################################################# 1931#############################################################################
1693 1932
1694package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1703 1942
1704sub new { 1943sub new {
1705 my $class = shift; 1944 my $class = shift;
1706 1945
1707 $class->SUPER::new ( 1946 $class->SUPER::new (
1708 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1709 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1711 can_hover => 1, 1951 can_hover => 1,
1712 align => 0, 1952 align => 0,
1713 valign => 0, 1953 valign => 0,
1714 can_events => 1, 1954 can_events => 1,
1715 @_ 1955 @_
1716 ) 1956 )
1717} 1957}
1718 1958
1719sub button_up { 1959sub invoke_button_up {
1720 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1721 1961
1962 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1964 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1965
1725 } 1966 1
1726} 1967}
1727 1968
1728sub _draw { 1969sub _draw {
1729 my ($self) = @_; 1970 my ($self) = @_;
1730 1971
1731 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 1973
1737 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1740 1977
… …
1745 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1746} 1983}
1747 1984
1748############################################################################# 1985#############################################################################
1749 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
1750package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1751 2024
1752our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1753 2026
1754my @tex = 2027my @tex =
… …
1759 2032
1760sub new { 2033sub new {
1761 my $class = shift; 2034 my $class = shift;
1762 2035
1763 $class->SUPER::new ( 2036 $class->SUPER::new (
1764 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1765 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 2043 state => 0,
… …
1773} 2047}
1774 2048
1775sub size_request { 2049sub size_request {
1776 my ($self) = @_; 2050 my ($self) = @_;
1777 2051
1778 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1779} 2053}
1780 2054
1781sub button_down { 2055sub invoke_button_down {
1782 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1783 2057
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1788 } 2066 1
1789} 2067}
1790 2068
1791sub _draw { 2069sub _draw {
1792 my ($self) = @_; 2070 my ($self) = @_;
1793 2071
1794 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1795 2073
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 2075
1798 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;
1799 2079
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 2081
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 2083
… …
1958 2238
1959 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
1961 2241
1962 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
1963 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;
1964 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2247
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2067 my $self = $class->SUPER::new ( 2348 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2353 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2075 vertical => 0, 2356 vertical => 0,
2076 can_hover => 1, 2357 can_hover => 1,
2077 inner_pad => 0.02, 2358 inner_pad => 0.02,
2078 @_ 2359 @_
2079 ); 2360 );
… …
2082 $self->update; 2363 $self->update;
2083 2364
2084 $self 2365 $self
2085} 2366}
2086 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
2087sub set_value { 2379sub set_value {
2088 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2089 2381
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2382 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2383
2092 $hi = $lo + 1 if $hi <= $lo; 2384 $hi = $lo + 1 if $hi <= $lo;
2093 2385
2386 $page = $hi - $lo if $page > $hi - $lo;
2387
2094 $value = $lo if $value < $lo; 2388 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2389 $value = $hi - $page if $value > $hi - $page;
2096 2390
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2391 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2392 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101 2393
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2395
2104 if ($value != $old_value) { 2396 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2397 $self->emit (changed => $value);
… …
2108} 2400}
2109 2401
2110sub size_request { 2402sub size_request {
2111 my ($self) = @_; 2403 my ($self) = @_;
2112 2404
2113 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2406}
2118 2407
2119sub button_down { 2408sub invoke_button_down {
2120 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2121 2410
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2124} 2416}
2125 2417
2126sub mouse_motion { 2418sub invoke_mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2128 2420
2129 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2423
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2425
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2427
2136 $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
2137 } 2433 1
2138} 2434}
2139 2435
2140sub update { 2436sub update {
2141 my ($self) = @_; 2437 my ($self) = @_;
2142 2438
2143 $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}) {
2144 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2145 2448
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2450 my $range = ($hi - $page - $lo) || 1e-100;
2147 2451
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2452 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2453
2150 $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;
2151 2456
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2457 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2458 $value = $value * $self->{scale} + $self->{offset};
2154 2459
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2461 $self->{knob_w} = $knob_w;
2162 }); 2462 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2463
2170 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2171 2465
2172 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2173 2467
… …
2193 glDisable GL_TEXTURE_2D; 2487 glDisable GL_TEXTURE_2D;
2194} 2488}
2195 2489
2196############################################################################# 2490#############################################################################
2197 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
2198package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2199 2534
2200our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2201 2536
2202use CFClient::OpenGL; 2537use CFClient::OpenGL;
2203 2538
… …
2205 my $class = shift; 2540 my $class = shift;
2206 2541
2207 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2208 fontsize => 1, 2543 fontsize => 1,
2209 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2210 #font => default_font 2546 #font => default_font
2211 @_, 2547 @_,
2212 2548
2213 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2214 par => [], 2550 par => [],
… …
2229 2565
2230 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2231 $self->reflow; 2567 $self->reflow;
2232} 2568}
2233 2569
2234sub size_allocate { 2570sub invoke_size_allocate {
2235 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238 2572
2239 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $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});
2242 2577
2243 $self->reflow; 2578 $self->reflow;
2244}
2245 2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2581}
2582
2246sub text_height { 2583sub text_size {
2247 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2248 2585
2249 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2250 2587
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $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});
2253 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2254 2592
2255 ($layout->size)[1] 2593 $layout->size
2256} 2594}
2257 2595
2258sub reflow { 2596sub reflow {
2259 my ($self) = @_; 2597 my ($self) = @_;
2260 2598
2261 $self->{need_reflow}++; 2599 $self->{need_reflow}++;
2262 $self->update; 2600 $self->update;
2263} 2601}
2264 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
2265sub add_paragraph { 2618sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2619 my ($self, $color, $text, $indent) = @_;
2267 2620
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2621 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2622 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2623 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2625 }
2275 2626
2276 $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]);
2277 $self->{children}[1]->update;
2278} 2628}
2279 2629
2280sub update { 2630sub update {
2281 my ($self) = @_; 2631 my ($self) = @_;
2282 2632
… …
2284 2634
2285 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2286 2636
2287 delete $self->{texture}; 2637 delete $self->{texture};
2288 2638
2289 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641
2290 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2643 my $height = 0;
2292 2644
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2294 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 }
2295 2661
2296 $self->{height} = $height; 2662 $self->{height} = $height;
2297 2663
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update; 2665
2300
2301 delete $self->{texture}; 2666 delete $self->{texture};
2302 } 2667 }
2303 2668
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2307 2672
2308 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2309 2674
2310 my $y0 = $top; 2675 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2676 my $y1 = $top + $H;
2312 2677
2313 my $y = 0; 2678 my $y = 0;
2314 2679
2315 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2316 2681
2317 $layout->set_font ($self->{font}) if $self->{font}; 2682 $layout->set_font ($self->{font}) if $self->{font};
2318 2683
2319 glEnable GL_BLEND; 2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2687
2322 for my $par (@{$self->{par}}) { 2688 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2689 my $h = $par->[1];
2324 2690
2325 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2692 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2328 $layout->set_markup ($par->[3]); 2695 $layout->set_markup ($par->[4]);
2329 2696
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2698
2332 glRasterPos $par->[2], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2701 }
2335 2702
2336 $y += $h; 2703 $y += $h;
2337 } 2704 }
… …
2344sub _draw { 2711sub _draw {
2345 my ($self) = @_; 2712 my ($self) = @_;
2346 2713
2347 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2350 $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});
2351 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2352 2719
2353 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2354 2721
2355} 2722}
… …
2404 2771
2405sub new { 2772sub new {
2406 my $class = shift; 2773 my $class = shift;
2407 2774
2408 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2409 state => 0, 2776 state => 0,
2410 connect_activate => \&toggle_flopper, 2777 on_activate => \&toggle_flopper,
2411 @_ 2778 @_
2412 ); 2779 );
2413 2780
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2781 $self
2420} 2782}
2421 2783
2422sub toggle_flopper { 2784sub toggle_flopper {
2423 my ($self) = @_; 2785 my ($self) = @_;
2424 2786
2425 # TODO: use animation 2787 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2788}
2437 2789
2438############################################################################# 2790#############################################################################
2439 2791
2440package CFClient::UI::Tooltip; 2792package CFClient::UI::Tooltip;
… …
2453} 2805}
2454 2806
2455sub set_tooltip_from { 2807sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2457 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
2458 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2825 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2827 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2472 2836
2473 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2474} 2838}
2475 2839
2476sub size_allocate { 2840sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2478 2842
2479 $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 });
2480} 2862}
2481 2863
2482sub _draw { 2864sub _draw {
2483 my ($self) = @_; 2865 my ($self) = @_;
2484 2866
… …
2501 glVertex $w, $h; 2883 glVertex $w, $h;
2502 glVertex $w, 0; 2884 glVertex $w, 0;
2503 glEnd; 2885 glEnd;
2504 2886
2505 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2506 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2507} 2890}
2508 2891
2509############################################################################# 2892#############################################################################
2510 2893
… …
2516 2899
2517sub new { 2900sub new {
2518 my $class = shift; 2901 my $class = shift;
2519 2902
2520 my $self = $class->SUPER::new ( 2903 my $self = $class->SUPER::new (
2521 aspect => 1, 2904 aspect => 1,
2905 can_events => 0,
2522 @_, 2906 @_,
2523 ); 2907 );
2524 2908
2525 if ($self->{anim} && $self->{animspeed}) { 2909 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2910 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2936}
2553 2937
2554sub _draw { 2938sub _draw {
2555 my ($self) = @_; 2939 my ($self) = @_;
2556 2940
2557 return unless $::CONN;#d# manage and cache textures differently 2941 return unless $::CONN;
2558 2942
2559 my $face; 2943 my $face;
2560 2944
2561 if ($self->{frame}) { 2945 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2946 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 2953
2570 if ($tex) { 2954 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2576 } 2960 }
2577} 2961}
2578 2962
2579sub DESTROY { 2963sub destroy {
2580 my ($self) = @_; 2964 my ($self) = @_;
2581 2965
2582 $self->{timer}->cancel 2966 $self->{timer}->cancel
2583 if $self->{timer}; 2967 if $self->{timer};
2584 2968
2585 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2586} 2970}
2587 2971
2588############################################################################# 2972#############################################################################
2589 2973
2590package CFClient::UI::InventoryItem; 2974package CFClient::UI::Buttonbar;
2591 2975
2592our @ISA = CFClient::UI::HBox::; 2976our @ISA = CFClient::UI::HBox::;
2593 2977
2594sub _item_to_desc { 2978# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) {
2649 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653 (
2654 $item->{flags} & Crossfire::Protocol::F_LOCKED
2655 ? (
2656 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657 )
2658 : (
2659 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661 )
2662 ),
2663 );
2664
2665 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666 }
2667
2668 1
2669 },
2670 %args
2671 );
2672
2673
2674 $self->add (new CFClient::UI::Face
2675 can_events => 0,
2676 face => $item->{face},
2677 anim => $item->{anim},
2678 animspeed => $item->{animspeed},
2679 );
2680
2681 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683 $self->{item} = $item;
2684
2685 $self->update_item;
2686
2687 $self
2688}
2689
2690sub update_item {
2691 my ($self) = @_;
2692
2693 my $desc = _item_to_desc ($self->{item});
2694
2695 $self->{name_lbl}->set_text ($desc);
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::Inventory;
2701
2702our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox),
2709 @_,
2710 );
2711
2712 $self
2713}
2714
2715sub set_items {
2716 my ($self, $items) = @_;
2717
2718 $self->{scrolled}->clear;
2719 return unless $items;
2720
2721 my @items = sort {
2722 ($a->{type} <=> $b->{type})
2723 or ($a->{name} cmp $b->{name})
2724 } @$items;
2725
2726 $self->{real_items} = \@items;
2727
2728 for my $item (@items) {
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2730 $item->update_item ();
2731 }
2732
2733 $self->{scrolled}->add (@items);
2734
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2736}
2737
2738sub size_request {
2739 my ($self) = @_;
2740 ($self->{req_w}, $self->{req_h});
2741}
2742 2979
2743############################################################################# 2980#############################################################################
2744 2981
2745package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2746 2983
… …
2758 ); 2995 );
2759 2996
2760 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2761 2998
2762 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2763 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2764 3001
2765 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2766 if (!ref $widget) { 3003 if (!ref $widget) {
2767 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2768 can_hover => 1, 3005 can_hover => 1,
2769 can_events => 1, 3006 can_events => 1,
2770 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2771 } 3009 }
2772 3010
2773 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2774 3012
2775 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2787 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 3026 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2790 3028
2791 $self->show; 3029 $self->show;
2792 $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);
2793} 3031}
2794 3032
2795sub mouse_motion { 3033sub invoke_mouse_motion {
2796 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2797 3035
2798 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2799 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2800 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2801}
2802 3039
3040 0
3041}
3042
2803sub button_up { 3043sub invoke_button_up {
2804 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2805 3045
2806 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 3047 undef $GRAB;
2808 $self->hide; 3048 $self->hide;
2809 3049
2810 $self->emit ("popdown"); 3050 $self->emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2812 } 3056 1
2813} 3057}
2814 3058
2815############################################################################# 3059#############################################################################
2816 3060
2817package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2818 3062
2819our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2820 3064
2821sub new { 3065sub new {
2822 my $class = shift; 3066 my $class = shift;
2823 3067
2824 $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 (
2825 fontsize => 0.8, 3235 fontsize => 0.8,
2826 @_, 3236 @_,
2827 ) 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
2828} 3244}
2829 3245
2830sub reorder { 3246sub reorder {
2831 my ($self) = @_; 3247 my ($self) = @_;
2832 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} };
2833 3254
2834 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2835 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2836 } 3257 }
2837 3258
… …
2840 my @items = sort { 3261 my @items = sort {
2841 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2842 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2843 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2844 3265
3266 $self->{timer}->interval (1);
3267
2845 my $count = 10 + 1; 3268 my $count = 10 + 1;
2846 for my $item (@items) { 3269 for my $item (@items) {
2847 last unless --$count; 3270 last unless --$count;
2848 3271
2849 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2850 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2851 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2852 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2853 : $item->{text}; 3276 : $item->{text};
2854 3277
… …
2862 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2863 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2864 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2865 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2866 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2867 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2868 can_events => 1, 3291 can_events => 1,
2869 can_hover => 1 3292 can_hover => 1
2870 }; 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;
2871 } 3306 }
2872 3307
2873 $self->clear; 3308 $self->clear;
2874 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2875} 3310}
… …
2878 my ($self, $text, %arg) = @_; 3313 my ($self, $text, %arg) = @_;
2879 3314
2880 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2881 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2882 3317
3318 return unless $text;
3319
2883 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2884 3321
2885 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886 3323
2887 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2888 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2889 $item->{count}++; 3326 $item->{count}++;
2890 } else { 3327 } else {
2891 $item->{count} = 1; 3328 $item->{count} = 1;
2892 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2893 } 3330 }
2894 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2895 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2896 delete $item->{label}; 3333 delete $item->{label};
2897 } else { 3334 } else {
2898 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2899 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2918 3355
2919 $self->reorder; 3356 $self->reorder;
2920 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2921} 3358}
2922 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2923############################################################################# 3368#############################################################################
2924 3369
2925package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
2926 3371
2927our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
2928
2929use CFClient::OpenGL;
2930 3373
2931sub new { 3374sub new {
2932 my $class = shift; 3375 my $class = shift;
2933 3376
2934 $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 => [],
2935 @_, 3620 @_,
2936 ) 3621 )
2937} 3622}
2938 3623
2939sub configure { 3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2940 my ($self, $x, $y, $w, $h) = @_;
2941 3625
2942 $self->{w} = $w; 3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2943 $self->{h} = $h; 3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2944} 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");
2945 3636
2946sub 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 {
2947 my ($self) = @_; 3710 my ($self, $spell) = @_;
2948 3711
2949 $self->size_allocate ($self->{w}, $self->{h}) 3712 $self->{spell}->{$spell->{name}} = $spell;
2950 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
2951} 3751}
2952 3752
2953sub size_request { 3753sub size_request {
2954 my ($self) = @_; 3754 my ($self) = @_;
2955 3755
2956 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
2957} 3757}
2958 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
2959sub size_allocate { 3773sub invoke_size_allocate {
2960 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
2961
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967 3775
2968 for my $child ($self->children) { 3776 for my $child ($self->children) {
2969 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)};
2970 3778
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
2972 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
2973 3781
2974 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
2975 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
2976
2977 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2978 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2979 3784
2980 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
2981 } 3786 }
3787
3788 1
2982} 3789}
2983 3790
2984sub coord2local { 3791sub coord2local {
2985 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
2986 3793
… …
2994} 3801}
2995 3802
2996sub update { 3803sub update {
2997 my ($self) = @_; 3804 my ($self) = @_;
2998 3805
2999 $self->check_size;
3000 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
3001} 3807}
3002 3808
3003sub add { 3809sub add {
3004 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3005 3811
3006 for my $child (@children) {
3007 $child->{toplevel} = 1; 3812 $_->{is_toplevel} = 1
3008 3813 for @children;
3009 # integerise window positions
3010 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y};
3012 }
3013 3814
3014 $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;
3015 3825
3016 while (@children) { 3826 while (@children) {
3017 my $w = pop @children; 3827 my $w = pop @children;
3018 push @children, $w->children; 3828 push @children, $w->children;
3019 $w->{visible} = 1; 3829 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3830 }
3033} 3831}
3034 3832
3035sub on_refresh { 3833sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3834 my ($self, $id, $cb) = @_;
… …
3050 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
3051 $_->() 3849 $_->()
3052 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3053 } 3851 }
3054 3852
3055 if ($self->{check_size}) { 3853 if ($self->{realloc}) {
3056 my @queue = ([], []); 3854 my %queue;
3855 my @queue;
3856 my $widget;
3057 3857
3058 for (;;) { 3858 outer:
3059 if ($self->{check_size}) { 3859 while () {
3060 # heuristic: check containers last 3860 if (my $realloc = delete $self->{realloc}) {
3061 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3861 for $widget (values %$realloc) {
3062 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 }
3063 } 3868 }
3064 3869
3065 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3870 while () {
3871 @queue or last outer;
3066 3872
3067 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3873 $widget = pop @{ $queue[-1] || [] }
3068 ? @$widget{qw(user_w user_h)} 3874 and last;
3069 : $widget->size_request;
3070
3071 if (delete $widget->{force_alloc}
3072 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3073 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3074 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}) {
3075 $widget->{req_w} = $w; 3894 $widget->{req_w} = $w;
3076 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3077 3896
3078 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3897 $self->{size_alloc}{$widget+0} = $widget;
3079 3898
3080 $widget->{parent}->check_size
3081 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 }
3082 } 3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3083 } 3909 }
3084 } 3910 }
3085 3911
3086 while ($self->{size_alloc}) { 3912 while (my $size_alloc = delete $self->{size_alloc}) {
3087 for (values %{delete $self->{size_alloc}}) { 3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3088 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)};
3089 3920
3090 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3092 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
3093 $widget->{w} = $w; 3931 $widget->{w} = $w;
3094 $widget->{h} = $h; 3932 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h); 3933
3096 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3097 } 3936 }
3098 } 3937 }
3099 3938
3100 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3101 $_->() 3940 $_->()
3102 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3103 } 3942 }
3943
3104 3944
3105 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3106 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3107 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3108 3948
… …
3110 glLoadIdentity; 3950 glLoadIdentity;
3111 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3112 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3113 glLoadIdentity; 3953 glLoadIdentity;
3114 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
3115 $self->_draw; 3962 $self->_draw;
3116} 3963}
3117 3964
3118############################################################################# 3965#############################################################################
3119 3966

Diff Legend

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