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

Diff Legend

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