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.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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