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

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

Diff Legend

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