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

Diff Legend

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