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.372 by root, Sun Jul 15 22:13:43 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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1073 %arg,
1074 );
1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
1086 $self->add ($child) if $child;
1087
1088 $self
1089}
1090
1091#TODO# update range on size_allocate depending on child
1092
1093sub add {
1094 my ($self, $widget) = @_;
1095
1096 $self->{vp}->add ($self->{child} = $widget);
1097}
1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128}
1129
1130sub invoke_size_allocate {
1131 my ($self, $w, $h) = @_;
1132
1133 $self->update_slider;
1134 $self->SUPER::invoke_size_allocate ($w, $h)
1135}
1136
1137#############################################################################
1138
1139package CFPlus::UI::Frame;
1140
1141our @ISA = CFPlus::UI::Bin::;
1142
1143use CFPlus::OpenGL;
1144
1145sub new {
1146 my $class = shift;
1147
1148 $class->SUPER::new (
1149 bg => undef,
1150 @_,
1151 )
1152}
1153
1154sub _draw {
1155 my ($self) = @_;
1156
1157 if ($self->{bg}) {
1158 my ($w, $h) = @$self{qw(w h)};
1159
1160 glEnable GL_BLEND;
1161 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1162 glColor_premultiply @{ $self->{bg} };
1163
1164 glBegin GL_QUADS;
1165 glVertex 0 , 0;
1166 glVertex 0 , $h;
1167 glVertex $w, $h;
1168 glVertex $w, 0;
1169 glEnd;
1170
1171 glDisable GL_BLEND;
1172 }
1173
1174 $self->SUPER::_draw;
1175}
1176
1177#############################################################################
1178
1179package CFPlus::UI::FancyFrame;
1180
1181our @ISA = CFPlus::UI::Bin::;
1182
1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
861 1195
862 my $self = $class->SUPER::new ( 1196 my $self = $class->SUPER::new (
1197 # label => "",
863 bg => [1, 1, 1, 1], 1198 fg => [0.6, 0.3, 0.1],
864 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1199 border => 0.8,
866 toplevel => 1, 1200 style => 'single',
867 can_events => 1, 1201 %arg,
868 @_
869 ); 1202 );
870 1203
871 $self->{title} &&= new CFClient::UI::Label
872 align => 0,
873 valign => 1,
874 text => $self->{title},
875 fontsize => $self->{border};
876
877 $self 1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
878} 1212}
879 1213
880sub border { 1214sub border {
881 int $_[0]{border} * $::FONTSIZE 1215 int $_[0]{border} * $::FONTSIZE
882} 1216}
883 1217
884sub size_request { 1218sub size_request {
885 my ($self) = @_; 1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
886 1223
887 my ($w, $h) = $self->SUPER::size_request; 1224 my ($w, $h) = $self->SUPER::size_request;
888 1225
889 ( 1226 (
890 $w + $self->border * 2, 1227 $w + $self->border * 2,
891 $h + $self->border * 2, 1228 $h + $self->border * 2,
892 ) 1229 )
893} 1230}
894 1231
895sub size_allocate { 1232sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 1233 my ($self, $w, $h) = @_;
897 1234
898 $h -= List::Util::max 0, $self->border * 2; 1235 my $border = $self->border;
1236
899 $w -= List::Util::max 0, $self->border * 2; 1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
900 1239
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1240 if (my $label = $self->{label}) {
902 if $self->{title}; 1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
903 1245
904 $self->child->configure ($self->border, $self->border, $w, $h); 1246 $self->child->configure ($border, $border, $w, $h);
905}
906 1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1284
1285my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1287 mipmap => 1, wrap => 1;
1288
1289my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292
1293sub new {
1294 my ($class, %arg) = @_;
1295
1296 my $self = $class->SUPER::new (
1297 bg => [1, 1, 1, 1],
1298 border_bg => [1, 1, 1, 1],
1299 border => 0.6,
1300 can_events => 1,
1301 min_w => 64,
1302 min_h => 32,
1303 %arg,
1304 );
1305
1306 $self->{title_widget} = new CFPlus::UI::Label
1307 align => 0,
1308 valign => 1,
1309 text => $self->{title},
1310 fontsize => $self->{border},
1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1321
1322 $self
1323}
1324
1325sub add {
1326 my ($self, @widgets) = @_;
1327
1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1331}
1332
1333sub border {
1334 int $_[0]{border} * $::FONTSIZE
1335}
1336
1337sub size_request {
1338 my ($self) = @_;
1339
1340 $self->{title_widget}->size_request
1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1345
1346 my ($w, $h) = $self->SUPER::size_request;
1347
1348 (
1349 $w + $self->border * 2,
1350 $h + $self->border * 2,
1351 )
1352}
1353
1354sub invoke_size_allocate {
1355 my ($self, $w, $h) = @_;
1356
1357 if ($self->{title_widget}) {
1358 $self->{title_widget}{w} = $w;
1359 $self->{title_widget}{h} = $h;
1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1361 }
1362
1363 my $border = $self->border;
1364
1365 $h -= List::Util::max 0, $border * 2;
1366 $w -= List::Util::max 0, $border * 2;
1367
1368 $self->child->configure ($border, $border, $w, $h);
1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1380
1381 1
1382}
1383
907sub button_down { 1384sub invoke_button_down {
908 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
909 1386
910 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
911 my $border = $self->border; 1388 my $border = $self->border;
912 1389
… …
925 my ($ev, $x, $y) = @_; 1402 my ($ev, $x, $y) = @_;
926 1403
927 my $dx = $ev->{x} - $ox; 1404 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1405 my $dy = $ev->{y} - $oy;
929 1406
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1407 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1408 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1409
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1410 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size; 1411 $self->realloc;
934 }; 1412 };
935 1413
936 } elsif ($lr ^ $td) { 1414 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1415 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1416 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1418 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1419 my ($ev, $x, $y) = @_;
942 1420
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
944 1422
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update; 1424 # HACK: the next line is required to enforce placement
1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
947 }; 1426 };
1427 } else {
1428 return 0;
1429 }
1430
948 } 1431 1
949} 1432}
950 1433
951sub button_up { 1434sub invoke_button_up {
952 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
953 1436
954 delete $self->{motion}; 1437 ! ! delete $self->{motion}
955} 1438}
956 1439
957sub mouse_motion { 1440sub invoke_mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
959 1442
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1444
1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
961} 1454}
962 1455
963sub _draw { 1456sub _draw {
964 my ($self) = @_; 1457 my ($self) = @_;
965 1458
1459 my $child = $self->{children}[0];
1460
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1461 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1462 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1463
969 glEnable GL_TEXTURE_2D; 1464 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1466
972 my $border = $self->border; 1467 my $border = $self->border;
973 1468
974 glColor @{ $self->{border_bg} }; 1469 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1470 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1471 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1472 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1473 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1474
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1475 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1476 glColor @{ $self->{bg} };
982 1477
983 # TODO: repeat texture not scale 1478 # TODO: repeat texture not scale
1479 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1480 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1481 $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); 1482 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1483 }
994 1484
995 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
996 1486
997 $self->{title}->draw if $self->{title};
998
999 $self->child->draw; 1487 $child->draw;
1488
1489 if ($self->{title_widget}) {
1490 glTranslate 0, $border - $self->{h};
1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1000} 1498}
1001 1499
1002############################################################################# 1500#############################################################################
1003 1501
1004package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1005 1503
1006our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1007 1505
1008use List::Util qw(max sum); 1506use List::Util qw(max sum);
1009 1507
1010use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1011 1509
1012sub new { 1510sub new {
1013 my $class = shift; 1511 my $class = shift;
1014 1512
1015 $class->SUPER::new ( 1513 $class->SUPER::new (
1016 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1017 @_ 1516 @_,
1018 ) 1517 )
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} 1518}
1029 1519
1030sub children { 1520sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032} 1522}
1033 1523
1524sub add {
1525 my ($self) = shift;
1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1529 $child->set_parent ($self);
1530 $self->{children}[$y][$x] = $child;
1531 }
1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1542}
1543
1034# TODO: move to container class maybe? send childs a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1545sub clear {
1036 my ($self) = @_; 1546 my ($self) = @_;
1037 1547
1038 my @children = $self->children; 1548 my @children = $self->children;
1039 delete $self->{children}; 1549 delete $self->{children};
… …
1041 for (@children) { 1551 for (@children) {
1042 delete $_->{parent}; 1552 delete $_->{parent};
1043 $_->hide; 1553 $_->hide;
1044 } 1554 }
1045 1555
1046 $self->update; 1556 $self->realloc;
1047} 1557}
1048 1558
1049sub get_wh { 1559sub get_wh {
1050 my ($self) = @_; 1560 my ($self) = @_;
1051 1561
… …
1077 (sum @$ws), 1587 (sum @$ws),
1078 (sum @$hs), 1588 (sum @$hs),
1079 ) 1589 )
1080} 1590}
1081 1591
1082sub size_allocate { 1592sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1084 1594
1085 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1086 1596
1087 my $req_w = sum @$ws; 1597 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1598 my $req_h = (sum @$hs) || 1;
1089 1599
1090 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1091 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1094 1604
1095 # linearly scale sizes
1096 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1097 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1098 1606
1099 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1100 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1101 1616
1102 my $y; 1617 my $y;
1103 1618
1104 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1105 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1119 } 1634 }
1120 1635
1121 $y += $row_h; 1636 $y += $row_h;
1122 } 1637 }
1123 1638
1639 1
1124} 1640}
1125 1641
1126sub find_widget { 1642sub find_widget {
1127 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1128 1644
… …
1147 } 1663 }
1148} 1664}
1149 1665
1150############################################################################# 1666#############################################################################
1151 1667
1152package CFClient::UI::HBox; 1668package CFPlus::UI::Box;
1153 1669
1154# TODO: wrap into common Box base class
1155
1156our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1157 1671
1158sub size_request { 1672sub size_request {
1159 my ($self) = @_; 1673 my ($self) = @_;
1160 1674
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1675 $self->{vertical}
1676 ? (
1677 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1678 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1679 )
1680 : (
1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1683 )
1684}
1162 1685
1686sub invoke_size_allocate {
1687 my ($self, $w, $h) = @_;
1688
1689 my $space = $self->{vertical} ? $h : $w;
1690 my @children = $self->visible_children;
1691
1692 my @req;
1693
1694 if ($self->{homogeneous}) {
1695 @req = ($space / (@children || 1)) x @children;
1696 } else {
1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1698 my $req = List::Util::sum @req;
1699
1700 if ($req > $space) {
1701 # ah well, not enough space
1702 $_ *= $space / $req for @req;
1703 } else {
1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1705
1706 $space = ($space - $req) / $expand; # remaining space to give away
1707
1708 $req[$_] += $space * $children[$_]{expand}
1709 for 0 .. $#children;
1710 }
1163 ( 1711 }
1164 (List::Util::sum map $_->[0], @alloc), 1712
1165 (List::Util::max map $_->[1], @alloc), 1713 CFPlus::UI::harmonize \@req;
1714
1715 my $pos = 0;
1716 for (0 .. $#children) {
1717 my $alloc = $req[$_];
1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1719
1720 $pos += $alloc;
1721 }
1722
1723 1
1724}
1725
1726#############################################################################
1727
1728package CFPlus::UI::HBox;
1729
1730our @ISA = CFPlus::UI::Box::;
1731
1732sub new {
1733 my $class = shift;
1734
1735 $class->SUPER::new (
1736 vertical => 0,
1737 @_,
1166 ) 1738 )
1167} 1739}
1168 1740
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############################################################################# 1741#############################################################################
1211 1742
1212package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1213 1744
1214# TODO: wrap into common Box base class 1745our @ISA = CFPlus::UI::Box::;
1215 1746
1216our @ISA = CFClient::UI::Container::; 1747sub new {
1748 my $class = shift;
1217 1749
1218sub size_request { 1750 $class->SUPER::new (
1219 my ($self) = @_; 1751 vertical => 1,
1220 1752 @_,
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 ) 1753 )
1227} 1754}
1228 1755
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############################################################################# 1756#############################################################################
1269 1757
1270package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1271 1759
1272our @ISA = CFClient::UI::Base::; 1760our @ISA = CFPlus::UI::DrawBG::;
1273 1761
1274use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1275 1763
1276sub new { 1764sub new {
1277 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1278 1766
1279 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1769 #bg => none
1770 #active_bg => none
1281 #font => default_font 1771 #font => default_font
1282 #text => initial text 1772 #text => initial text
1283 #markup => initial narkup 1773 #markup => initial narkup
1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1776 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1285 fontsize => 1, 1778 fontsize => 1,
1286 align => -1, 1779 align => -1,
1287 valign => -1, 1780 valign => -1,
1288 padding => 2, 1781 padding_x => 2,
1782 padding_y => 2,
1289 can_events => 0, 1783 can_events => 0,
1290 %arg 1784 %arg
1291 ); 1785 );
1292 1786
1293 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1294 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1295 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1296 $self->{template} = $layout; 1790 $self->{template} = $layout;
1297 } 1791 }
1298 1792
1299 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1303 } 1797 }
1304 1798
1305 $self 1799 $self
1306} 1800}
1307 1801
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 { 1802sub update {
1319 my ($self) = @_; 1803 my ($self) = @_;
1320 1804
1321 delete $self->{texture}; 1805 delete $self->{texture};
1322 $self->SUPER::update; 1806 $self->SUPER::update;
1323} 1807}
1324 1808
1809sub realloc {
1810 my ($self) = @_;
1811
1812 delete $self->{ox};
1813 $self->SUPER::realloc;
1814}
1815
1325sub set_text { 1816sub set_text {
1326 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1327 1818
1328 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1329 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1330 1821
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1333 1823
1824 delete $self->{size_req};
1825 $self->realloc;
1334 $self->update; 1826 $self->update;
1335 $self->check_size;
1336} 1827}
1337 1828
1338sub set_markup { 1829sub set_markup {
1339 my ($self, $markup) = @_; 1830 my ($self, $markup) = @_;
1340 1831
1341 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1342 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1343 1834
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1836
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1348 1838
1839 delete $self->{size_req};
1840 $self->realloc;
1349 $self->update; 1841 $self->update;
1350 $self->check_size;
1351} 1842}
1352 1843
1353sub size_request { 1844sub size_request {
1354 my ($self) = @_; 1845 my ($self) = @_;
1355 1846
1847 $self->{size_req} ||= do {
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1853
1360 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1361 1855
1362 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1363 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1364 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1860
1366 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1367 1862
1368 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1865 }
1866
1867 [$w, $h]
1370 } 1868 };
1371 1869
1372 ( 1870 @{ $self->{size_req} }
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1871}
1377 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1378sub size_allocate { 1877sub invoke_size_allocate {
1379 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1380 1879
1880 delete $self->{ox};
1881
1381 delete $self->{texture}; 1882 delete $self->{texture}
1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1382} 1886}
1383 1887
1384sub set_fontsize { 1888sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1386 1890
1387 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1388 delete $self->{texture}; 1893 delete $self->{texture};
1389 1894
1390 $self->update; 1895 $self->realloc;
1391 $self->check_size; 1896}
1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1392} 1905}
1393 1906
1394sub _draw { 1907sub _draw {
1395 my ($self) = @_; 1908 my ($self) = @_;
1396 1909
1910 $self->SUPER::_draw; # draw background, if applicable
1911
1397 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1919
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1920 [$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 }; 1921 };
1415 1922
1416 glEnable GL_TEXTURE_2D; 1923 unless (exists $self->{ox}) {
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1926 : ($self->{w} - $size->[0]) * 0.5);
1418 1927
1419 if ($tex->{format} == GL_ALPHA) { 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1420 glColor @{$self->{fg}}; 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1930 : ($self->{h} - $size->[1]) * 0.5);
1422 } else {
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424 } 1931 };
1425 1932
1426 glDisable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1935
1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1427} 1937}
1428 1938
1429############################################################################# 1939#############################################################################
1430 1940
1431package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1432 1942
1433our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1434 1944
1435use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1436 1946
1437sub new { 1947sub new {
1438 my $class = shift; 1948 my $class = shift;
1439 1949
1440 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1444 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1445 can_hover => 1, 1955 can_hover => 1,
1446 can_focus => 1, 1956 can_focus => 1,
1447 valign => 0, 1957 valign => 0,
1448 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1960 #text => ...
1961 #hidden => "*",
1449 @_ 1962 @_
1450 ) 1963 )
1451} 1964}
1452 1965
1453sub _set_text { 1966sub _set_text {
… …
1455 1968
1456 delete $self->{cur_h}; 1969 delete $self->{cur_h};
1457 1970
1458 return if $self->{text} eq $text; 1971 return if $self->{text} eq $text;
1459 1972
1460 delete $self->{texture};
1461
1462 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1463 $self->{text} = $text; 1974 $self->{text} = $text;
1464 1975
1465 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1978 delete $self->{size_req};
1467 1979
1468 $self->emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1981
1982 $self->realloc;
1983 $self->update;
1469} 1984}
1470 1985
1471sub set_text { 1986sub set_text {
1472 my ($self, $text) = @_; 1987 my ($self, $text) = @_;
1473 1988
1474 $self->{cursor} = length $text; 1989 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1990 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478} 1991}
1479 1992
1480sub get_text { 1993sub get_text {
1481 $_[0]{text} 1994 $_[0]{text}
1482} 1995}
… …
1487 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1488 2001
1489 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1490} 2003}
1491 2004
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 { 2005sub invoke_key_down {
1499 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1500 2007
1501 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1502 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1503 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1504 2011
1505 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1506 2015
1507 if ($uni == 8) { 2016 if ($uni == 8) {
1508 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1509 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1510 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1511 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1512 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1513 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1514 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1515 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1516 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 2040 $self->emit ('escape');
1521 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
2045 } else {
2046 return 0;
1523 } 2047 }
1524 2048
1525 $self->_set_text ($text); 2049 $self->_set_text ($text);
2050
2051 $self->realloc;
1526 $self->update; 2052 $self->update;
1527}
1528 2053
2054 1
2055}
2056
1529sub focus_in { 2057sub invoke_focus_in {
1530 my ($self) = @_; 2058 my ($self) = @_;
1531 2059
1532 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1533 2061
1534 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1535} 2063}
1536 2064
1537sub button_down { 2065sub invoke_button_down {
1538 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1539 2067
1540 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1541 2069
1542 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1543 2071
1544 # byte-index to char-index 2072 # byte-index to char-index
1545 my $text = $self->{text}; 2073 my $text = $self->{text};
1546 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1548 2076
1549 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1550 $self->update; 2078 $self->update;
2079
2080 1
1551} 2081}
1552 2082
1553sub mouse_motion { 2083sub invoke_mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1555# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2086
2087 1
1556} 2088}
1557 2089
1558sub _draw { 2090sub _draw {
1559 my ($self) = @_; 2091 my ($self) = @_;
1560 2092
1561 local $self->{fg} = $self->{fg}; 2093 local $self->{fg} = $self->{fg};
1562 2094
1563 if ($FOCUS == $self) { 2095 if ($FOCUS == $self) {
1564 glColor @{$self->{active_bg}}; 2096 glColor_premultiply @{$self->{active_bg}};
1565 $self->{fg} = $self->{active_fg}; 2097 $self->{fg} = $self->{active_fg};
1566 } else { 2098 } else {
1567 glColor @{$self->{bg}}; 2099 glColor_premultiply @{$self->{bg}};
1568 } 2100 }
1569 2101
1570 glEnable GL_BLEND; 2102 glEnable GL_BLEND;
1571 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2103 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1572 glBegin GL_QUADS; 2104 glBegin GL_QUADS;
1573 glVertex 0 , 0; 2105 glVertex 0 , 0;
1574 glVertex 0 , $self->{h}; 2106 glVertex 0 , $self->{h};
1575 glVertex $self->{w}, $self->{h}; 2107 glVertex $self->{w}, $self->{h};
1576 glVertex $self->{w}, 0; 2108 glVertex $self->{w}, 0;
… …
1587 utf8::encode $text; 2119 utf8::encode $text;
1588 2120
1589 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1590 } 2122 }
1591 2123
1592 glColor @{$self->{fg}};
1593 glBegin GL_LINES; 2124 glBegin GL_LINES;
1594 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 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}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1596 glEnd; 2127 glEnd;
1597 } 2128 }
1598} 2129}
1599 2130
2131#############################################################################
2132
1600package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1601 2134
1602our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1603 2136
1604use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1605 2138
1606sub key_down { 2139sub invoke_key_down {
1607 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1608 2141
1609 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1610 2143
1611 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1612 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1614 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1617 $self->update; 2151 $self->update;
1618 2152
1619 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1622 } 2156 }
1623 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1624 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1626 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1627 } 2161 }
1628 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1629 } 2163 }
1630 2164
1631 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1632 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1633 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634 2168
1635 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1636 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1637 } else { 2171 } else {
1638 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1639 } 2173 }
1640 2174
1641 } else { 2175 } else {
1642 $self->SUPER::key_down ($ev); 2176 return $self->SUPER::invoke_key_down ($ev)
2177 }
2178
1643 } 2179 1
1644
1645} 2180}
1646 2181
1647############################################################################# 2182#############################################################################
1648 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1649package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1650 2224
1651our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1652 2226
1653use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1654 2228
1655my @tex = 2229my @tex =
1656 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1657 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1658 2232
1659sub new { 2233sub new {
1660 my $class = shift; 2234 my $class = shift;
1661 2235
1662 $class->SUPER::new ( 2236 $class->SUPER::new (
1663 padding => 4, 2237 padding_x => 4,
2238 padding_y => 4,
1664 fg => [1, 1, 1], 2239 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 2240 active_fg => [0, 0, 1],
1667 can_hover => 1, 2241 can_hover => 1,
1668 align => 0, 2242 align => 0,
1669 valign => 0, 2243 valign => 0,
1670 can_events => 1, 2244 can_events => 1,
1671 @_ 2245 @_
1672 ) 2246 )
1673} 2247}
1674 2248
1675sub button_up { 2249sub invoke_button_up {
1676 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1677 2251
2252 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 2254 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 2255
1681 } 2256 1
1682} 2257}
1683 2258
1684sub _draw { 2259sub _draw {
1685 my ($self) = @_; 2260 my ($self) = @_;
1686 2261
1687 local $self->{fg} = $self->{fg}; 2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1688
1689 if ($GRAB == $self) {
1690 $self->{fg} = $self->{active_fg};
1691 }
1692 2263
1693 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 glColor 0, 0, 0, 1; 2266 glColor 0, 0, 0, 1;
1696 2267
… …
1701 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1702} 2273}
1703 2274
1704############################################################################# 2275#############################################################################
1705 2276
1706package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1707 2278
1708our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1709 2280
1710my @tex = 2281my @tex =
1711 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1712 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1713 2284
1714use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1715 2286
1716sub new { 2287sub new {
1717 my $class = shift; 2288 my $class = shift;
1718 2289
1719 $class->SUPER::new ( 2290 $class->SUPER::new (
1720 padding => 2, 2291 padding_x => 2,
2292 padding_y => 2,
1721 fg => [1, 1, 1], 2293 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 2297 state => 0,
1724 can_hover => 1, 2298 can_hover => 1,
1725 @_ 2299 @_
1726 ) 2300 )
1727} 2301}
1728 2302
1729sub size_request { 2303sub size_request {
1730 my ($self) = @_; 2304 my ($self) = @_;
1731 2305
1732 ($self->{padding} * 2 + 6) x 2 2306 (6) x 2
1733} 2307}
1734 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1735sub button_down { 2317sub invoke_button_down {
1736 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1737 2319
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 2322 $self->toggle;
1741 $self->emit (changed => $self->{state}); 2323 } else {
2324 return 0
2325 }
2326
1742 } 2327 1
1743} 2328}
1744 2329
1745sub _draw { 2330sub _draw {
1746 my ($self) = @_; 2331 my ($self) = @_;
1747 2332
1748 $self->SUPER::_draw; 2333 $self->SUPER::_draw;
1749 2334
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 2336
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 2340
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 2342
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 2344
… …
1760 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
1761} 2348}
1762 2349
1763############################################################################# 2350#############################################################################
1764 2351
1765package CFClient::UI::Image; 2352package CFPlus::UI::Image;
1766 2353
1767our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
1768 2355
1769use CFClient::OpenGL; 2356use CFPlus::OpenGL;
1770use Carp qw/confess/;
1771 2357
1772our %loaded_images; 2358our %texture_cache;
1773 2359
1774sub new { 2360sub new {
1775 my $class = shift; 2361 my $class = shift;
1776 2362
1777 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
1778 2367
1779 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
1780 2370
1781 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1782 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1783 2373
1784 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
1785 2375
1786 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1787
1788 $self->{aspect} = $tex->{w} / $tex->{h};
1789 2377
1790 $self 2378 $self
1791} 2379}
1792 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
1793sub size_request { 2396sub size_request {
1794 my ($self) = @_; 2397 my ($self) = @_;
1795 2398
1796 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
1797} 2400}
1798 2401
1799sub _draw { 2402sub _draw {
1800 my ($self) = @_; 2403 my ($self) = @_;
1801 2404
… …
1811 } 2414 }
1812 2415
1813 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1815 2418
1816 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
1817 2420
1818 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
1819} 2422}
1820 2423
1821############################################################################# 2424#############################################################################
1822 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
1823package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
1824 2463
1825our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
1826 2465
1827use List::Util qw(min max); 2466use List::Util qw(min max);
1828 2467
1829use CFClient::OpenGL; 2468use CFPlus::OpenGL;
1830 2469
1831my %tex = ( 2470my %tex = (
1832 food => [ 2471 food => [
1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1834 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1835 ], 2474 ],
1836 grace => [ 2475 grace => [
1837 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 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/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1839 ], 2478 ],
1840 hp => [ 2479 hp => [
1841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1842 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1843 ], 2482 ],
1844 mana => [ 2483 mana => [
1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 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/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1847 ], 2486 ],
1848); 2487);
1849 2488
1850# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1910 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
1911 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
1912 2551
1913 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
1914 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1915 2557
1916 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
1917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1918 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
1919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2562 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1920 2563
1921 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2564 glBindTexture GL_TEXTURE_2D, $t1->{name};
1922 glBegin GL_QUADS; 2565 glBegin GL_QUADS;
… …
1937 2580
1938 if ($t3) { 2581 if ($t3) {
1939 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
1940 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
1941 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1942 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1943 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1944 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1945 glEnd; 2588 glEnd;
1946 } 2589 }
1947 2590
1948 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
1949 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
1950} 2593}
1951 2594
1952############################################################################# 2595#############################################################################
1953 2596
1954package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
1955 2598
1956our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
1957 2600
1958sub new { 2601sub new {
1959 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
1960 2603
1961 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
1963 can_hover => 1, 2606 can_hover => 1,
1964 can_events => 1, 2607 can_events => 1,
1965 %arg, 2608 %arg,
1966 ); 2609 );
1967 2610
1968 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $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); 2612 $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"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1971 2614
1972 $self 2615 $self
1973} 2616}
1974 2617
1975sub set_fontsize { 2618sub set_fontsize {
… …
1996 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
1997} 2640}
1998 2641
1999############################################################################# 2642#############################################################################
2000 2643
2001package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2002 2645
2003use strict; 2646use strict;
2004 2647
2005use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2006 2649
2007our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2008 2651
2009my @tex = 2652my @tex =
2010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2011 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2012 2655
2013sub new { 2656sub new {
2014 my $class = shift; 2657 my $class = shift;
2015 2658
2016 # range [value, low, high, page] 2659 # range [value, low, high, page, unit]
2017 2660
2018 # TODO: 0-width page 2661 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2662 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2663 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2664 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2665 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2666 active_fg => [0, 0, 0],
2667 bg => [0, 0, 0, 0.2],
2668 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2669 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2670 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2671 min_h => $::WIDTH / 80,
2027 vertical => 0, 2672 vertical => 0,
2028 can_hover => 1, 2673 can_hover => 1,
2029 inner_pad => 5, 2674 inner_pad => 0.02,
2030 @_ 2675 @_
2031 ); 2676 );
2032 2677
2678 $self->set_value ($self->{range}[0]);
2679 $self->update;
2680
2033 $self 2681 $self
2034} 2682}
2035 2683
2684sub set_range {
2685 my ($self, $range) = @_;
2686
2687 ($range, $self->{range}) = ($self->{range}, $range);
2688
2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2693}
2694
2695sub set_value {
2696 my ($self, $value) = @_;
2697
2698 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2699
2700 $hi = $lo + 1 if $hi <= $lo;
2701
2702 $page = $hi - $lo if $page > $hi - $lo;
2703
2704 $value = $lo if $value < $lo;
2705 $value = $hi - $page if $value > $hi - $page;
2706
2707 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2708 if $unit;
2709
2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2711
2712 if ($value != $old_value) {
2713 $self->emit (changed => $value);
2714 $self->update;
2715 }
2716}
2717
2036sub size_request { 2718sub size_request {
2037 my ($self) = @_; 2719 my ($self) = @_;
2038 2720
2039 my $w = $self->{req_w}; 2721 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2722}
2044 2723
2045sub button_down { 2724sub invoke_button_down {
2046 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2047 2726
2048 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2728
2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2730
2049 $self->mouse_motion ($ev, $x, $y); 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2050} 2732}
2051 2733
2052sub mouse_motion { 2734sub invoke_mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2054 2736
2055 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2739
2740 my (undef, $lo, $hi, $page) = @{$self->{range}};
2741
2742 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2743
2744 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2745 } else {
2746 return 0;
2747 }
2748
2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2762}
2763
2764sub update {
2765 my ($self) = @_;
2766
2767 delete $self->{knob_w};
2768 $self->SUPER::update;
2769}
2770
2771sub _draw {
2772 my ($self) = @_;
2773
2774 unless ($self->{knob_w}) {
2775 $self->set_value ($self->{range}[0]);
2776
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2777 my ($value, $lo, $hi, $page) = @{$self->{range}};
2778 my $range = ($hi - $page - $lo) || 1e-100;
2057 2779
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2780 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2781
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2782 $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 2783 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2784
2063 $x -= $inner_pad_px; # substract the padding 2785 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2786 $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 2787
2069 $self->emit (changed => $x); 2788 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2789 $self->{knob_w} = $knob_w;
2071 } 2790 }
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 2791
2085 $self->SUPER::_draw (); 2792 $self->SUPER::_draw ();
2086 2793
2087 my ($w, $h) = @$self{qw(w h)}; 2794 glScale $self->{w}, $self->{h};
2088 2795
2089 if ($self->{vertical}) { 2796 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2797 # draw a vertical slider like a rotated horizontal slider
2091 2798
2799 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2800 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2801 }
2097 2802
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2803 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2804 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2805
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; 2806 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2807 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2808
2122 # draw background 2809 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2810 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2811
2125 # draw handle 2812 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2813 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2814
2128 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2129} 2816}
2130 2817
2131############################################################################# 2818#############################################################################
2132 2819
2133package CFClient::UI::TextView; 2820package CFPlus::UI::ValSlider;
2134 2821
2135our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2136 2823
2824sub new {
2825 my ($class, %arg) = @_;
2826
2827 my $range = delete $arg{range};
2828
2829 my $self = $class->SUPER::new (
2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2832 to_value => sub { shift },
2833 from_value => sub { shift },
2834 %arg,
2835 );
2836
2837 $self->{slider}->connect (changed => sub {
2838 my ($self, $value) = @_;
2839 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2840 $self->{parent}->emit (changed => $value);
2841 });
2842
2843# $self->{entry}->connect (changed => sub {
2844# my ($self, $value) = @_;
2845# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2846# $self->{parent}->emit (changed => $value);
2847# });
2848
2849 $self->add ($self->{slider}, $self->{entry});
2850
2851 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2852
2853 $self
2854}
2855
2856sub set_range { shift->{slider}->set_range (@_) }
2857sub set_value { shift->{slider}->set_value (@_) }
2858
2859#############################################################################
2860
2861package CFPlus::UI::TextScroller;
2862
2863our @ISA = CFPlus::UI::HBox::;
2864
2137use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2138 2866
2139sub new { 2867sub new {
2140 my $class = shift; 2868 my $class = shift;
2141 2869
2142 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2143 fontsize => 1, 2871 fontsize => 1,
2144 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2145 #font => default_font 2874 #font => default_font
2146 @_, 2875 @_,
2147 2876
2148 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2149 par => [], 2878 par => [],
2879 max_par => 0,
2150 height => 0, 2880 height => 0,
2151 children => [ 2881 children => [
2152 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2153 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2154 ], 2884 ],
2155 ); 2885 );
2156 2886
2157 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2158 2888
… …
2164 2894
2165 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2896 $self->reflow;
2167} 2897}
2168 2898
2169sub text_height { 2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2908sub invoke_size_allocate {
2909 my ($self, $w, $h) = @_;
2910
2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2913
2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2918
2919 $self->reflow;
2920
2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2170 my ($self, $text) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2171 2937
2172 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2173 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w}); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2176 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2177 2951 );
2178 ($layout->size)[1] 2952
2953 $layout
2179} 2954}
2180 2955
2181sub reflow { 2956sub reflow {
2182 my ($self) = @_; 2957 my ($self) = @_;
2183 2958
2184 $self->{need_reflow}++; 2959 $self->{need_reflow}++;
2185 $self->update; 2960 $self->update;
2186} 2961}
2187 2962
2188sub size_allocate { 2963sub set_offset {
2964 my ($self, $offset) = @_;
2965
2966 # todo: base offset on lines or so, not on pixels
2967 $self->{children}[1]->set_value ($offset);
2968}
2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2189 my ($self, $w, $h) = @_; 2977 my ($self, $para) = @_;
2190 2978
2191 $self->SUPER::size_allocate ($w, $h); 2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2192 2980
2193 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2981 $self->{scroll_to} = $para;
2194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2982 $self->update;
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2983}
2196 2984
2197 $self->reflow; 2985sub clear {
2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2990
2991 $self->{par} = [];
2992 $self->{height} = 0;
2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2198} 2994}
2199 2995
2200sub add_paragraph { 2996sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2997 my $self = shift;
2202 2998
2203 #TODO: intelligently "reformat" paragraph 2999 for my $para (@_) {
3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
2204 3009
2205 my $height = $self->text_height ($text); 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
2206 3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2207 $self->{height} += $height; 3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2208 3053
2209 push @{$self->{par}}, [$height, $color, $text]; 3054 delete $self->{texture};
3055 }
2210 3056
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3057 if (my $paridx = delete $self->{scroll_to}) {
2212 $self->{children}[1]->update; 3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2213} 3060}
2214 3061
2215sub update { 3062sub update {
2216 my ($self) = @_; 3063 my ($self) = @_;
2217 3064
… …
2219 3066
2220 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2221 3068
2222 delete $self->{texture}; 3069 delete $self->{texture};
2223 3070
2224 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
2225 if (delete $self->{need_reflow}) { 3072 $self->force_uptodate;
2226 my $height = 0;
2227 3073
2228 $height += $_->[0] = $self->text_height ($_->[2]) 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2229 for @{$self->{par}};
2230 3075
2231 $self->{height} = $height; 3076 $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; 3077 glClearColor 0, 0, 0, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2241 3079
2242 glEnable GL_TEXTURE_2D; 3080 package CFPlus::UI::Base;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
2244 3083
2245 my $top = int $self->{children}[1]{range}[0]; 3084 my $top = int $self->{children}[1]{range}[0];
2246 3085
3086 my $paridx = 0;
3087 my $top_paragraph;
3088 my $top = int $self->{children}[1]{range}[0];
3089
2247 my $y0 = $top; 3090 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 3091 my $y1 = $top + $H;
2249 3092
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}}) { 3093 for my $para (@{$self->{par}}) {
2257 my $h = $par->[0]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2258 3096
2259 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 3098 my $layout = $self->get_layout ($para);
2261 $layout->set_markup ($par->[2]);
2262 3099
2263 my ($W, $H) = $layout->size; 3100 $layout->render ($para->{indent}, $y - $y0);
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3101
3102 if (my @w = @{ $para->{widget} }) {
3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2265 } 3114 }
2266 3115
2267 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2268 } 3118 }
2269 3119
2270 glDisable GL_TEXTURE_2D; 3120 $self->{top_paragraph} = $top_paragraph;
2271 }; 3121 };
2272 }); 3122 });
2273} 3123}
2274 3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
3132}
3133
2275sub _draw { 3134sub _draw {
2276 my ($self) = @_; 3135 my ($self) = @_;
2277 3136
2278 glEnable GL_TEXTURE_2D; 3137 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 3139 glColor 0, 0, 0, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2283 3142
2284 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2285
2286} 3144}
2287 3145
2288############################################################################# 3146#############################################################################
2289 3147
2290package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2291 3149
2292use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2293 3151
2294our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2295 3153
2296sub moveto { 3154sub moveto {
2297 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2298 3156
2299 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2327 glPopMatrix; 3185 glPopMatrix;
2328} 3186}
2329 3187
2330############################################################################# 3188#############################################################################
2331 3189
2332package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2333 3191
2334our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2335 3193
2336sub new { 3194sub new {
2337 my $class = shift; 3195 my $class = shift;
2338 3196
2339 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
2340 state => 0, 3198 state => 0,
2341 connect_activate => \&toggle_flopper, 3199 on_activate => \&toggle_flopper,
2342 @_ 3200 @_
2343 ); 3201 );
2344 3202
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 3203 $self
2351} 3204}
2352 3205
2353sub toggle_flopper { 3206sub toggle_flopper {
2354 my ($self) = @_; 3207 my ($self) = @_;
2355 3208
2356 # TODO: use animation 3209 $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} 3210}
2368 3211
2369############################################################################# 3212#############################################################################
2370 3213
2371package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2372 3215
2373our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2374 3217
2375use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2376 3219
2377sub new { 3220sub new {
2378 my $class = shift; 3221 my $class = shift;
2379 3222
2380 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2384} 3227}
2385 3228
2386sub set_tooltip_from { 3229sub set_tooltip_from {
2387 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
2388 3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
3234
3235 my $tooltip = $widget->{tooltip};
3236
3237 if ($ENV{CFPLUS_DEBUG} & 2) {
3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3240 . "req $widget->{req_w} $widget->{req_h}\n"
3241 . "visible $widget->{visible}";
3242 }
3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2389 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2390 markup => $widget->{tooltip}, 3248 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 3250 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
3252 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 3254 );
2396} 3255}
2397 3256
2398sub size_request { 3257sub size_request {
2399 my ($self) = @_; 3258 my ($self) = @_;
… …
2401 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2402 3261
2403 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2404} 3263}
2405 3264
2406sub size_allocate { 3265sub invoke_size_allocate {
2407 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2408 3267
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3269}
3270
3271sub invoke_visibility_change {
3272 my ($self, $visible) = @_;
3273
3274 return unless $visible;
3275
3276 $self->{root}->on_post_alloc ("move_$self" => sub {
3277 my $widget = $self->{owner}
3278 or return;
3279
3280 if ($widget->{visible}) {
3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3282
3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3284 if $x + $self->{w} > $self->{root}{w};
3285
3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
3290 });
2410} 3291}
2411 3292
2412sub _draw { 3293sub _draw {
2413 my ($self) = @_; 3294 my ($self) = @_;
2414 3295
… …
2431 glVertex $w, $h; 3312 glVertex $w, $h;
2432 glVertex $w, 0; 3313 glVertex $w, 0;
2433 glEnd; 3314 glEnd;
2434 3315
2435 glTranslate 2 - 0.375, 2 - 0.375; 3316 glTranslate 2 - 0.375, 2 - 0.375;
3317
2436 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2437} 3319}
2438 3320
2439############################################################################# 3321#############################################################################
2440 3322
2441package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2442 3324
2443our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2444 3326
2445use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2446 3328
2447sub new { 3329sub new {
2448 my $class = shift; 3330 my $class = shift;
2449 3331
2450 $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
2451 aspect => 1, 3333 aspect => 1,
3334 can_events => 0,
2452 @_, 3335 @_,
2453 ) 3336 );
3337
3338 if ($self->{anim} && $self->{animspeed}) {
3339 CFPlus::weaken (my $widget = $self);
3340
3341 $self->{timer} = Event->timer (
3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3343 hard => 1,
3344 interval => $self->{animspeed},
3345 cb => sub {
3346 delete $self->{wait_face};
3347 ++$widget->{frame};
3348 $widget->update;
3349 },
3350 );
3351 }
3352
3353 $self
2454} 3354}
2455 3355
2456sub size_request { 3356sub size_request {
2457 (32, 8) 3357 (32, 8)
2458} 3358}
2459 3359
3360sub update {
3361 my ($self) = @_;
3362
3363 return unless $self->{visible};
3364
3365 $self->SUPER::update;
3366}
3367
2460sub _draw { 3368sub _draw {
2461 my ($self) = @_; 3369 my ($self) = @_;
2462 3370
2463 return unless $::CONN;#d# manage and cache textures differently 3371 return unless $::CONN;
3372
3373 $self->SUPER::_draw;
3374
3375 my $face;
3376
3377 if ($self->{frame}) {
3378 my $anim = $::CONN->{anim}[$self->{anim}];
3379
3380 $face = $anim->[ $self->{frame} % @$anim ]
3381 if $anim && @$anim;
3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3386
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
2465 3388
2466 # TODO animation
2467 if ($tex) { 3389 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 3392 glColor 0, 0, 0, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
2473 } 3399 }
3400}
3401
3402sub destroy {
3403 my ($self) = @_;
3404
3405 $self->{timer}->cancel
3406 if $self->{timer};
3407
3408 $self->SUPER::destroy;
2474} 3409}
2475 3410
2476############################################################################# 3411#############################################################################
2477 3412
2478package CFClient::UI::InventoryItem; 3413package CFPlus::UI::Buttonbar;
2479 3414
2480our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
2481 3416
2482sub new { 3417# 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 3418
2542############################################################################# 3419#############################################################################
2543 3420
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; 3421package CFPlus::UI::Menu;
2593 3422
2594our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
2595 3424
2596use CFClient::OpenGL; 3425use CFPlus::OpenGL;
2597 3426
2598sub new { 3427sub new {
2599 my $class = shift; 3428 my $class = shift;
2600 3429
2601 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
2602 items => [], 3431 items => [],
2603 z => 100, 3432 z => 100,
2604 @_, 3433 @_,
2605 ); 3434 );
2606 3435
2607 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2608 3437
2609 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
2610 my ($widget, $cb) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
2611 3440
2612 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
2613 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
2614 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
2615 can_hover => 1, 3447 can_hover => 1,
2616 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
2617 text => $widget; 3460 markup => $widget,
3461 tooltip => $tooltip;
3462 }
2618 } 3463 }
2619 3464
2620 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
2621 3466
2622 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
2634 # maybe save $GRAB? must be careful about events... 3479 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 3480 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 3481 $self->{button} = $ev->{button};
2637 3482
2638 $self->show; 3483 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3484 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640} 3485}
2641 3486
2642sub mouse_motion { 3487sub invoke_mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 3488 my ($self, $ev, $x, $y) = @_;
2644 3489
2645 # TODO: should use vbox->find_widget or so 3490 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3491 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 3492 $self->{hover} = $self->{item}{$HOVER};
2648}
2649 3493
3494 0
3495}
3496
2650sub button_up { 3497sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 3498 my ($self, $ev, $x, $y) = @_;
2652 3499
2653 if ($ev->{button} == $self->{button}) { 3500 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 3501 undef $GRAB;
2655 $self->hide; 3502 $self->hide;
2656 3503
2657 $self->emit ("popdown"); 3504 $self->emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 3505 $self->{hover}[1]->() if $self->{hover};
3506 } else {
3507 return 0
3508 }
3509
2659 } 3510 1
2660} 3511}
2661 3512
2662############################################################################# 3513#############################################################################
2663 3514
2664package CFClient::UI::Statusbox; 3515package CFPlus::UI::Multiplexer;
2665 3516
3517our @ISA = CFPlus::UI::Container::;
3518
3519sub new {
3520 my $class = shift;
3521
3522 my $self = $class->SUPER::new (
3523 @_,
3524 );
3525
3526 $self->{current} = $self->{children}[0]
3527 if @{ $self->{children} };
3528
3529 $self
3530}
3531
3532sub add {
3533 my ($self, @widgets) = @_;
3534
3535 $self->SUPER::add (@widgets);
3536
3537 $self->{current} = $self->{children}[0]
3538 if @{ $self->{children} };
3539}
3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3547sub set_current_page {
3548 my ($self, $page_or_widget) = @_;
3549
3550 my $widget = ref $page_or_widget
3551 ? $page_or_widget
3552 : $self->{children}[$page_or_widget];
3553
3554 $self->{current} = $widget;
3555 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3556
3557 $self->emit (page_changed => $self->{current});
3558
3559 $self->realloc;
3560}
3561
3562sub visible_children {
3563 $_[0]{current}
3564}
3565
3566sub size_request {
3567 my ($self) = @_;
3568
3569 $self->{current}->size_request
3570}
3571
3572sub invoke_size_allocate {
3573 my ($self, $w, $h) = @_;
3574
3575 $self->{current}->configure (0, 0, $w, $h);
3576
3577 1
3578}
3579
3580sub _draw {
3581 my ($self) = @_;
3582
3583 $self->{current}->draw;
3584}
3585
3586#############################################################################
3587
3588package CFPlus::UI::Notebook;
3589
2666our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3591
3592sub new {
3593 my $class = shift;
3594
3595 my $self = $class->SUPER::new (
3596 buttonbar => (new CFPlus::UI::Buttonbar),
3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3598 # filter => # will be put between multiplexer and $self
3599 @_,
3600 );
3601
3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3603 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3604
3605 $self
3606}
3607
3608sub add {
3609 my ($self, $title, $widget, $tooltip) = @_;
3610
3611 CFPlus::weaken $self;
3612
3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3614 markup => $title,
3615 tooltip => $tooltip,
3616 on_activate => sub { $self->set_current_page ($widget) },
3617 );
3618
3619 $self->{multiplexer}->add ($widget);
3620}
3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3628sub set_current_page {
3629 my ($self, $page) = @_;
3630
3631 $self->{multiplexer}->set_current_page ($page);
3632 $self->emit (page_changed => $self->{multiplexer}{current});
3633}
3634
3635#############################################################################
3636
3637package CFPlus::UI::Selector;
3638
3639use utf8;
3640
3641our @ISA = CFPlus::UI::Button::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 options => [], # [value, title, longdesc], ...
3648 value => undef,
3649 @_,
3650 );
3651
3652 $self->_set_value ($self->{value});
3653
3654 $self
3655}
3656
3657sub invoke_button_down {
3658 my ($self, $ev) = @_;
3659
3660 my @menu_items;
3661
3662 for (@{ $self->{options} }) {
3663 my ($value, $title, $tooltip) = @$_;
3664
3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3666 }
3667
3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3669}
3670
3671sub _set_value {
3672 my ($self, $value) = @_;
3673
3674 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3675 or return;
3676
3677 $self->{value} = $item->[0];
3678 $self->set_markup ("$item->[1] ⇓");
3679 $self->set_tooltip ($item->[2]);
3680}
3681
3682sub set_value {
3683 my ($self, $value) = @_;
3684
3685 return unless $self->{value} ne $value;
3686
3687 $self->_set_value ($value);
3688 $self->emit (changed => $value);
3689}
3690
3691#############################################################################
3692
3693package CFPlus::UI::Statusbox;
3694
3695our @ISA = CFPlus::UI::VBox::;
3696
3697sub new {
3698 my $class = shift;
3699
3700 my $self = $class->SUPER::new (
3701 fontsize => 0.8,
3702 @_,
3703 );
3704
3705 CFPlus::weaken (my $this = $self);
3706
3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3708
3709 $self
3710}
2667 3711
2668sub reorder { 3712sub reorder {
2669 my ($self) = @_; 3713 my ($self) = @_;
2670 my $NOW = time; 3714 my $NOW = Time::HiRes::time;
3715
3716 # freeze display when hovering over any label
3717 return if $CFPlus::UI::TOOLTIP->{owner}
3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3719 values %{ $self->{item} };
2671 3720
2672 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 } 3723 }
2675 3724
… …
2678 my @items = sort { 3727 my @items = sort {
2679 $a->{pri} <=> $b->{pri} 3728 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id} 3729 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} }; 3730 } values %{ $self->{item} };
2682 3731
3732 $self->{timer}->interval (1);
3733
2683 my $count = 10 + 1; 3734 my $count = 10 + 1;
2684 for my $item (@items) { 3735 for my $item (@items) {
2685 last unless --$count; 3736 last unless --$count;
2686 3737
2687 push @widgets, $item->{label} ||= do { 3738 my $label = $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all) 3739 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1 3740 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}" 3741 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 3742 : $item->{text};
2692 3743
2693 for ($short) { 3744 for ($short) {
2694 s/^\s+//; 3745 s/^\s+//;
2695 s/\012.*/…/s; 3746 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 3747 }
2699 3748
2700 new CFClient::UI::Label 3749 new CFPlus::UI::Label
2701 markup => $short, 3750 markup => $short,
2702 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
2706 color => $item->{color}, 3755 max_w => $::WIDTH * 0.44,
3756 fg => [@{ $item->{fg} }],
2707 can_events => 1, 3757 can_events => 1,
2708 can_hover => 1 3758 can_hover => 1
2709 }; 3759 };
3760
3761 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3762 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3763 $label->update;
3764 $label->set_max_size (undef, $label->{req_h} * $diff)
3765 if $diff < 1;
3766 $self->{timer}->interval (1/30);
3767 } else {
3768 $label->{fg}[3] = $item->{fg}[3] || 1;
3769 }
3770
3771 push @widgets, $label;
2710 } 3772 }
2711 3773
2712 $self->clear; 3774 $self->clear;
2713 $self->SUPER::add (reverse @widgets); 3775 $self->SUPER::add (reverse @widgets);
2714} 3776}
… …
2717 my ($self, $text, %arg) = @_; 3779 my ($self, $text, %arg) = @_;
2718 3780
2719 $text =~ s/^\s+//; 3781 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3782 $text =~ s/\s+$//;
2721 3783
3784 return unless $text;
3785
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3786 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2723 3787
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3788 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3789
2726 if (my $item = $self->{item}{$group}) { 3790 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) { 3791 if ($item->{text} eq $text) {
2728 $item->{count}++; 3792 $item->{count}++;
2729 } else { 3793 } else {
2730 $item->{count} = 1; 3794 $item->{count} = 1;
2731 $item->{text} = $item->{tooltip} = $text; 3795 $item->{text} = $item->{tooltip} = $text;
2732 } 3796 }
2733 $item->{id} = ++$self->{id}; 3797 $item->{id} += 0.2;#d#
2734 $item->{timeout} = $timeout; 3798 $item->{timeout} = $timeout;
2735 delete $item->{label}; 3799 delete $item->{label};
2736 } else { 3800 } else {
2737 $self->{item}{$group} = { 3801 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3802 id => ++$self->{id},
2739 text => $text, 3803 text => $text,
2740 timeout => $timeout, 3804 timeout => $timeout,
2741 tooltip => $text, 3805 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3806 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3807 pri => 0,
2745 count => 1, 3808 count => 1,
2746 %arg, 3809 %arg,
2747 }; 3810 };
2748 } 3811 }
2749 3812
3813 $ROOT->on_refresh (reorder => sub {
3814 $self->reorder;
3815 });
3816}
3817
3818sub reconfigure {
3819 my ($self) = @_;
3820
3821 delete $_->{label}
3822 for values %{ $self->{item} || {} };
3823
2750 $self->reorder; 3824 $self->reorder;
3825 $self->SUPER::reconfigure;
3826}
3827
3828sub destroy {
3829 my ($self) = @_;
3830
3831 $self->{timer}->cancel;
3832
3833 $self->SUPER::destroy;
2751} 3834}
2752 3835
2753############################################################################# 3836#############################################################################
2754 3837
2755package CFClient::UI::Root; 3838package CFPlus::UI::Root;
2756 3839
2757our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
2758 3841
3842use List::Util qw(min max);
3843
2759use CFClient::OpenGL; 3844use CFPlus::OpenGL;
2760 3845
2761sub new { 3846sub new {
2762 my $class = shift; 3847 my $class = shift;
2763 3848
2764 $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3850 visible => 1,
2765 @_, 3851 @_,
2766 ) 3852 );
2767}
2768 3853
2769sub configure { 3854 CFPlus::weaken ($self->{root} = $self);
2770 my ($self, $x, $y, $w, $h) = @_;
2771 3855
2772 $self->{w} = $w; 3856 $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} 3857}
2782 3858
2783sub size_request { 3859sub size_request {
2784 my ($self) = @_; 3860 my ($self) = @_;
2785 3861
2786 ($self->{w}, $self->{h}) 3862 ($self->{w}, $self->{h})
2787} 3863}
2788 3864
3865sub _to_pixel {
3866 my ($coord, $size, $max) = @_;
3867
3868 $coord =
3869 $coord eq "center" ? ($max - $size) * 0.5
3870 : $coord eq "max" ? $max
3871 : $coord;
3872
3873 $coord = 0 if $coord < 0;
3874 $coord = $max - $size if $coord > $max - $size;
3875
3876 int $coord + 0.5
3877}
3878
2789sub size_allocate { 3879sub invoke_size_allocate {
2790 my ($self, $w, $h) = @_; 3880 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 3881
2798 for my $child ($self->children) { 3882 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3883 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3884
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3885 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3886 $Y = $child->{force_y} if exists $child->{force_y};
3887
3888 $X = _to_pixel $X, $W, $self->{w};
3889 $Y = _to_pixel $Y, $H, $self->{h};
3890
2803 $child->configure ($X, $Y, $W, $H); 3891 $child->configure ($X, $Y, $W, $H);
2804 } 3892 }
3893
3894 1
2805} 3895}
2806 3896
2807sub coord2local { 3897sub coord2local {
2808 my ($self, $x, $y) = @_; 3898 my ($self, $x, $y) = @_;
2809 3899
… …
2817} 3907}
2818 3908
2819sub update { 3909sub update {
2820 my ($self) = @_; 3910 my ($self) = @_;
2821 3911
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3912 $::WANT_REFRESH++;
2824} 3913}
2825 3914
2826sub add { 3915sub add {
2827 my ($self, @children) = @_; 3916 my ($self, @children) = @_;
2828 3917
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3918 $_->{is_toplevel} = 1
2831 3919 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3920
2837 $self->SUPER::add (@children); 3921 $self->SUPER::add (@children);
3922}
3923
3924sub remove {
3925 my ($self, @children) = @_;
3926
3927 $self->SUPER::remove (@children);
3928
3929 delete $self->{is_toplevel}
3930 for @children;
3931
3932 while (@children) {
3933 my $w = pop @children;
3934 push @children, $w->children;
3935 $w->set_invisible;
3936 }
2838} 3937}
2839 3938
2840sub on_refresh { 3939sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3940 my ($self, $id, $cb) = @_;
2842 3941
… …
2855 while ($self->{refresh_hook}) { 3954 while ($self->{refresh_hook}) {
2856 $_->() 3955 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3956 for values %{delete $self->{refresh_hook}};
2858 } 3957 }
2859 3958
2860 if ($self->{check_size}) { 3959 if ($self->{realloc}) {
2861 my @queue = ([], []); 3960 my %queue;
3961 my @queue;
3962 my $widget;
2862 3963
2863 for (;;) { 3964 outer:
2864 if ($self->{check_size}) { 3965 while () {
2865 # heuristic: check containers last 3966 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3967 for $widget (values %$realloc) {
2867 for values %{delete $self->{check_size}} 3968 $widget->{visible} or next; # do not resize invisible widgets
3969
3970 $queue{$widget+0}++ and next; # duplicates are common
3971
3972 push @{ $queue[$widget->{visible}] }, $widget;
3973 }
2868 } 3974 }
2869 3975
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3976 while () {
3977 @queue or last outer;
2871 3978
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3979 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3980 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 3981
3982 pop @queue;
3983 }
3984
3985 delete $queue{$widget+0};
3986
3987 my ($w, $h) = $widget->size_request;
3988
3989 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3990 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3991
3992 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3993 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3994
3995 $w = $widget->{force_w} if exists $widget->{force_w};
3996 $h = $widget->{force_h} if exists $widget->{force_h};
3997
3998 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3999 || delete $widget->{force_realloc}) {
2880 $widget->{req_w} = $w; 4000 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 4001 $widget->{req_h} = $h;
2882 4002
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4003 $self->{size_alloc}{$widget+0} = $widget;
2884 4004
2885 $widget->{parent}->check_size
2886 if $widget->{parent}; 4005 if (my $parent = $widget->{parent}) {
4006 $self->{realloc}{$parent+0} = $parent
4007 unless $queue{$parent+0};
4008
4009 $parent->{force_size_alloc} = 1;
4010 $self->{size_alloc}{$parent+0} = $parent;
4011 }
2887 } 4012 }
4013
4014 delete $self->{realloc}{$widget+0};
2888 } 4015 }
2889 } 4016 }
2890 4017
2891 while ($self->{size_alloc}) { 4018 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 4019 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 my ($widget, $w, $h) = @$_; 4020 values %$size_alloc;
4021
4022 while () {
4023 my $widget = pop @queue || last;
4024
4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894 4026
2895 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
2897 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
4039 $w = int $w + 0.5;
4040 $h = int $h + 0.5;
4041
4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4043 $widget->{old_w} = $widget->{w};
4044 $widget->{old_h} = $widget->{h};
4045
2898 $widget->{w} = $w; 4046 $widget->{w} = $w;
2899 $widget->{h} = $h; 4047 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 4048
2901 $widget->emit (size_allocate => $w, $h); 4049 $widget->emit (size_allocate => $w, $h);
4050 }
2902 } 4051 }
2903 } 4052 }
2904 4053
2905 while ($self->{post_alloc_hook}) { 4054 while ($self->{post_alloc_hook}) {
2906 $_->() 4055 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 4056 for values %{delete $self->{post_alloc_hook}};
2908 } 4057 }
2909 4058
4059
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4060 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4061 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 4062 glClear GL_COLOR_BUFFER_BIT;
2913 4063
2914 glMatrixMode GL_PROJECTION; 4064 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 4065 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 4068 glLoadIdentity;
2919 4069
4070 {
4071 package CFPlus::UI::Base;
4072
4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4074 (0, 0, $self->{w}, $self->{h});
4075
2920 $self->_draw; 4076 $self->_draw;
4077 }
2921} 4078}
2922 4079
2923############################################################################# 4080#############################################################################
2924 4081
2925package CFClient::UI; 4082package CFPlus::UI;
2926 4083
2927$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2929 4086
29301 40871
2931 4088

Diff Legend

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