ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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