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

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

Diff Legend

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