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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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