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

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

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

Diff Legend

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