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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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