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.216 by root, Fri May 19 16:43:57 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) = @_;
… …
136 $rem += $_ - $i; 164 $rem += $_ - $i;
137 $_ = $i; 165 $_ = $i;
138 } 166 }
139} 167}
140 168
169sub full_refresh {
170 # make a copy, otherwise for complains about freed values.
171 my @widgets = values %WIDGET;
172
173 $_->update
174 for @widgets;
175}
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
141# call when resolution changes etc. 185# call when resolution changes etc.
142sub rescale_widgets { 186sub rescale_widgets {
143 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
144 188
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 189 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 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
158 } 204 }
159
160 $widget->reconfigure;
161 } 205 }
206
207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
162} 216}
163 217
164############################################################################# 218#############################################################################
165 219
166package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
171 225
172sub new { 226sub new {
173 my $class = shift; 227 my $class = shift;
174 228
175 my $self = bless { 229 my $self = bless {
176 x => 0, 230 x => "center",
177 y => 0, 231 y => "center",
178 z => 0, 232 z => 0,
233 w => undef,
234 h => undef,
179 can_events => 1, 235 can_events => 1,
180 @_ 236 @_
181 }, $class; 237 }, $class;
182 238
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
240
183 for (keys %$self) { 241 for (keys %$self) {
184 if (/^connect_(.*)$/) { 242 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
186 } 244 }
187 } 245 }
188 246
189 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 }
190 258
191 $self 259 $self
192} 260}
193 261
194sub destroy { 262sub destroy {
… …
204 return if $self->{parent}; 272 return if $self->{parent};
205 273
206 $CFClient::UI::ROOT->add ($self); 274 $CFClient::UI::ROOT->add ($self);
207} 275}
208 276
209sub hide { 277sub set_visible {
210 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};
211 301
212 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 334 $self->{parent}->remove ($self)
216 if $self->{parent}; 335 if $self->{parent};
217} 336}
218 337
219sub move { 338sub move_abs {
220 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
221 340
222 $self->{x} = int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223 $self->{y} = int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
225 344
226 $self->update; 345 $self->update;
227} 346}
228 347
229sub set_size { 348sub set_size {
230 my ($self, $w, $h) = @_; 349 my ($self, $w, $h) = @_;
231 350
232 $self->{user_w} = $w; 351 $self->{force_w} = $w;
233 $self->{user_h} = $h; 352 $self->{force_h} = $h;
234 353
235 $self->check_size; 354 $self->realloc;
236} 355}
237 356
238sub size_request { 357sub size_request {
239 require Carp; 358 require Carp;
240 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
241} 360}
242 361
362sub baseline_shift {
363 0
364}
365
243sub configure { 366sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
245 368
246 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h);
371
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, int $w / $self->{aspect};
249 374
250 # use alignment to adjust x, y 375 # use alignment to adjust x, y
251 376
252 $x += int +($w - $w2) * 0.5; 377 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 378 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 379 }
257 380
258 if ($self->{x} != $x || $self->{y} != $y) { 381 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 382 $self->{x} = $x;
260 $self->{y} = $y; 383 $self->{y} = $y;
261 $self->update; 384 $self->update;
262 } 385 }
263 386
264 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 388 return unless $self->{visible};
266 }
267}
268 389
269sub size_allocate { 390 $self->{alloc_w} = $w;
270 # nothing to be done 391 $self->{alloc_h} = $h;
271}
272 392
273sub reconfigure { 393 $self->{root}{size_alloc}{$self+0} = $self;
274 my ($self) = @_; 394 }
275
276 $self->check_size (1);
277 $self->update;
278} 395}
279 396
280sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
281} 403}
282 404
283sub set_max_size { 405sub set_max_size {
284 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
285 407
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
288} 412}
289 413
290sub set_tooltip { 414sub set_tooltip {
291 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
292 416
417 $tooltip =~ s/^\s+//;
418 $tooltip =~ s/\s+$//;
419
420 return if $self->{tooltip} eq $tooltip;
421
293 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
294 423
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
298 } 427 }
299} 428}
300 429
301# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
302sub coord2local { 431sub coord2local {
… …
310 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
311 440
312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
313} 442}
314 443
315sub focus_in { 444sub invoke_focus_in {
316 my ($self) = @_; 445 my ($self) = @_;
317 446
318 return if $FOCUS == $self; 447 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
320 449
321 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
322 451
323 $self->emit (focus_in => $focus); 452 $self->update;
324 453
325 $focus->update if $focus; 454 0
326 $FOCUS->update;
327} 455}
328 456
329sub focus_out { 457sub invoke_focus_out {
330 my ($self) = @_; 458 my ($self) = @_;
331 459
332 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
333 461
334 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
335 463
336 $self->emit (focus_out => $focus); 464 $self->update;
337 465
338 $focus->update if $focus; #? 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
339} 467 unless $FOCUS;
340 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
341sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
342sub button_up { } 480sub invoke_button_up { 0 }
343sub key_down { } 481sub invoke_key_down { 0 }
344sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
345 484
346sub button_down { 485sub invoke_button_down {
347 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
348 487
349 $self->focus_in; 488 $self->grab_focus;
350}
351 489
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 490 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 491}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 492
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 493sub connect {
356sub 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
357 565
358sub draw { 566sub draw {
359 my ($self) = @_; 567 my ($self) = @_;
360 568
361 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);
362 578
363 glPushMatrix; 579 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367 581
368 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372 glEnable GL_BLEND; 584 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS; 586 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 587 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 588 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h}; 589 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h}; 590 glVertex 0 , $self->{h};
392 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;
393 glPopMatrix; 605 glPopMatrix;
394 #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;
395 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
396} 611}
397 612
398sub _draw { 613sub _draw {
399 my ($self) = @_; 614 my ($self) = @_;
400 615
401 warn "no draw defined for $self\n"; 616 warn "no draw defined for $self\n";
402} 617}
403 618
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450}
451
452sub DESTROY { 619sub DESTROY {
453 my ($self) = @_; 620 my ($self) = @_;
454 621
622 return if CFClient::in_destruct;
623
455 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
456 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
457} 628}
458 629
459############################################################################# 630#############################################################################
460 631
461package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
486 657
487 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
489 660
490 glEnable GL_BLEND; 661 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 663 glColor_premultiply @$color;
493 664
494 glBegin GL_QUADS; 665 glBegin GL_QUADS;
495 glVertex 0 , 0; 666 glVertex 0 , 0;
496 glVertex 0 , $h; 667 glVertex 0 , $h;
497 glVertex $w, $h; 668 glVertex $w, $h;
… …
512 my ($class, %arg) = @_; 683 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 684 $class->SUPER::new (can_events => 0, %arg);
514} 685}
515 686
516sub size_request { 687sub size_request {
517 (0, 0) 688 my ($self) = @_;
689
690 ($self->{w} + 0, $self->{h} + 0)
518} 691}
519 692
520sub draw { } 693sub draw { }
521 694
522############################################################################# 695#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
527 700
528sub new { 701sub new {
529 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
530 703
531 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
532 705
533 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
534 children => [], 707 children => [],
535 can_events => 0, 708 can_events => 0,
536 %arg, 709 %arg,
537 ); 710 );
711
538 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
539 714
540 $self 715 $self
541} 716}
542 717
543sub add { 718sub add {
… …
551 $self->{children} = [ 726 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 727 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 728 @{$self->{children}}, @widgets
554 ]; 729 ];
555 730
556 $self->check_size (1); 731 $self->realloc;
557 $self->update;
558} 732}
559 733
560sub children { 734sub children {
561 @{ $_[0]{children} } 735 @{ $_[0]{children} }
562} 736}
… …
567 delete $child->{parent}; 741 delete $child->{parent};
568 $child->hide; 742 $child->hide;
569 743
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 745
572 $self->check_size; 746 $self->realloc;
573 $self->update;
574} 747}
575 748
576sub clear { 749sub clear {
577 my ($self) = @_; 750 my ($self) = @_;
578 751
… …
582 for (@$children) { 755 for (@$children) {
583 delete $_->{parent}; 756 delete $_->{parent};
584 $_->hide; 757 $_->hide;
585 } 758 }
586 759
587 $self->check_size; 760 $self->realloc;
588 $self->update;
589} 761}
590 762
591sub find_widget { 763sub find_widget {
592 my ($self, $x, $y) = @_; 764 my ($self, $x, $y) = @_;
593 765
594 $x -= $self->{x}; 766 $x -= $self->{x};
595 $y -= $self->{y}; 767 $y -= $self->{y};
596 768
597 my $res; 769 my $res;
598 770
599 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
601 and return $res; 773 and return $res;
602 } 774 }
603 775
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
625} 797}
626 798
627sub add { 799sub add {
628 my ($self, $child) = @_; 800 my ($self, $child) = @_;
629 801
630 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
631
632 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
633} 804}
634 805
635sub remove { 806sub remove {
636 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
645 816
646sub size_request { 817sub size_request {
647 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
648} 819}
649 820
650sub size_allocate { 821sub invoke_size_allocate {
651 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
652 823
653 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
654} 827}
655 828
656############################################################################# 829#############################################################################
830
831# back-buffered drawing area
657 832
658package CFClient::UI::Window; 833package CFClient::UI::Window;
659 834
660our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
661 836
… …
672 847
673 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
674 $self->SUPER::update; 849 $self->SUPER::update;
675} 850}
676 851
677sub size_allocate { 852sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
679 854
680 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
682} 858}
683 859
684sub _render { 860sub _render {
861 my ($self) = @_;
862
685 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
686} 864}
687 865
688sub render_child { 866sub render_child {
689 my ($self) = @_; 867 my ($self) = @_;
690 868
691 $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 {
692 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 880 $self->_render;
696 }; 881 };
697} 882}
698 883
699sub _draw { 884sub _draw {
700 my ($self) = @_; 885 my ($self) = @_;
701 886
702 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
703 888
704 my $tex = $self->{texture} 889 my $tex = $self->{texture}
705 or return; 890 or return;
706 891
707 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
710 895
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
712 897
713 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
714} 899}
… …
717 902
718package CFClient::UI::ViewPort; 903package CFClient::UI::ViewPort;
719 904
720our @ISA = CFClient::UI::Window::; 905our @ISA = CFClient::UI::Window::;
721 906
907sub new {
908 my $class = shift;
909
910 $class->SUPER::new (
911 scroll_x => 0,
912 scroll_y => 1,
913 @_,
914 )
915}
916
722sub size_request { 917sub size_request {
723 my ($self) = @_; 918 my ($self) = @_;
724 919
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 920 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 921
728 @$self{qw(child_w child_h)} 922 $w = 10 if $self->{scroll_x};
729} 923 $h = 10 if $self->{scroll_y};
730 924
925 ($w, $h)
926}
927
731sub size_allocate { 928sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 937 $self->update;
938
939 1
735} 940}
736 941
737sub set_offset { 942sub set_offset {
738 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
739 944
… …
772} 977}
773 978
774sub _render { 979sub _render {
775 my ($self) = @_; 980 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 986
779 $self->SUPER::_render; 987 $self->SUPER::_render;
780} 988}
781 989
… …
784package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
785 993
786our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
787 995
788sub new { 996sub new {
789 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
790 1000
791 my $self; 1001 my $self;
792 1002
793 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
794 vertical => 1, 1004 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 1005 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 1006 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1007 $self->{vp}->set_offset (0, $_[1]);
798 }, 1008 },
799 ; 1009 ;
800 1010
801 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
803 slider => $slider, 1014 slider => $slider,
804 @_, 1015 %arg,
805 ); 1016 );
806 1017
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
810 1020
811 $self 1021 $self
812} 1022}
813 1023
814#TODO# update range on size_allocate depending on child 1024#TODO# update range on size_allocate depending on child
815# 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}
816 1063
817############################################################################# 1064#############################################################################
818 1065
819package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
820 1067
… …
836 1083
837 if ($self->{bg}) { 1084 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
839 1086
840 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
843 1090
844 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
845 glVertex 0 , 0; 1092 glVertex 0 , 0;
846 glVertex 0 , $h; 1093 glVertex 0 , $h;
847 glVertex $w, $h; 1094 glVertex $w, $h;
… …
860 1107
861our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFClient::UI::Bin::;
862 1109
863use CFClient::OpenGL; 1110use CFClient::OpenGL;
864 1111
865my @tex = 1112my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1;
1115
1116my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1119
869sub new { 1120sub new {
870 my $class = shift; 1121 my ($class, %arg) = @_;
871
872 # TODO: user_x, user_y, overwrite moveto?
873 1122
874 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1126 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1127 can_events => 1,
880 @_ 1128 min_w => 64,
1129 min_h => 32,
1130 %arg,
881 ); 1131 );
882 1132
883 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
884 align => 0, 1134 align => 0,
885 valign => 1, 1135 valign => 1,
886 text => $self->{title}, 1136 text => $self->{title},
887 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 }
888 1148
889 $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};
890} 1158}
891 1159
892sub border { 1160sub border {
893 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
894} 1162}
895 1163
896sub size_request { 1164sub size_request {
897 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};
898 1172
899 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
900 1174
901 ( 1175 (
902 $w + $self->border * 2, 1176 $w + $self->border * 2,
903 $h + $self->border * 2, 1177 $h + $self->border * 2,
904 ) 1178 )
905} 1179}
906 1180
907sub size_allocate { 1181sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
912 1194
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
917}
918 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
919sub button_down { 1211sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
921 1213
922 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1215 my $border = $self->border;
924 1216
… …
937 my ($ev, $x, $y) = @_; 1229 my ($ev, $x, $y) = @_;
938 1230
939 my $dx = $ev->{x} - $ox; 1231 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
941 1233
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1236
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1238 $self->realloc;
946 }; 1239 };
947 1240
948 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1245 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
954 1247
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
956 1249
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
960 } 1258 1
961} 1259}
962 1260
963sub button_up { 1261sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
965 1263
966 delete $self->{motion}; 1264 ! ! delete $self->{motion}
967} 1265}
968 1266
969sub mouse_motion { 1267sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
971 1269
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
973} 1273}
974 1274
975sub _draw { 1275sub _draw {
976 my ($self) = @_; 1276 my ($self) = @_;
977 1277
1278 my $child = $self->{children}[0];
1279
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1282
981 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1285
984 my $border = $self->border; 1286 my $border = $self->border;
985 1287
986 glColor @{ $self->{border_bg} }; 1288 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1289 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1293
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1295 glColor @{ $self->{bg} };
994 1296
995 # TODO: repeat texture not scale 1297 # TODO: repeat texture not scale
1298 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1299 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1300 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1302 }
1006 1303
1007 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1008 1305
1009 $self->{title}->draw if $self->{title};
1010
1011 $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};
1012} 1317}
1013 1318
1014############################################################################# 1319#############################################################################
1015 1320
1016package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1024sub new { 1329sub new {
1025 my $class = shift; 1330 my $class = shift;
1026 1331
1027 $class->SUPER::new ( 1332 $class->SUPER::new (
1028 col_expand => [], 1333 col_expand => [],
1029 @_ 1334 @_,
1030 ) 1335 )
1336}
1337
1338sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1340}
1032 1341
1033sub add { 1342sub add {
1034 my ($self, $x, $y, $child) = @_; 1343 my ($self, $x, $y, $child) = @_;
1035 1344
1036 $child->set_parent ($self); 1345 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1038 1347
1039 $child->check_size; 1348 $self->realloc;
1040} 1349}
1041 1350
1042sub children { 1351sub remove {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1352 my ($self, $child) = @_;
1044}
1045 1353
1354 # TODO: not yet implemented
1355}
1356
1046# 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?
1047sub clear { 1358sub clear {
1048 my ($self) = @_; 1359 my ($self) = @_;
1049 1360
1050 my @children = $self->children; 1361 my @children = $self->children;
1051 delete $self->{children}; 1362 delete $self->{children};
… …
1053 for (@children) { 1364 for (@children) {
1054 delete $_->{parent}; 1365 delete $_->{parent};
1055 $_->hide; 1366 $_->hide;
1056 } 1367 }
1057 1368
1058 $self->update; 1369 $self->realloc;
1059} 1370}
1060 1371
1061sub get_wh { 1372sub get_wh {
1062 my ($self) = @_; 1373 my ($self) = @_;
1063 1374
… …
1089 (sum @$ws), 1400 (sum @$ws),
1090 (sum @$hs), 1401 (sum @$hs),
1091 ) 1402 )
1092} 1403}
1093 1404
1094sub size_allocate { 1405sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1096 1407
1097 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1098 1409
1099 my $req_w = sum @$ws; 1410 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1411 my $req_h = (sum @$hs) || 1;
1101 1412
1102 # TODO: nicer code && do row_expand 1413 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1414 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1415 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1416 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1442 }
1132 1443
1133 $y += $row_h; 1444 $y += $row_h;
1134 } 1445 }
1135 1446
1447 1
1136} 1448}
1137 1449
1138sub find_widget { 1450sub find_widget {
1139 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1140 1452
… …
1159 } 1471 }
1160} 1472}
1161 1473
1162############################################################################# 1474#############################################################################
1163 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
1164package CFClient::UI::HBox; 1536package CFClient::UI::HBox;
1165 1537
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1538our @ISA = CFClient::UI::Box::;
1169 1539
1170sub size_request { 1540sub new {
1171 my ($self) = @_; 1541 my $class = shift;
1172 1542
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1543 $class->SUPER::new (
1174 1544 vertical => 0,
1175 ( 1545 @_,
1176 (List::Util::sum map $_->[0], @alloc),
1177 (List::Util::max map $_->[1], @alloc),
1178 ) 1546 )
1179} 1547}
1180 1548
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1549#############################################################################
1223 1550
1224package CFClient::UI::VBox; 1551package CFClient::UI::VBox;
1225 1552
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1553our @ISA = CFClient::UI::Box::;
1229 1554
1230sub size_request { 1555sub new {
1231 my ($self) = @_; 1556 my $class = shift;
1232 1557
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1558 $class->SUPER::new (
1234 1559 vertical => 1,
1235 ( 1560 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1561 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1562}
1279 1563
1280############################################################################# 1564#############################################################################
1281 1565
1282package CFClient::UI::Label; 1566package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1583 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1584 layout => (new CFClient::Layout),
1301 fontsize => 1, 1585 fontsize => 1,
1302 align => -1, 1586 align => -1,
1303 valign => -1, 1587 valign => -1,
1304 padding => 2, 1588 padding_x => 2,
1589 padding_y => 2,
1305 can_events => 0, 1590 can_events => 0,
1306 %arg 1591 %arg
1307 ); 1592 );
1308 1593
1309 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
… …
1336 1621
1337 delete $self->{texture}; 1622 delete $self->{texture};
1338 $self->SUPER::update; 1623 $self->SUPER::update;
1339} 1624}
1340 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1341sub set_text { 1633sub set_text {
1342 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1343 1635
1344 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1346 1638
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1349 1640
1641 delete $self->{size_req};
1642 $self->realloc;
1350 $self->update; 1643 $self->update;
1351 $self->check_size;
1352} 1644}
1353 1645
1354sub set_markup { 1646sub set_markup {
1355 my ($self, $markup) = @_; 1647 my ($self, $markup) = @_;
1356 1648
1357 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1359 1651
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1653
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1364 1655
1656 delete $self->{size_req};
1657 $self->realloc;
1365 $self->update; 1658 $self->update;
1366 $self->check_size;
1367} 1659}
1368 1660
1369sub size_request { 1661sub size_request {
1370 my ($self) = @_; 1662 my ($self) = @_;
1371 1663
1664 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1670
1378 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1379 1672
1380 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1381 $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);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1677
1384 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1385 1679
1386 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1388 } 1685 };
1389 1686
1390 ( 1687 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1688}
1395 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1396sub size_allocate { 1694sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1398 1696
1697 delete $self->{ox};
1698
1399 delete $self->{texture}; 1699 delete $self->{texture}
1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1400} 1703}
1401 1704
1402sub set_fontsize { 1705sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1404 1707
1405 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1406 delete $self->{texture}; 1710 delete $self->{texture};
1407 1711
1408 $self->update; 1712 $self->realloc;
1409 $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;
1410} 1722}
1411 1723
1412sub _draw { 1724sub _draw {
1413 my ($self) = @_; 1725 my ($self) = @_;
1414 1726
1415 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1416 1728
1417 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1736
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$self->{layout}->size]
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1738 };
1437 1739
1438 glEnable GL_TEXTURE_2D; 1740 unless (exists $self->{ox}) {
1439 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);
1440 1744
1441 if ($tex->{format} == GL_ALPHA) { 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442 glColor @{$self->{fg}}; 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1747 : ($self->{h} - $size->[1]) * 0.5);
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 } 1748 };
1447 1749
1448 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});
1449} 1754}
1450 1755
1451############################################################################# 1756#############################################################################
1452 1757
1453package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1466 active_fg => [0, 0, 0], 1771 active_fg => [0, 0, 0],
1467 can_hover => 1, 1772 can_hover => 1,
1468 can_focus => 1, 1773 can_focus => 1,
1469 valign => 0, 1774 valign => 0,
1470 can_events => 1, 1775 can_events => 1,
1776 #text => ...
1777 #hidden => "*",
1471 @_ 1778 @_
1472 ) 1779 )
1473} 1780}
1474 1781
1475sub _set_text { 1782sub _set_text {
… …
1477 1784
1478 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1479 1786
1480 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1481 1788
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1790 $self->{text} = $text;
1486 1791
1487 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1489 1795
1490 $self->emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1491} 1800}
1492 1801
1493sub set_text { 1802sub set_text {
1494 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1495 1804
1496 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1806 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 1807}
1501 1808
1502sub get_text { 1809sub get_text {
1503 $_[0]{text} 1810 $_[0]{text}
1504} 1811}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1510 1817
1511 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1512} 1819}
1513 1820
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 1821sub invoke_key_down {
1521 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1522 1823
1523 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1540 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1843 $self->emit ('escape');
1543 } elsif ($uni) { 1844 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1545 } 1848 }
1546 1849
1547 $self->_set_text ($text); 1850 $self->_set_text ($text);
1548 $self->update;
1549 $self->check_size;
1550}
1551 1851
1852 $self->realloc;
1853
1854 1
1855}
1856
1552sub focus_in { 1857sub invoke_focus_in {
1553 my ($self) = @_; 1858 my ($self) = @_;
1554 1859
1555 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1556 1861
1557 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1558} 1863}
1559 1864
1560sub button_down { 1865sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1562 1867
1563 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 1869
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 1871
1567 # byte-index to char-index 1872 # byte-index to char-index
1568 my $text = $self->{text}; 1873 my $text = $self->{text};
1569 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1571 1876
1572 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1573 $self->update; 1878 $self->update;
1879
1880 1
1574} 1881}
1575 1882
1576sub mouse_motion { 1883sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 1888}
1580 1889
1581sub _draw { 1890sub _draw {
1582 my ($self) = @_; 1891 my ($self) = @_;
1583 1892
1584 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1585 1894
1586 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1589 } else { 1898 } else {
1590 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1591 } 1900 }
1592 1901
1593 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1596 glVertex 0 , 0; 1905 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1624 1933
1625our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1626 1935
1627use CFClient::OpenGL; 1936use CFClient::OpenGL;
1628 1937
1629sub key_down { 1938sub invoke_key_down {
1630 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1631 1940
1632 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1633 1942
1634 if ($sym == 13) { 1943 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1637 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1949 $self->emit (activate => $txt);
1640 $self->update; 1950 $self->update;
1641 1951
… …
1660 } else { 1970 } else {
1661 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1662 } 1972 }
1663 1973
1664 } else { 1974 } else {
1665 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1666 } 1978 1
1667
1668} 1979}
1669 1980
1670############################################################################# 1981#############################################################################
1671 1982
1672package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1681 1992
1682sub new { 1993sub new {
1683 my $class = shift; 1994 my $class = shift;
1684 1995
1685 $class->SUPER::new ( 1996 $class->SUPER::new (
1686 padding => 4, 1997 padding_x => 4,
1998 padding_y => 4,
1687 fg => [1, 1, 1], 1999 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 2000 active_fg => [0, 0, 1],
1689 can_hover => 1, 2001 can_hover => 1,
1690 align => 0, 2002 align => 0,
1691 valign => 0, 2003 valign => 0,
1692 can_events => 1, 2004 can_events => 1,
1693 @_ 2005 @_
1694 ) 2006 )
1695} 2007}
1696 2008
1697sub button_up { 2009sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1699 2011
2012 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 2014 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 2015
1703 } 2016 1
1704} 2017}
1705 2018
1706sub _draw { 2019sub _draw {
1707 my ($self) = @_; 2020 my ($self) = @_;
1708 2021
1709 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 2023
1715 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1718 2027
… …
1723 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
1724} 2033}
1725 2034
1726############################################################################# 2035#############################################################################
1727 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
1728package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
1729 2074
1730our @ISA = CFClient::UI::DrawBG::; 2075our @ISA = CFClient::UI::DrawBG::;
1731 2076
1732my @tex = 2077my @tex =
… …
1737 2082
1738sub new { 2083sub new {
1739 my $class = shift; 2084 my $class = shift;
1740 2085
1741 $class->SUPER::new ( 2086 $class->SUPER::new (
1742 padding => 2, 2087 padding_x => 2,
2088 padding_y => 2,
1743 fg => [1, 1, 1], 2089 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2090 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2092 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2093 state => 0,
… …
1751} 2097}
1752 2098
1753sub size_request { 2099sub size_request {
1754 my ($self) = @_; 2100 my ($self) = @_;
1755 2101
1756 ($self->{padding} * 2 + 6) x 2 2102 (6) x 2
1757} 2103}
1758 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1759sub button_down { 2113sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1761 2115
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2118 $self->toggle;
1765 $self->emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1766 } 2123 1
1767} 2124}
1768 2125
1769sub _draw { 2126sub _draw {
1770 my ($self) = @_; 2127 my ($self) = @_;
1771 2128
1772 $self->SUPER::_draw; 2129 $self->SUPER::_draw;
1773 2130
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2132
1776 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;
1777 2136
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2138
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2140
… …
1789package CFClient::UI::Image; 2148package CFClient::UI::Image;
1790 2149
1791our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1792 2151
1793use CFClient::OpenGL; 2152use CFClient::OpenGL;
1794use Carp qw/confess/;
1795 2153
1796our %loaded_images; 2154our %texture_cache;
1797 2155
1798sub new { 2156sub new {
1799 my $class = shift; 2157 my $class = shift;
1800 2158
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1802 2163
1803 $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";
1804 2166
1805 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1806 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;
1807 2169
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1809 2171
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2173
1814 $self 2174 $self
1815} 2175}
1816 2176
1817sub size_request { 2177sub size_request {
1818 my ($self) = @_; 2178 my ($self) = @_;
1819 2179
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1821} 2181}
1822 2182
1823sub _draw { 2183sub _draw {
1824 my ($self) = @_; 2184 my ($self) = @_;
1825 2185
… …
1934 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
1936 2296
1937 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
1938 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);
1939 2302
1940 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
1941 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;
1942 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2308
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
1961 2325
1962 if ($t3) { 2326 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd; 2333 glEnd;
1970 } 2334 }
1971 2335
1972 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2045 my $self = $class->SUPER::new ( 2409 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2410 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2411 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2412 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2413 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2414 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2415 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2416 min_h => $::WIDTH / 80,
2053 vertical => 0, 2417 vertical => 0,
2054 can_hover => 1, 2418 can_hover => 1,
2055 inner_pad => .05, 2419 inner_pad => 0.02,
2056 @_ 2420 @_
2057 ); 2421 );
2058 2422
2059 $self->set_value ($self->{range}[0]); 2423 $self->set_value ($self->{range}[0]);
2060 $self->update; 2424 $self->update;
2061 2425
2062 $self 2426 $self
2063} 2427}
2064 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
2065sub set_value { 2440sub set_value {
2066 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2067 2442
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2443 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2444
2070 $hi = $lo + 1 if $hi <= $lo; 2445 $hi = $lo + 1 if $hi <= $lo;
2071 2446
2447 $page = $hi - $lo if $page > $hi - $lo;
2448
2072 $value = $lo if $value < $lo; 2449 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2450 $value = $hi - $page if $value > $hi - $page;
2074 2451
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2452 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2453 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2454
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2456
2082 if ($value != $old_value) { 2457 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2458 $self->emit (changed => $value);
… …
2086} 2461}
2087 2462
2088sub size_request { 2463sub size_request {
2089 my ($self) = @_; 2464 my ($self) = @_;
2090 2465
2091 my $w = $self->{req_w}; 2466 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2467}
2096 2468
2097sub button_down { 2469sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2099 2471
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2102} 2477}
2103 2478
2104sub mouse_motion { 2479sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2106 2481
2107 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2484
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2486
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2488
2114 $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
2115 } 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
2116} 2505}
2117 2506
2118sub update { 2507sub update {
2119 my ($self) = @_; 2508 my ($self) = @_;
2120 2509
2121 $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}) {
2122 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2123 2519
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2521 my $range = ($hi - $page - $lo) || 1e-100;
2125 2522
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2523 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2524
2128 $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;
2129 2527
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2528 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2529 $value = $value * $self->{scale} + $self->{offset};
2132 2530
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2532 $self->{knob_w} = $knob_w;
2140 }); 2533 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2534
2148 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2149 2536
2150 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2151 2538
… …
2171 glDisable GL_TEXTURE_2D; 2558 glDisable GL_TEXTURE_2D;
2172} 2559}
2173 2560
2174############################################################################# 2561#############################################################################
2175 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
2176package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2177 2605
2178our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2179 2607
2180use CFClient::OpenGL; 2608use CFClient::OpenGL;
2181 2609
2182sub new { 2610sub new {
2183 my $class = shift; 2611 my $class = shift;
2184 2612
2185 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2186 fontsize => 1, 2614 fontsize => 1,
2187 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2188 #font => default_font 2617 #font => default_font
2189 @_, 2618 @_,
2190 2619
2191 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2192 par => [], 2621 par => [],
2193 height => 0, 2622 height => 0,
2194 children => [ 2623 children => [
2195 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2196 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2207 2636
2208 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2638 $self->reflow;
2210} 2639}
2211 2640
2212sub text_height { 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
2650sub invoke_size_allocate {
2651 my ($self, $w, $h) = @_;
2652
2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2655
2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2660
2661 $self->reflow;
2662
2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2213 my ($self, $text) = @_; 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) = @_;
2214 2679
2215 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2216 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219 $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}}
2220 2693 );
2221 ($layout->size)[1] 2694
2695 $layout
2222} 2696}
2223 2697
2224sub reflow { 2698sub reflow {
2225 my ($self) = @_; 2699 my ($self) = @_;
2226 2700
2227 $self->{need_reflow}++; 2701 $self->{need_reflow}++;
2228 $self->update; 2702 $self->update;
2229} 2703}
2230 2704
2231sub size_allocate { 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 {
2232 my ($self, $w, $h) = @_; 2713 my ($self) = @_;
2233 2714
2234 $self->SUPER::size_allocate ($w, $h); 2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2235 2717
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2718 $self->{par} = [];
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2719 $self->{height} = 0;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2239
2240 $self->reflow;
2241} 2721}
2242 2722
2243sub add_paragraph { 2723sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2245 2725
2246 #TODO: intelligently "reformat" paragraph 2726 my ($text, @w) = ref $para ? @$para : $para;
2247 2727
2248 my $height = $self->text_height ($text); 2728 $para = {
2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 };
2249 2736
2250 $self->{height} += $height; 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2251 2739
2252 push @{$self->{par}}, [$height, $color, $text]; 2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2253 2743
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2744sub scroll_to_bottom {
2255 $self->{children}[1]->update; 2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2256} 2749}
2257 2750
2258sub update { 2751sub update {
2259 my ($self) = @_; 2752 my ($self) = @_;
2260 2753
… …
2262 2755
2263 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2264 2757
2265 delete $self->{texture}; 2758 delete $self->{texture};
2266 2759
2267 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762
2268 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2764 my $height = 0;
2270 2765
2271 $height += $_->[0] = $self->text_height ($_->[2])
2272 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 }
2273 2778
2274 $self->{height} = $height; 2779 $self->{height} = $height;
2275 2780
2276 $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]);
2277 2782
2278 delete $self->{texture}; 2783 delete $self->{texture};
2279 } 2784 }
2280 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2284 2793
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2289 2795
2290 my $y0 = $top; 2796 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2797 my $y1 = $top + $H;
2292 2798
2293 my $y = 0; 2799 my $y = 0;
2294 2800
2295 my $layout = $self->{layout};
2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 2802 my $h = $para->{h};
2301 2803
2302 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2304 $layout->set_markup ($par->[2]);
2305 2805
2306 my ($W, $H) = $layout->size; 2806 my $layout = $self->get_layout ($para);
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2807
2808 $layout->render ($para->{indent}, $y - $y0);
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 }
2308 } 2822 }
2309 2823
2310 $y += $h; 2824 $y += $h;
2311 } 2825 }
2312
2313 glDisable GL_TEXTURE_2D;
2314 }; 2826 };
2315 }); 2827 });
2316} 2828}
2317 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2318sub _draw { 2839sub _draw {
2319 my ($self) = @_; 2840 my ($self) = @_;
2320 2841
2321 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2324 $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});
2325 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2326 2847
2327 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2328
2329} 2849}
2330 2850
2331############################################################################# 2851#############################################################################
2332 2852
2333package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2378 2898
2379sub new { 2899sub new {
2380 my $class = shift; 2900 my $class = shift;
2381 2901
2382 my $self = $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2383 state => 0, 2903 state => 0,
2384 connect_activate => \&toggle_flopper, 2904 on_activate => \&toggle_flopper,
2385 @_ 2905 @_
2386 ); 2906 );
2387 2907
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2908 $self
2394} 2909}
2395 2910
2396sub toggle_flopper { 2911sub toggle_flopper {
2397 my ($self) = @_; 2912 my ($self) = @_;
2398 2913
2399 # TODO: use animation 2914 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2915}
2411 2916
2412############################################################################# 2917#############################################################################
2413 2918
2414package CFClient::UI::Tooltip; 2919package CFClient::UI::Tooltip;
… …
2427} 2932}
2428 2933
2429sub set_tooltip_from { 2934sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2935 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2950 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2952 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2953 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2954 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2955 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 2963
2447 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2448} 2965}
2449 2966
2450sub size_allocate { 2967sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2452 2969
2453 $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 });
2454} 2989}
2455 2990
2456sub _draw { 2991sub _draw {
2457 my ($self) = @_; 2992 my ($self) = @_;
2458 2993
… …
2475 glVertex $w, $h; 3010 glVertex $w, $h;
2476 glVertex $w, 0; 3011 glVertex $w, 0;
2477 glEnd; 3012 glEnd;
2478 3013
2479 glTranslate 2 - 0.375, 2 - 0.375; 3014 glTranslate 2 - 0.375, 2 - 0.375;
3015
2480 $self->SUPER::_draw; 3016 $self->SUPER::_draw;
2481} 3017}
2482 3018
2483############################################################################# 3019#############################################################################
2484 3020
… …
2489use CFClient::OpenGL; 3025use CFClient::OpenGL;
2490 3026
2491sub new { 3027sub new {
2492 my $class = shift; 3028 my $class = shift;
2493 3029
2494 $class->SUPER::new ( 3030 my $self = $class->SUPER::new (
2495 aspect => 1, 3031 aspect => 1,
3032 can_events => 0,
2496 @_, 3033 @_,
2497 ) 3034 );
3035
3036 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self);
3038
3039 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1,
3042 interval => $self->{animspeed},
3043 cb => sub {
3044 ++$widget->{frame};
3045 $widget->update;
3046 },
3047 );
3048 }
3049
3050 $self
2498} 3051}
2499 3052
2500sub size_request { 3053sub size_request {
2501 (32, 8) 3054 (32, 8)
2502} 3055}
2503 3056
3057sub update {
3058 my ($self) = @_;
3059
3060 return unless $self->{visible};
3061
3062 $self->SUPER::update;
3063}
3064
2504sub _draw { 3065sub _draw {
2505 my ($self) = @_; 3066 my ($self) = @_;
2506 3067
2507 return unless $::CONN;#d# manage and cache textures differently 3068 return unless $::CONN;
3069
3070 my $face;
3071
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}];
3074
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 3080
2510 # TODO animation
2511 if ($tex) { 3081 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2517 } 3087 }
2518} 3088}
2519 3089
3090sub destroy {
3091 my ($self) = @_;
3092
3093 $self->{timer}->cancel
3094 if $self->{timer};
3095
3096 $self->SUPER::destroy;
3097}
3098
2520############################################################################# 3099#############################################################################
2521 3100
2522package CFClient::UI::InventoryItem; 3101package CFClient::UI::Buttonbar;
2523 3102
2524our @ISA = CFClient::UI::HBox::; 3103our @ISA = CFClient::UI::HBox::;
2525 3104
2526sub _item_to_desc { 3105# TODO: should actualyl wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669 3106
2670############################################################################# 3107#############################################################################
2671 3108
2672package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2673 3110
… …
2685 ); 3122 );
2686 3123
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2688 3125
2689 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2691 3128
2692 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2693 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 {
2694 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2695 can_hover => 1, 3146 can_hover => 1,
2696 can_events => 1, 3147 can_events => 1,
2697 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2698 } 3151 }
2699 3152
2700 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2701 3154
2702 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3168 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2717 3170
2718 $self->show; 3171 $self->show;
2719 $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);
2720} 3173}
2721 3174
2722sub mouse_motion { 3175sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2724 3177
2725 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3181
3182 0
3183}
3184
2730sub button_up { 3185sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2732 3187
2733 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3189 undef $GRAB;
2735 $self->hide; 3190 $self->hide;
2736 3191
2737 $self->emit ("popdown"); 3192 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2739 } 3198 1
2740} 3199}
2741 3200
2742############################################################################# 3201#############################################################################
2743 3202
2744package CFClient::UI::Statusbox; 3203package CFClient::UI::Multiplexer;
2745 3204
2746our @ISA = CFClient::UI::VBox::; 3205our @ISA = CFClient::UI::Container::;
2747 3206
2748sub new { 3207sub new {
2749 my $class = shift; 3208 my $class = shift;
2750 3209
2751 $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 (
2752 fontsize => 0.8, 3389 fontsize => 0.8,
2753 @_, 3390 @_,
2754 ) 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
2755} 3398}
2756 3399
2757sub reorder { 3400sub reorder {
2758 my ($self) = @_; 3401 my ($self) = @_;
2759 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} };
2760 3408
2761 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 3411 }
2764 3412
… …
2767 my @items = sort { 3415 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2771 3419
3420 $self->{timer}->interval (1);
3421
2772 my $count = 10 + 1; 3422 my $count = 10 + 1;
2773 for my $item (@items) { 3423 for my $item (@items) {
2774 last unless --$count; 3424 last unless --$count;
2775 3425
2776 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 3430 : $item->{text};
2781 3431
… …
2789 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3445 can_events => 1,
2796 can_hover => 1 3446 can_hover => 1
2797 }; 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;
2798 } 3460 }
2799 3461
2800 $self->clear; 3462 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2802} 3464}
… …
2805 my ($self, $text, %arg) = @_; 3467 my ($self, $text, %arg) = @_;
2806 3468
2807 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2809 3471
3472 return unless $text;
3473
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3475
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3477
2814 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2816 $item->{count}++; 3480 $item->{count}++;
2817 } else { 3481 } else {
2818 $item->{count} = 1; 3482 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2820 } 3484 }
2821 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3487 delete $item->{label};
2824 } else { 3488 } else {
2825 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
2832 count => 1, 3496 count => 1,
2833 %arg, 3497 %arg,
2834 }; 3498 };
2835 } 3499 }
2836 3500
3501 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 3502 $self->reorder;
3503 });
2838} 3504}
2839 3505
2840sub reconfigure { 3506sub reconfigure {
2841 my ($self) = @_; 3507 my ($self) = @_;
2842 3508
… …
2845 3511
2846 $self->reorder; 3512 $self->reorder;
2847 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
2848} 3514}
2849 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
2850############################################################################# 3524#############################################################################
2851 3525
2852package CFClient::UI::Root; 3526package CFClient::UI::Inventory;
2853 3527
2854our @ISA = CFClient::UI::Container::; 3528our @ISA = CFClient::UI::Table::;
2855
2856use CFClient::OpenGL;
2857 3529
2858sub new { 3530sub new {
2859 my $class = shift; 3531 my $class = shift;
2860 3532
2861 $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 => [],
2862 @_, 3578 @_,
2863 ) 3579 )
2864} 3580}
2865 3581
2866sub configure { 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2867 my ($self, $x, $y, $w, $h) = @_;
2868 3583
2869 $self->{w} = $w; 3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2870 $self->{h} = $h; 3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2871} 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");
2872 3594
2873sub 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 {
2874 my ($self) = @_; 3668 my ($self, $spell) = @_;
2875 3669
2876 $self->size_allocate ($self->{w}, $self->{h}) 3670 $self->{spell}->{$spell->{name}} = $spell;
2877 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
2878} 3709}
2879 3710
2880sub size_request { 3711sub size_request {
2881 my ($self) = @_; 3712 my ($self) = @_;
2882 3713
2883 ($self->{w}, $self->{h}) 3714 ($self->{w}, $self->{h})
2884} 3715}
2885 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
2886sub size_allocate { 3731sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 3733
2895 for my $child ($self->children) { 3734 for my $child ($self->children) {
2896 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)};
2897 3736
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3737 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3738 $Y = $child->{force_y} if exists $child->{force_y};
2900 3739
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3740 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3742
2907 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
2908 } 3744 }
3745
3746 1
2909} 3747}
2910 3748
2911sub coord2local { 3749sub coord2local {
2912 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
2913 3751
… …
2921} 3759}
2922 3760
2923sub update { 3761sub update {
2924 my ($self) = @_; 3762 my ($self) = @_;
2925 3763
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3764 $::WANT_REFRESH++;
2928} 3765}
2929 3766
2930sub add { 3767sub add {
2931 my ($self, @children) = @_; 3768 my ($self, @children) = @_;
2932 3769
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3770 $_->{is_toplevel} = 1
2935 3771 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3772
2941 $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 }
2942} 3789}
2943 3790
2944sub on_refresh { 3791sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3792 my ($self, $id, $cb) = @_;
2946 3793
… …
2959 while ($self->{refresh_hook}) { 3806 while ($self->{refresh_hook}) {
2960 $_->() 3807 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
2962 } 3809 }
2963 3810
2964 if ($self->{check_size}) { 3811 if ($self->{realloc}) {
2965 my @queue = ([], []); 3812 my %queue;
3813 my @queue;
3814 my $widget;
2966 3815
2967 for (;;) { 3816 outer:
2968 if ($self->{check_size}) { 3817 while () {
2969 # heuristic: check containers last 3818 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3819 for $widget (values %$realloc) {
2971 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 }
2972 } 3826 }
2973 3827
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3828 while () {
3829 @queue or last outer;
2975 3830
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3831 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3832 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 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}) {
2984 $widget->{req_w} = $w; 3852 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3853 $widget->{req_h} = $h;
2986 3854
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3855 $self->{size_alloc}{$widget+0} = $widget;
2988 3856
2989 $widget->{parent}->check_size
2990 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 }
2991 } 3864 }
3865
3866 delete $self->{realloc}{$widget+0};
2992 } 3867 }
2993 } 3868 }
2994 3869
2995 while ($self->{size_alloc}) { 3870 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3871 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 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)};
2998 3878
2999 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3001 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
3002 $widget->{w} = $w; 3895 $widget->{w} = $w;
3003 $widget->{h} = $h; 3896 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3897
3005 $widget->emit (size_allocate => $w, $h); 3898 $widget->emit (size_allocate => $w, $h);
3899 }
3006 } 3900 }
3007 } 3901 }
3008 3902
3009 while ($self->{post_alloc_hook}) { 3903 while ($self->{post_alloc_hook}) {
3010 $_->() 3904 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3905 for values %{delete $self->{post_alloc_hook}};
3012 } 3906 }
3013 3907
3908
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3911 glClear GL_COLOR_BUFFER_BIT;
3017 3912
3018 glMatrixMode GL_PROJECTION; 3913 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3914 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3917 glLoadIdentity;
3023 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
3024 $self->_draw; 3926 $self->_draw;
3025} 3927}
3026 3928
3027############################################################################# 3929#############################################################################
3028 3930

Diff Legend

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