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

Diff Legend

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