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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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