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

Diff Legend

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