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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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