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.53 by root, Mon Apr 10 11:56:28 2006 UTC vs.
Revision 1.168 by elmex, Mon Apr 24 08:50:38 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
13our $TOOLTIP;
15our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
16 41
17# class methods for events 42# class methods for events
18sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
20} 46}
21 47
22sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
24} 51}
25 52
26sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
27 my ($ev) = @_; 54 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
29 56
30 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
32 59
33 $GRAB = $widget; 60 $GRAB = $widget;
34 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
35 }
36 62
63 check_tooltip;
64 }
65
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
38 67
39 $GRAB->button_down ($ev) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
40} 72}
41 73
42sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
43 my ($ev) = @_; 75 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
45 77
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 79
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81
82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
60 99
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 101
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
71} 115}
116
117# convert position array to integers
118sub harmonize {
119 my ($vals) = @_;
120
121 my $rem = 0;
122
123 for (@$vals) {
124 my $i = int $_ + $rem;
125 $rem += $_ - $i;
126 $_ = $i;
127 }
128}
129
130#############################################################################
131
132package CFClient::UI::Base;
133
134use strict;
135
136use CFClient::OpenGL;
72 137
73sub new { 138sub new {
74 my $class = shift; 139 my $class = shift;
75 140
76 bless { @_ }, $class 141 my $self = bless {
142 x => 0,
143 y => 0,
144 z => 0,
145 can_events => 1,
146 @_
147 }, $class;
148
149 for (keys %$self) {
150 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_});
152 }
153 }
154
155 $self
156}
157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
77} 181}
78 182
79sub move { 183sub move {
80 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
81 $self->{x} = $x; 186 $self->{x} = int $x;
82 $self->{y} = $y; 187 $self->{y} = int $y;
83 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
84}
85 189
86sub needs_redraw { 190 $self->update;
87 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
88} 200}
89 201
90sub size_request { 202sub size_request {
91 require Carp; 203 require Carp;
92 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
205}
206
207sub configure {
208 my ($self, $x, $y, $w, $h) = @_;
209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
223 $self->{x} = $x;
224 $self->{y} = $y;
225 $self->update;
226 }
227
228 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w;
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 }
93} 235}
94 236
95sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub set_max_size {
96 my ($self, $w, $h) = @_; 242 my ($self, $w, $h) = @_;
97 243
98 $self->{w} = $w; 244 delete $self->{max_w}; $self->{max_w} = $w if $w;
99 $self->{h} = $h; 245 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253}
254
255# translate global coordinates to local coordinate system
256sub coord2local {
257 my ($self, $x, $y) = @_;
258
259 my ($X, $Y) = $self->_topleft;
260 ($x - $X, $y - $Y)
261}
262
263# translate local coordinates to global coordinate system
264sub coord2global {
265 my ($self, $x, $y) = @_;
266
267 my ($X, $Y) = $self->_topleft;
268 ($x + $X, $y + $Y)
100} 269}
101 270
102sub focus_in { 271sub focus_in {
103 my ($self) = @_; 272 my ($self) = @_;
104 273
274 return if $FOCUS == $self;
275 return unless $self->{can_focus};
276
105 my $focus = $FOCUS; $FOCUS = $self; 277 my $focus = $FOCUS; $FOCUS = $self;
278
279 $self->emit (focus_in => $focus);
280
106 $focus->update if $focus; 281 $focus->update if $focus;
107 $FOCUS->update; 282 $FOCUS->update;
108} 283}
109 284
110sub focus_out { 285sub focus_out {
111 my ($self) = @_; 286 my ($self) = @_;
112 287
113 return unless $FOCUS == $self; 288 return unless $FOCUS == $self;
114 289
115 my $focus = $FOCUS; undef $FOCUS; 290 my $focus = $FOCUS; undef $FOCUS;
291
292 $self->emit (focus_out => $focus);
293
116 $focus->update if $focus; #? 294 $focus->update if $focus; #?
117} 295}
118 296
119sub mouse_motion { } 297sub mouse_motion { }
120sub button_up { } 298sub button_up { }
121sub button_down { }
122sub key_down { } 299sub key_down { }
123sub key_up { } 300sub key_up { }
301
302sub button_down {
303 my ($self, $ev, $x, $y) = @_;
304
305 $self->focus_in;
306}
124 307
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 312sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 313
131sub draw { 314sub draw {
132 my ($self) = @_; 315 my ($self) = @_;
133 316
317 return unless $self->{h} && $self->{w};
318
134 glPushMatrix; 319 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 320 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 321 $self->_draw;
137 if ($self == $HOVER) { 322 glPopMatrix;
138 glColor 1, 1, 1, 0.4; 323
324 if ($self == $HOVER && $self->{can_hover}) {
325 my ($x, $y) = @$self{qw(x y)};
326
327 glColor 1, 0.8, 0.5, 0.2;
139 glEnable GL_BLEND; 328 glEnable GL_BLEND;
329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 330 glBegin GL_QUADS;
331 glVertex $x , $y;
332 glVertex $x + $self->{w}, $y;
333 glVertex $x + $self->{w}, $y + $self->{h};
334 glVertex $x , $y + $self->{h};
335 glEnd;
336 glDisable GL_BLEND;
337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
141 glVertex 0 , 0; 344 glVertex 0 , 0;
142 glVertex $self->{w}, 0; 345 glVertex $self->{w}, 0;
143 glVertex $self->{w}, $self->{h}; 346 glVertex $self->{w}, $self->{h};
144 glVertex 0 , $self->{h}; 347 glVertex 0 , $self->{h};
145 glEnd; 348 glEnd;
146 glDisable GL_BLEND;
147 }
148 glPopMatrix; 349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
149} 352}
150 353
151sub _draw { 354sub _draw {
152 my ($self) = @_; 355 my ($self) = @_;
153 356
154 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 358}
167 359
168sub find_widget { 360sub find_widget {
169 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
170 364
171 return $self 365 return $self
172 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 368
175 () 369 ()
176} 370}
177 371
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 372sub set_parent {
181 my ($self, $par) = @_; 373 my ($self, $parent) = @_;
182 374
183 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 375 Scalar::Util::weaken ($self->{parent} = $parent);
185} 376}
186 377
187sub get_parent { 378sub check_size {
379 my ($self) = @_;
380
188 $_[0]->{parent} 381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
189} 402}
190 403
191sub update { 404sub update {
192 my ($self) = @_; 405 my ($self) = @_;
193 406
194 $self->{parent}->update 407 $self->{parent}->update
195 if $self->{parent}; 408 if $self->{parent};
196} 409}
197 410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
198sub DESTROY { 423sub DESTROY {
199 my ($self) = @_; 424 my ($self) = @_;
200 425
201 #$self->deactivate; 426 #$self->deactivate;
202} 427}
203 428
204############################################################################# 429#############################################################################
205 430
206package Crossfire::Client::Widget::Container; 431package CFClient::UI::DrawBG;
207 432
208our @ISA = Crossfire::Client::Widget::; 433our @ISA = CFClient::UI::Base::;
434
435use strict;
436use CFClient::OpenGL;
209 437
210sub new { 438sub new {
439 my $class = shift;
440
441 # range [value, low, high, page]
442
443 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5],
446 @_
447 )
448}
449
450sub _draw {
451 my ($self) = @_;
452
453 my ($w, $h) = @$self{qw(w h)};
454
455 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
458
459 glBegin GL_QUADS;
460 glVertex 0 , 0;
461 glVertex 0 , $h;
462 glVertex $w, $h;
463 glVertex $w, 0;
464 glEnd;
465
466 glDisable GL_BLEND;
467}
468
469#############################################################################
470
471package CFClient::UI::Empty;
472
473our @ISA = CFClient::UI::Base::;
474
475sub new {
211 my ($class, @widgets) = @_; 476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
212 479
480sub size_request {
481 (0, 0)
482}
483
484sub draw { }
485
486#############################################################################
487
488package CFClient::UI::Container;
489
490our @ISA = CFClient::UI::Base::;
491
492sub new {
493 my ($class, %arg) = @_;
494
495 my $children = delete $arg{children} || [];
496
213 my $self = $class->SUPER::new (children => []); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
214 $self->add ($_) for @widgets; 502 $self->add ($_) for @$children;
215 503
216 $self 504 $self
217} 505}
218 506
219sub add { 507sub add {
220 my ($self, $chld, $expand) = @_; 508 my ($self, $child) = @_;
221 509
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 510 $child->set_parent ($self);
224 511
512 use sort 'stable';
513
225 @{$self->{children}} = 514 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 515 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 516 @{$self->{children}}, $child
517 ];
228 518
229 $self->size_allocate ($self->{w}, $self->{h}) 519 $child->check_size;
230 if $self->{w}; #TODO: check for "realised state"
231} 520}
232 521
233sub remove { 522sub remove {
234 my ($self, $widget) = @_; 523 my ($self, $child) = @_;
235 524
525 delete $child->{parent};
526 $child->hide;
527
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
237 529
238 $self->size_allocate ($self->{w}, $self->{h}); 530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
239} 544}
240 545
241sub find_widget { 546sub find_widget {
242 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
243 548
… …
260 $_->draw for @{$self->{children}}; 565 $_->draw for @{$self->{children}};
261} 566}
262 567
263############################################################################# 568#############################################################################
264 569
265package Crossfire::Client::Widget::Bin; 570package CFClient::UI::Bin;
266 571
267our @ISA = Crossfire::Client::Widget::Container::; 572our @ISA = CFClient::UI::Container::;
573
574sub new {
575 my ($class, %arg) = @_;
576
577 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
578
579 $class->SUPER::new (children => [$child], %arg)
580}
581
582sub add {
583 my ($self, $child) = @_;
584
585 $self->{children} = [];
586
587 $self->SUPER::add ($child);
588}
589
590sub remove {
591 my ($self, $widget) = @_;
592
593 $self->SUPER::remove ($widget);
594
595 $self->{children} = [new CFClient::UI::Empty]
596 unless @{$self->{children}};
597}
268 598
269sub child { $_[0]->{children}[0] } 599sub child { $_[0]->{children}[0] }
270 600
271sub size_request { 601sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 602 $_[0]{children}[0]->size_request
273} 603}
274 604
275sub size_allocate { 605sub size_allocate {
276 my ($self, $w, $h) = @_; 606 my ($self, $w, $h) = @_;
277 607
278 $self->SUPER::size_allocate ($w, $h); 608 $self->{children}[0]->configure (0, 0, $w, $h);
279 $self->{children}[0]->size_allocate ($w, $h)
280 if $self->{children}[0]
281} 609}
282 610
283############################################################################# 611#############################################################################
284 612
285package Crossfire::Client::Widget::Window; 613package CFClient::UI::Window;
286 614
287our @ISA = Crossfire::Client::Widget::Bin::; 615our @ISA = CFClient::UI::Bin::;
288 616
289use SDL::OpenGL; 617use CFClient::OpenGL;
290 618
291sub new { 619sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 620 my ($class, %arg) = @_;
293 621
294 my $self = $class->SUPER::new; 622 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 623}
298 624
299sub update { 625sub update {
300 my ($self) = @_; 626 my ($self) = @_;
301 627
628 # we want to do this delayed...
302 $self->render_chld; 629 $self->render_chld;
303 $self->SUPER::update; 630 $self->SUPER::update;
304} 631}
305 632
306sub render_chld { 633sub render_chld {
307 my ($self) = @_; 634 my ($self) = @_;
308 635
309 $self->{texture} = 636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
310 Crossfire::Client::Texture->new_from_opengl ( 637 glClearColor 0, 0, 0, 1;
311 $self->{w}, $self->{h}, sub { $self->child->draw } 638 glClear GL_COLOR_BUFFER_BIT;
312 ); 639 $self->child->draw;
640 };
313} 641}
314 642
315sub size_allocate { 643sub size_allocate {
316 my ($self, $w, $h) = @_; 644 my ($self, $w, $h) = @_;
317 645
318 $self->{w} = $w; 646 $self->child->configure (0, 0, $w, $h);
319 $self->{h} = $h;
320
321 $self->child->size_allocate ($w, $h);
322 647
323 $self->render_chld; 648 $self->render_chld;
324} 649}
325 650
326sub _draw { 651sub _draw {
… …
330 655
331 my $tex = $self->{texture} 656 my $tex = $self->{texture}
332 or return; 657 or return;
333 658
334 glEnable GL_BLEND; 659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 661 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 glBindTexture GL_TEXTURE_2D, $tex->{name};
338 663
339 glBegin GL_QUADS; 664 $tex->draw_quad (0, 0, $w, $h);
340 glTexCoord 0, 0; glVertex 0, 0;
341 glTexCoord 0, 1; glVertex 0, $h;
342 glTexCoord 1, 1; glVertex $w, $h;
343 glTexCoord 1, 0; glVertex $w, 0;
344 glEnd;
345 665
346 glDisable GL_BLEND; 666 glDisable GL_BLEND;
347 glDisable GL_TEXTURE_2D; 667 glDisable GL_TEXTURE_2D;
348} 668}
349 669
350############################################################################# 670#############################################################################
351 671
352package Crossfire::Client::Widget::Frame; 672package CFClient::UI::ViewPort;
353 673
354our @ISA = Crossfire::Client::Widget::Bin::; 674our @ISA = CFClient::UI::Window::;
355 675
356use SDL::OpenGL; 676sub new { die }
357 677
358sub size_request { 678sub size_request {
359 my ($self) = @_; 679 my ($self) = @_;
360 my $chld = $self->child
361 or return (0, 0);
362 680
363 $chld->move (2, 2); 681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
364 683
365 map { $_ + 4 } $chld->size_request; 684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701
702sub new {
703 my $class = shift;
704
705 my $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1],
707 border_bg => [1, 1, 1, 1],
708 border => 0.8,
709 @_
710 );
711
712 $self
713}
714
715sub _draw {
716 my ($self) = @_;
717
718 my ($w, $h) = ($self->{w}, $self->{h});
719
720 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737}
738
739#############################################################################
740
741package CFClient::UI::FancyFrame;
742
743our @ISA = CFClient::UI::Bin::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750
751sub new {
752 my $class = shift;
753
754 # TODO: user_x, user_y, overwrite moveto?
755
756 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1],
759 border => 0.8,
760 can_events => 1,
761 @_
762 );
763
764 $self->{title} &&= new CFClient::UI::Label
765 align => 0,
766 valign => 1,
767 text => $self->{title},
768 fontsize => 1;
769
770 $self
771}
772
773sub border {
774 int $_[0]{border} * $::FONTSIZE
775}
776
777sub size_request {
778 my ($self) = @_;
779
780 my ($w, $h) = $self->SUPER::size_request;
781
782 (
783 $w + $self->border * 2,
784 $h + $self->border * 2,
785 )
366} 786}
367 787
368sub size_allocate { 788sub size_allocate {
369 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
790
791 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2;
793
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
797 $self->child->configure ($self->border, $self->border, $w, $h);
798}
799
800sub button_down {
801 my ($self, $ev, $x, $y) = @_;
802
803 my $border = $self->border;
804
805 if ($x < $self->{w} && $x >= $self->{w} - $border
806 && $y < $self->{h} && $y >= $self->{h} - $border) {
807
808 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h});
810
811 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_;
813
814 ($x, $y) = ($ev->{x}, $ev->{y});
815
816 $self->{user_w} = $bw + $x - $ox;
817 $self->{user_h} = $bh + $y - $oy;
818 $self->check_size;
819 };
820
821 } elsif ($x >= 0 && $x < $self->{w}
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y});
826
827 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_;
829
830 ($x, $y) = ($ev->{x}, $ev->{y});
831
832 $self->move ($bx + $x - $ox, $by + $y - $oy);
833 $self->update;
834 };
835 }
836}
837
838sub button_up {
839 my ($self, $ev, $x, $y) = @_;
840
841 delete $self->{motion};
842}
843
844sub mouse_motion {
845 my ($self, $ev, $x, $y) = @_;
846
847 $self->{motion}->($ev, $x, $y) if $self->{motion};
848}
849
850sub _draw {
851 my ($self) = @_;
852
853 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860
861 my $border = $self->border;
862
863 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border);
868
869 my $bg = $tex[0];
870
871 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h};
874
875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch);
881
882 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884
885 $self->{title}->draw if $self->{title};
886 $self->child->draw;
887}
888
889#############################################################################
890
891package CFClient::UI::Table;
892
893our @ISA = CFClient::UI::Base::;
894
895use List::Util qw(max sum);
896
897use CFClient::OpenGL;
898
899sub new {
900 my $class = shift;
901
902 $class->SUPER::new (
903 col_expand => [],
904 @_
905 )
906}
907
908sub add {
909 my ($self, $x, $y, $child) = @_;
910
911 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child;
913
914 $child->check_size;
915}
916
917# TODO: move to container class maybe? send childs a signal on removal?
918sub clear {
919 my ($self) = @_;
920
921 my $children = delete $self->{children};
370 922
371 $self->{w} = $w; 923 for (grep $_, map @$_, grep $_, @$children) {
372 $self->{h} = $h; 924 delete $_->{parent};
925 $_->hide;
926 }
373 927
374 $self->child->size_allocate ($w - 4, $h - 4); 928 $self->update;
375 $self->child->move (2, 2);
376} 929}
377 930
378sub _draw { 931sub get_wh {
379 my ($self) = @_; 932 my ($self) = @_;
380 933
381 my $chld = $self->child; 934 my (@w, @h);
382 935
383 my ($w, $h) = $chld->size_request; 936 for my $y (0 .. $#{$self->{children}}) {
937 my $row = $self->{children}[$y]
938 or next;
384 939
385 glBegin GL_QUADS; 940 for my $x (0 .. $#$row) {
386 glColor 0, 0, 0; 941 my $widget = $row->[$x]
387 glTexCoord 0, 0; glVertex 0 , 0; 942 or next;
388 glTexCoord 0, 1; glVertex 0 , $h + 4; 943 my ($w, $h) = @$widget{qw(req_w req_h)};
389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
390 glTexCoord 1, 0; glVertex $w + 4 , 0;
391 glEnd;
392 944
393 $chld->draw; 945 $w[$x] = max $w[$x], $w;
394} 946 $h[$y] = max $h[$y], $h;
947 }
948 }
395 949
396############################################################################# 950 (\@w, \@h)
397 951}
398package Crossfire::Client::Widget::FancyFrame;
399
400our @ISA = Crossfire::Client::Widget::Bin::;
401
402use SDL::OpenGL;
403
404my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407 952
408sub size_request { 953sub size_request {
409 my ($self) = @_; 954 my ($self) = @_;
410 955
411 my ($w, $h) = $self->SUPER::size_request; 956 my ($ws, $hs) = $self->get_wh;
412 957
413 $h += $tex[1]->{height}; 958 (
414 $h += $tex[4]->{height}; 959 (sum @$ws),
415 $w += $tex[2]->{width}; 960 (sum @$hs),
416 $w += $tex[3]->{width}; 961 )
417
418 ($w, $h)
419} 962}
420 963
421sub size_allocate { 964sub size_allocate {
422 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
423 966
424 $self->SUPER::size_allocate ($w, $h); 967 my ($ws, $hs) = $self->get_wh;
425 968
426 $h -= $tex[1]->{height}; 969 my $req_w = sum @$ws;
427 $h -= $tex[4]->{height}; 970 my $req_h = sum @$hs;
428 $w -= $tex[2]->{width};
429 $w -= $tex[3]->{width};
430 971
431 $h = $h < 0 ? 0 : $h; 972 # TODO: nicer code && do row_expand
432 $w = $w < 0 ? 0 : $w; 973 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1;
433 976
434 $self->child->size_allocate ($w, $h); 977 # linearly scale sizes
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 978 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
979 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
980
981 CFClient::UI::harmonize $ws;
982 CFClient::UI::harmonize $hs;
983
984 my $y;
985
986 for my $r (0 .. $#{$self->{children}}) {
987 my $row = $self->{children}[$r]
988 or next;
989
990 my $x = 0;
991 my $row_h = $hs->[$r];
992
993 for my $c (0 .. $#$row) {
994 my $col_w = $ws->[$c];
995
996 if (my $widget = $row->[$c]) {
997 $widget->configure ($x, $y, $col_w, $row_h);
998 }
999
1000 $x += $col_w;
1001 }
1002
1003 $y += $row_h;
1004 }
1005
1006}
1007
1008sub find_widget {
1009 my ($self, $x, $y) = @_;
1010
1011 $x -= $self->{x};
1012 $y -= $self->{y};
1013
1014 my $res;
1015
1016 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1017 $res = $_->find_widget ($x, $y)
1018 and return $res;
1019 }
1020
1021 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
436} 1022}
437 1023
438sub _draw { 1024sub _draw {
439 my ($self) = @_; 1025 my ($self) = @_;
440 1026
441 my ($w, $h) = ($self->{w}, $self->{h}); 1027 for (grep $_, @{$self->{children}}) {
442 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1028 $_->draw for grep $_, @$_;
443 1029 }
444 glEnable GL_BLEND;
445 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
448
449 my $top = $tex[1];
450 glBindTexture GL_TEXTURE_2D, $top->{name};
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , 0;
454 glTexCoord 0, 1; glVertex 0 , $top->{height};
455 glTexCoord 1, 1; glVertex $w , $top->{height};
456 glTexCoord 1, 0; glVertex $w , 0;
457 glEnd;
458
459 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name};
461
462 glBegin GL_QUADS;
463 glTexCoord 0, 0; glVertex 0 , $top->{height};
464 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467 glEnd;
468
469 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name};
471
472 glBegin GL_QUADS;
473 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476 glTexCoord 1, 0; glVertex $w , $top->{height};
477 glEnd;
478
479 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name};
481
482 glBegin GL_QUADS;
483 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484 glTexCoord 0, 1; glVertex 0 , $h;
485 glTexCoord 1, 1; glVertex $w , $h;
486 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487 glEnd;
488
489 my $bg = $tex[0];
490 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494
495 my $rep_x = $cw / $bg->{width};
496 my $rep_y = $ch / $bg->{height};
497
498 glBegin GL_QUADS;
499 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
500 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503 glEnd;
504
505 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D;
507
508 $self->child->draw;
509
510} 1030}
511 1031
512############################################################################# 1032#############################################################################
513 1033
514package Crossfire::Client::Widget::Table; 1034package CFClient::UI::HBox;
515 1035
516our @ISA = Crossfire::Client::Widget::Bin::; 1036# TODO: wrap into common Box base class
517 1037
518use SDL::OpenGL; 1038our @ISA = CFClient::UI::Container::;
519 1039
520sub add { 1040sub size_request {
521 my ($self, $x, $y, $chld) = @_; 1041 my ($self) = @_;
522 my $old_chld = $self->{children}[$y][$x];
523 1042
524 $self->{children}[$y][$x] = $chld; 1043 my @alloc = map [$_->size_request], @{$self->{children}};
525 $chld->set_parent ($self);
526 $self->update;
527}
528 1044
529sub max_row_height { 1045 (
1046 (List::Util::sum map $_->[0], @alloc),
1047 (List::Util::max map $_->[1], @alloc),
1048 )
1049}
1050
1051sub size_allocate {
530 my ($self, $row) = @_; 1052 my ($self, $w, $h) = @_;
531 1053
532 my $hs = 0; 1054 ($h, $w) = ($w, $h);
533 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 1055
534 my $c = $self->{children}->[$row]->[$xi]; 1056 my $children = $self->{children};
535 if ($c) { 1057
536 my ($w, $h) = $c->size_request; 1058 my @h = map $_->{req_w}, @$children;
537 if ($hs < $h) { $hs = $h } 1059
1060 my $req_h = List::Util::sum @h;
1061
1062 if ($req_h > $h) {
1063 # ah well, not enough space
1064 $_ *= $h / $req_h for @h;
1065 } else {
1066 my $exp = List::Util::sum map $_->{expand}, @$children;
1067 $exp ||= 1;
1068
1069 for (0 .. $#$children) {
1070 my $child = $children->[$_];
1071
1072 my $alloc_h = $h[$_];
1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074 $h[$_] = $alloc_h;
538 } 1075 }
539 } 1076 }
540 return $hs;
541}
542 1077
543sub max_col_width { 1078 CFClient::UI::harmonize \@h;
544 my ($self, $col) = @_;
545
546 my $ws = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
548 my $c = ($self->{children}->[$yi] || [])->[$col];
549 if ($c) {
550 my ($w, $h) = $c->size_request;
551 if ($ws < $w) { $ws = $w }
552 }
553 }
554 return $ws;
555}
556
557sub size_request {
558 my ($self) = @_;
559
560 my ($hs, $ws) = (0, 0);
561
562 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
563 $hs += $self->max_row_height ($yi);
564 }
565
566 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
567 my $wm = 0;
568 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
569 $wm += $self->max_col_width ($xi)
570 }
571 if ($ws < $wm) { $ws = $wm }
572 }
573
574 return ($ws, $hs);
575}
576
577sub _draw {
578 my ($self) = @_;
579 1079
580 my $y = 0; 1080 my $y = 0;
581 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 1081 for (0 .. $#$children) {
1082 my $child = $children->[$_];
582 my $x = 0; 1083 my $h = $h[$_];
1084 $child->configure ($y, 0, $h, $w);
583 1085
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 1086 $y += $h;
1087 }
585 1088
586 my $c = $self->{children}->[$yi]->[$xi];
587 if ($c) {
588 $c->move ($x, $y, 0); #TODO: Move to size_request
589 $c->draw if $c;
590 }
591
592 $x += $self->max_col_width ($xi);
593 }
594
595 $y += $self->max_row_height ($yi);
596 } 1089 1
597} 1090}
598 1091
599############################################################################# 1092#############################################################################
600 1093
601package Crossfire::Client::Widget::VBox; 1094package CFClient::UI::VBox;
602 1095
1096# TODO: wrap into common Box base class
1097
603our @ISA = Crossfire::Client::Widget::Container::; 1098our @ISA = CFClient::UI::Container::;
604
605use SDL::OpenGL;
606 1099
607sub size_request { 1100sub size_request {
608 my ($self) = @_; 1101 my ($self) = @_;
609 1102
610 my @alloc = map [$_->size_request], @{$self->{children}}; 1103 my @alloc = map [$_->size_request], @{$self->{children}};
… …
616} 1109}
617 1110
618sub size_allocate { 1111sub size_allocate {
619 my ($self, $w, $h) = @_; 1112 my ($self, $w, $h) = @_;
620 1113
621 $self->w ($w); 1114 my $children = $self->{children};
622 $self->h ($h);
623 1115
624 my $exp; 1116 my @h = map $_->{req_h}, @$children;
625 my @oth; 1117
626 # find expand widget 1118 my $req_h = List::Util::sum @h;
627 for (@{$self->{children}}) { 1119
628 if ($_->{expand}) { 1120 if ($req_h > $h) {
1121 # ah well, not enough space
1122 $_ *= $h / $req_h for @h;
1123 } else {
1124 my $exp = List::Util::sum map $_->{expand}, @$children;
629 $exp = $_; 1125 $exp ||= 1;
630 last; 1126
1127 for (0 .. $#$children) {
1128 my $child = $children->[$_];
1129
1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
631 } 1131 }
632 push @oth, $_;
633 } 1132 }
634 1133
635 my ($ow, $oh); 1134 CFClient::UI::harmonize \@h;
636
637 # get sizes of other widgets
638 for (@oth) {
639 my ($w, $h) = $_->size_request;
640 $oh += $h;
641 if ($ow < $w) { $ow = $w }
642 }
643 1135
644 my $y = 0; 1136 my $y = 0;
645 for (@{$self->{children}}) { 1137 for (0 .. $#$children) {
646 $_->move (0, $y); 1138 my $child = $children->[$_];
1139 my $h = $h[$_];
1140 $child->configure (0, $y, $w, $h);
647 1141
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h);
654 $y += $h; 1142 $y += $h;
655 } 1143 }
1144
656 } 1145 1
657} 1146}
658 1147
659############################################################################# 1148#############################################################################
660 1149
661package Crossfire::Client::Widget::Label; 1150package CFClient::UI::Label;
662 1151
663our @ISA = Crossfire::Client::Widget::; 1152our @ISA = CFClient::UI::Base::;
664 1153
665use SDL::OpenGL; 1154use CFClient::OpenGL;
666 1155
667sub new { 1156sub new {
668 my ($class, $x, $y, $z, $height, $text) = @_; 1157 my ($class, %arg) = @_;
669 1158
670 $height ||= $::FONTSIZE; 1159 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1],
1161 #font => default_font
1162 fontsize => 1,
1163 text => "",
1164 align => -1,
1165 valign => -1,
1166 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0,
1169 %arg
1170 );
671 1171
672 # TODO: color, and make height, xyz etc. optional 1172 if (exists $self->{template}) {
673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 1173 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout;
1176 }
674 1177
675 $self->set_text ($text); 1178 $self->set_text (delete $self->{text}) if exists $self->{text};
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
676 1180
677 $self 1181 $self
1182}
1183
1184sub escape {
1185 local $_ = $_[1];
1186
1187 s/&/&amp;/g;
1188 s/>/&gt;/g;
1189 s/</&lt;/g;
1190
1191 $_[1]
678} 1192}
679 1193
680sub set_text { 1194sub set_text {
681 my ($self, $text) = @_; 1195 my ($self, $text) = @_;
682 1196
1197 $self->{layout}->set_text ($text);
1198
1199 delete $self->{texture};
1200 $self->check_size;
1201 $self->update;
1202}
1203
1204sub set_markup {
1205 my ($self, $markup) = @_;
1206
1207 $self->{layout}->set_markup ($markup);
1208
1209 delete $self->{texture};
1210 $self->check_size;
1211 $self->update;
1212}
1213
1214sub size_request {
1215 my ($self) = @_;
1216
1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220
1221 my ($w, $h) = $self->{layout}->size;
1222
1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226
1227 my ($w2, $h2) = $self->{template}->size;
1228
1229 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2;
1231 }
1232
1233 (
1234 $w + $self->{padding} * 2,
1235 $h + $self->{padding} * 2,
1236 )
1237}
1238
1239sub size_allocate {
1240 my ($self, $w, $h) = @_;
1241
1242 delete $self->{texture};
1243}
1244
1245sub set_fontsize {
1246 my ($self, $fontsize) = @_;
1247
1248 $self->{fontsize} = $fontsize;
1249 delete $self->{texture};
1250 $self->check_size;
1251 $self->update;
1252}
1253
1254sub _draw {
1255 my ($self) = @_;
1256
1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1261 new_from_layout CFClient::Texture $self->{layout}
1262 };
1263
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268
1269 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy});
1284
1285 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287}
1288
1289#############################################################################
1290
1291package CFClient::UI::EntryBase;
1292
1293our @ISA = CFClient::UI::Label::;
1294
1295use CFClient::OpenGL;
1296
1297sub new {
1298 my $class = shift;
1299
1300 $class->SUPER::new (
1301 fg => [1, 1, 1],
1302 bg => [0, 0, 0, 0.2],
1303 active_bg => [1, 1, 1, 0.5],
1304 active_fg => [0, 0, 0],
1305 can_hover => 1,
1306 can_focus => 1,
1307 valign => 0,
1308 can_events => 1,
1309 @_
1310 )
1311}
1312
1313sub _set_text {
1314 my ($self, $text) = @_;
1315
1316 delete $self->{cur_h};
1317
1318 return if $self->{text} eq $text;
1319
1320 delete $self->{texture};
1321
1322 $self->{last_activity} = $::NOW;
683 $self->{text} = $text; 1323 $self->{text} = $text;
684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
685 1324
1325 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text ");
1327
1328 $self->emit (changed => $self->{text});
1329}
1330
1331sub get_text {
1332 $_[0]{text}
1333}
1334
1335sub size_request {
1336 my ($self) = @_;
1337
1338 my ($w, $h) = $self->SUPER::size_request;
1339
1340 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
686 $self->update; 1354 $self->update;
687} 1355}
688 1356
689sub get_text { 1357sub key_down {
690 my ($self, $text) = @_; 1358 my ($self, $ev) = @_;
691 1359
692 $self->{text} 1360 my $mod = $ev->{mod};
1361 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode};
1363
1364 my $text = $self->get_text;
1365
1366 if ($sym == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) {
1369 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) {
1379 $self->emit ('escape');
1380 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni;
1382 }
1383
1384 $self->_set_text ($text);
1385 $self->update;
1386}
1387
1388sub focus_in {
1389 my ($self) = @_;
1390
1391 $self->{last_activity} = $::NOW;
1392
1393 $self->SUPER::focus_in;
1394}
1395
1396sub button_down {
1397 my ($self, $ev, $x, $y) = @_;
1398
1399 $self->SUPER::button_down ($ev, $x, $y);
1400
1401 my $idx = $self->{layout}->xy_to_index ($x, $y);
1402
1403 # byte-index to char-index
1404 my $text = $self->{text};
1405 utf8::encode $text;
1406 $self->{cursor} = length substr $text, 0, $idx;
1407
1408 $self->_set_text ($self->{text});
1409 $self->update;
1410}
1411
1412sub mouse_motion {
1413 my ($self, $ev, $x, $y) = @_;
1414# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1415}
1416
1417sub _draw {
1418 my ($self) = @_;
1419
1420 local $self->{fg} = $self->{fg};
1421
1422 if ($FOCUS == $self) {
1423 glColor @{$self->{active_bg}};
1424 $self->{fg} = $self->{active_fg};
1425 } else {
1426 glColor @{$self->{bg}};
1427 }
1428
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glBegin GL_QUADS;
1432 glVertex 0 , 0;
1433 glVertex 0 , $self->{h};
1434 glVertex $self->{w}, $self->{h};
1435 glVertex $self->{w}, 0;
1436 glEnd;
1437 glDisable GL_BLEND;
1438
1439 $self->SUPER::_draw;
1440
1441 #TODO: force update every cursor change :(
1442 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1443
1444 unless (exists $self->{cur_h}) {
1445 my $text = substr $self->{text}, 0, $self->{cursor};
1446 utf8::encode $text;
1447
1448 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1449 }
1450
1451 glColor @{$self->{fg}};
1452 glBegin GL_LINES;
1453 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1454 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1455 glEnd;
1456 }
1457}
1458
1459package CFClient::UI::Entry;
1460
1461our @ISA = CFClient::UI::EntryBase::;
1462
1463use CFClient::OpenGL;
1464
1465sub key_down {
1466 my ($self, $ev) = @_;
1467
1468 my $sym = $ev->{sym};
1469
1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1474 $self->emit (activate => $txt);
1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history} || []} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1496
1497 } else {
1498 $self->SUPER::key_down ($ev);
1499 }
1500
1501}
1502
1503#############################################################################
1504
1505package CFClient::UI::Button;
1506
1507our @ISA = CFClient::UI::Label::;
1508
1509use CFClient::OpenGL;
1510
1511my @tex =
1512 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1513 qw(b1_button_active.png);
1514
1515sub new {
1516 my $class = shift;
1517
1518 $class->SUPER::new (
1519 padding => 4,
1520 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1],
1523 can_hover => 1,
1524 align => 0,
1525 valign => 0,
1526 can_events => 1,
1527 @_
1528 )
1529}
1530
1531sub button_up {
1532 my ($self, $ev, $x, $y) = @_;
1533
1534 if ($x >= 0 && $x < $self->{w}
1535 && $y >= 0 && $y < $self->{h}) {
1536 $self->emit ("activate");
1537 }
1538}
1539
1540sub _draw {
1541 my ($self) = @_;
1542
1543 local $self->{fg} = $self->{fg};
1544
1545 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg};
1547 }
1548
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1;
1554
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1556
1557 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559
1560 $self->SUPER::_draw;
1561}
1562
1563#############################################################################
1564
1565package CFClient::UI::CheckBox;
1566
1567our @ISA = CFClient::UI::DrawBG::;
1568
1569my @tex =
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1572
1573use CFClient::OpenGL;
1574
1575sub new {
1576 my $class = shift;
1577
1578 $class->SUPER::new (
1579 padding => 2,
1580 fg => [1, 1, 1],
1581 active_fg => [1, 1, 0],
1582 state => 0,
1583 can_hover => 1,
1584 @_
1585 )
693} 1586}
694 1587
695sub size_request { 1588sub size_request {
696 my ($self) = @_; 1589 my ($self) = @_;
697 1590
698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 1591 ($self->{padding} * 2 + 6) x 2
699 ( 1592}
700 $self->{texture}{width},
701 $self->{texture}{height},
702 )
703 } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
705 1593
706 ($w, $h) 1594sub button_down {
707 } 1595 my ($self, $ev, $x, $y) = @_;
708 1596
1597 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1598 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1599 $self->{state} = !$self->{state};
1600 $self->emit (changed => $self->{state});
1601 }
709} 1602}
710 1603
711sub _draw { 1604sub _draw {
712 my ($self) = @_; 1605 my ($self) = @_;
713 1606
714 my $tex = $self->{texture}; 1607 $self->SUPER::_draw;
1608
1609 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1610
1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
715 1614
716 glEnable GL_BLEND; 1615 glEnable GL_BLEND;
717 glEnable GL_TEXTURE_2D; 1616 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625}
1626
1627#############################################################################
1628
1629package CFClient::UI::Image;
1630
1631our @ISA = CFClient::UI::Base::;
1632
1633use CFClient::OpenGL;
1634use Carp qw/confess/;
1635
1636our %loaded_images;
1637
1638sub new {
1639 my $class = shift;
1640
1641 my $self = $class->SUPER::new (can_events => 0, @_);
1642
1643 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1644
1645 $loaded_images{$self->{image}} ||=
1646 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1647
1648 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1649
1650 Scalar::Util::weaken $loaded_images{$self->{image}};
1651
1652 $self->{aspect} = $tex->{w} / $tex->{h};
1653
1654 $self
1655}
1656
1657sub size_request {
1658 my ($self) = @_;
1659
1660 ($self->{tex}->{w}, $self->{tex}->{h})
1661}
1662
1663sub _draw {
1664 my ($self) = @_;
1665
1666 my $tex = $self->{tex};
1667
1668 my ($w, $h) = ($self->{w}, $self->{h});
1669
1670 if ($self->{rot90}) {
1671 glRotate 90, 0, 0, 1;
1672 glTranslate 0, -$self->{w}, 0;
1673
1674 ($w, $h) = ($h, $w);
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 glBindTexture GL_TEXTURE_2D, $tex->{name};
721 1681
722 glColor 1, 0, 0, 1; # TODO color 1682 $tex->draw_quad (0, 0, $w, $h);
723
724 glBegin GL_QUADS;
725 glTexCoord 0, 0; glVertex 0 , 0;
726 glTexCoord 0, 1; glVertex 0 , $tex->{height};
727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
728 glTexCoord 1, 0; glVertex $tex->{width}, 0;
729 glEnd;
730 1683
731 glDisable GL_BLEND; 1684 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 1685 glDisable GL_TEXTURE_2D;
733} 1686}
734 1687
735############################################################################# 1688#############################################################################
736 1689
737package Crossfire::Client::Widget::Entry; 1690package CFClient::UI::VGauge;
738 1691
739our @ISA = Crossfire::Client::Widget::Label::; 1692our @ISA = CFClient::UI::Base::;
740 1693
741use SDL; 1694use List::Util qw(min max);
742use SDL::OpenGL;
743 1695
744sub key_down { 1696use CFClient::OpenGL;
1697
1698my %tex = (
1699 food => [
1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1702 ],
1703 grace => [
1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1706 ],
1707 hp => [
1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1710 ],
1711 mana => [
1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1714 ],
1715);
1716
1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1718sub new {
1719 my $class = shift;
1720
1721 my $self = $class->SUPER::new (
1722 type => 'food',
1723 @_
1724 );
1725
1726 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1727
1728 $self
1729}
1730
1731sub size_request {
1732 my ($self) = @_;
1733
1734 #my $tex = $tex{$self->{type}}[0];
1735 #@$tex{qw(w h)}
1736 (0, 0)
1737}
1738
1739sub set_max {
1740 my ($self, $max) = @_;
1741
1742 $self->{max_val} = $max;
1743}
1744
1745sub set_value {
1746 my ($self, $val, $max) = @_;
1747
1748 $self->set_max ($max)
1749 if defined $max;
1750
1751 $max = $self->{max_val};
1752 $self->{val} = $val;
1753
1754 $self->update;
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1762
1763 my ($w, $h) = ($self->{w}, $self->{h});
1764
1765 if ($self->{vertical}) {
1766 glRotate 90, 0, 0, 1;
1767 glTranslate 0, -$self->{w}, 0;
1768
1769 ($w, $h) = ($h, $w);
1770 }
1771
1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1773
1774 my $ycut1 = max 0, min 1, $ycut;
1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1777 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2);
1779
1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784
1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1786 glBegin GL_QUADS;
1787 glTexCoord 0 , 0; glVertex 0 , 0;
1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1791 glEnd;
1792
1793 my $ycut1 = List::Util::min 1, $ycut;
1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1795 glBegin GL_QUADS;
1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1797 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1811
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D;
1814}
1815
1816#############################################################################
1817
1818package CFClient::UI::Gauge;
1819
1820our @ISA = CFClient::UI::VBox::;
1821
1822sub new {
1823 my ($class, %arg) = @_;
1824
1825 my $self = $class->SUPER::new (
1826 tooltip => $arg{type},
1827 can_hover => 1,
1828 %arg,
1829 );
1830
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1834
1835 $self
1836}
1837
1838sub set_fontsize {
745 my ($self, $ev) = @_; 1839 my ($self, $fsize) = @_;
746 1840
747 my $mod = $ev->key_mod; 1841 $self->{value}->set_fontsize ($fsize);
748 my $sym = $ev->key_sym; 1842 $self->{max} ->set_fontsize ($fsize);
1843}
749 1844
750 my $uni = $ev->key_unicode; 1845sub set_value {
1846 my ($self, $val, $max) = @_;
751 1847
752 my $text = $self->get_text; 1848 $self->set_max ($max)
1849 if defined $max;
753 1850
754 if ($sym == SDLK_BACKSPACE) { 1851 $self->{gauge}->set_value ($val, $max);
755 substr $text, -1, 1, ''; 1852 $self->{value}->set_text ($val);
756 } elsif ($uni) { 1853}
757 $text .= chr $uni;
758 print "$uni <$text>\n";#d#
759 }
760 1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
761 $self->set_text ($text); 1859 $self->{max}->set_text ($max);
1860}
1861
1862#############################################################################
1863
1864package CFClient::UI::Slider;
1865
1866use strict;
1867
1868use CFClient::OpenGL;
1869
1870our @ISA = CFClient::UI::DrawBG::;
1871
1872my @tex =
1873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1874 qw(s1_slider.png s1_slider_bg.png);
1875
1876sub new {
1877 my $class = shift;
1878
1879 # range [value, low, high, page]
1880
1881 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off
1884 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0],
1887 range => [0, 0, 100, 10],
1888 req_w => 20,
1889 req_h => 20,
1890 vertical => 0,
1891 can_hover => 1,
1892 inner_pad => 5,
1893 @_
1894 );
1895
1896 $self
1897}
1898
1899sub size_request {
1900 my ($self) = @_;
1901
1902 my $w = $self->{req_w};
1903 my $h = $self->{req_h};
1904
1905 $self->{vertical} ? ($h, $w) : ($w, $h)
762} 1906}
763 1907
764sub button_down { 1908sub button_down {
1909 my ($self, $ev, $x, $y) = @_;
1910
1911 $self->SUPER::button_down ($ev, $x, $y);
1912 $self->mouse_motion ($ev, $x, $y);
1913}
1914
1915sub mouse_motion {
1916 my ($self, $ev, $x, $y) = @_;
1917
1918 if ($GRAB == $self) {
1919 my ($value, $lo, $hi, $page) = @{$self->{range}};
1920
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1922
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1925
1926 $x -= $inner_pad_px; # substract the padding
1927 $x = $x * ($hi - $lo) / $inner_w + $lo;
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931
1932 $self->emit (changed => $x);
1933 $self->update;
1934 }
1935}
1936
1937# the inner_* stuff is for generating a padding for the slider handle,
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
765 my ($self, $ev) = @_; 1941 my ($self, $w) = @_;
766 1942 ($w / 100) * $self->{inner_pad} # % to pixels
767 $self->focus_in;
768} 1943}
769 1944
770sub _draw { 1945sub _draw {
771 my ($self) = @_; 1946 my ($self) = @_;
772 1947
773 if ($FOCUS == $self) {
774 glColor 1, 1, 1;
775 } else {
776 glColor 0.7, 0.7, 0.7;
777 }
778
779 glBegin GL_QUADS;
780 glVertex 0 , 0;
781 glVertex 0 , $self->{h} - 1;
782 glVertex $self->{w} - 1, $self->{h} - 1;
783 glVertex $self->{w} - 1, 0;
784 glEnd;
785
786 $self->SUPER::_draw; 1948 $self->SUPER::_draw ();
787}
788 1949
789############################################################################# 1950 my ($w, $h) = @$self{qw(w h)};
790 1951
791package Crossfire::Client::Widget::MapWidget; 1952 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider
1954
1955 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0;
792 1957
793use strict; 1958 ($w, $h) = ($h, $w);
794
795use List::Util qw(min max);
796
797use SDL;
798use SDL::OpenGL;
799use SDL::OpenGL::Constants;
800
801our @ISA = Crossfire::Client::Widget::;
802
803sub key_down {
804 print "MAPKEYDOWN\n";
805}
806
807sub key_up {
808}
809
810sub size_request {
811 ( 1959 }
812 1 + int $::WIDTH / 32, 1960
813 1 + int $::HEIGHT / 32, 1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986
1987 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h);
1989
1990 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1992
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D;
1995}
1996
1997#############################################################################
1998
1999package CFClient::UI::TextView;
2000
2001our @ISA = CFClient::UI::HBox::;
2002
2003use CFClient::OpenGL;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 fontsize => 1,
2010 can_events => 0,
2011 #font => default_font
2012 @_,
2013
2014 layout => (new CFClient::Layout),
2015 par => [],
2016 height => 0,
2017 children => [
2018 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1),
2020 ],
814 ) 2021 );
2022
2023 $self->{children}[1]->connect (changed => sub {
2024 $self->update;
2025 });
2026
2027 $self
2028}
2029
2030sub set_fontsize {
2031 my ($self, $fontsize) = @_;
2032
2033 $self->{fontsize} = $fontsize;
2034 $self->reflow;
2035}
2036
2037sub text_height {
2038 my ($self, $text) = @_;
2039
2040 my $layout = $self->{layout};
2041
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w});
2044 $layout->set_text ($text);
2045
2046 ($layout->size)[1]
2047}
2048
2049sub reflow {
2050 my ($self) = @_;
2051
2052 $self->{need_reflow}++;
2053 $self->update;
2054}
2055
2056sub size_allocate {
2057 my ($self, $w, $h) = @_;
2058
2059 $self->SUPER::size_allocate ($w, $h);
2060
2061 $self->{layout}->set_font ($self->{font}) if $self->{font};
2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2063 $self->{layout}->set_width ($self->{children}[0]{w});
2064
2065 $self->reflow;
2066}
2067
2068sub add_paragraph {
2069 my ($self, $color, $text) = @_;
2070
2071 #TODO: intelligently "reformat" paragraph
2072
2073 my $height = $self->text_height ($text);
2074
2075 $self->{height} += $height;
2076
2077 push @{$self->{par}}, [$height, $color, $text];
2078
2079 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2080 $self->{children}[1]->update;
2081}
2082
2083sub update {
2084 my ($self) = @_;
2085
2086 $self->SUPER::update;
2087
2088 return unless $self->{h} > 0;
2089
2090 delete $self->{texture};
2091
2092 $ROOT->on_refresh ($self, sub {
2093 if (delete $self->{need_reflow}) {
2094 my $height = 0;
2095
2096 $height += $_->[0] = $self->text_height ($_->[2])
2097 for @{$self->{par}};
2098
2099 $self->{height} = $height;
2100
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102
2103 delete $self->{texture};
2104 }
2105
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2107 glClearColor 0, 0, 0, 1;
2108 glClear GL_COLOR_BUFFER_BIT;
2109
2110 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
2120 my $y = 0;
2121
2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125
2126 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0];
2128
2129 if ($y0 < $y + $h && $y < $y1) {
2130 $layout->set_text ($par->[2]);
2131
2132 glColor @{ $par->[1] };
2133 my ($W, $H) = $layout->size;
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2135 }
2136
2137 $y += $h;
2138 }
2139
2140 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND;
2142 };
2143 });
815} 2144}
816 2145
817sub _draw { 2146sub _draw {
818 my ($self) = @_; 2147 my ($self) = @_;
819 2148
820 my $mx = $::CONN->{mapx}; 2149 if ($self->{texture}) {
821 my $my = $::CONN->{mapy};
822
823 my $map = $::CONN->{map};
824
825 my ($xofs, $yofs);
826
827 my $sw = 1 + int $::WIDTH / 32;
828 my $sh = 1 + int $::HEIGHT / 32;
829
830 if ($::CONN->{mapw} > $sw) {
831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
832 } else {
833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834 }
835
836 if ($::CONN->{maph} > $sh) {
837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
838 } else {
839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
840 }
841
842 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
843 glEnable GL_BLEND;
844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
845 2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
846 my $sw4 = ($sw + 3) & ~3;
847 my $lighting = "\x00" x ($sw4 * $sh);
848
849 for my $x (0 .. $sw - 1) {
850 for my $y (0 .. $sh - 1) {
851
852 my $cell = $map->[$x + $xofs][$y + $yofs]
853 or next;
854
855 my $darkness = $cell->[0] * (1 / 255);
856 if ($darkness < 0) {
857 $darkness = $cell->[1] ? 0.2 : 0;
858 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860
861 for my $num (grep $_, @$cell[1,2,3]) {
862 my $tex = $::CONN->{face}[$num]{texture} || next;
863
864 glBindTexture GL_TEXTURE_2D, $tex->{name};
865
866 my $w = $tex->{width};
867 my $h = $tex->{height};
868
869 my $px = ($x + 1) * 32 - $w;
870 my $py = ($y + 1) * 32 - $h;
871
872 glBegin GL_QUADS;
873 glTexCoord 0, 0; glVertex $px , $py;
874 glTexCoord 0, 1; glVertex $px , $py + $h;
875 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876 glTexCoord 1, 0; glVertex $px + $w, $py;
877 glEnd;
878 }
879 }
880 }
881
882# if (1) { # higher quality darkness
883# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885#
886# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
887#
888# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs;
890# }
891
892 $lighting = new Crossfire::Client::Texture
893 width => $sw4,
894 height => $sh,
895 data => $lighting,
896 internalformat => GL_ALPHA,
897 format => GL_ALPHA;
898
899 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
900 glColor 0.5, 0.5, 0.5, 1;
901 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
902 glBindTexture GL_TEXTURE_2D, $lighting->{name};
903 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904 glBegin GL_QUADS;
905 glTexCoord 0, 0; glVertex 0 , 0;
906 glTexCoord 0, 1; glVertex 0 , $sh * 32;
907 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
908 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
909 glEnd;
910
911 glDisable GL_TEXTURE_2D; 2153 glDisable GL_TEXTURE_2D;
912 glDisable GL_BLEND;
913}
914
915my %DIR = (
916 SDLK_KP8, [1, "north"],
917 SDLK_KP9, [2, "northeast"],
918 SDLK_KP6, [3, "east"],
919 SDLK_KP3, [4, "southeast"],
920 SDLK_KP2, [5, "south"],
921 SDLK_KP1, [6, "southwest"],
922 SDLK_KP4, [7, "west"],
923 SDLK_KP7, [8, "northwest"],
924
925 SDLK_UP, [1, "north"],
926 SDLK_RIGHT, [3, "east"],
927 SDLK_DOWN, [5, "south"],
928 SDLK_LEFT, [7, "west"],
929);
930
931sub key_down {
932 my ($self, $ev) = @_;
933
934 my $mod = $ev->key_mod;
935 my $sym = $ev->key_sym;
936
937 if ($sym == SDLK_KP5) {
938 $::CONN->send ("command stay fire");
939 } elsif (exists $DIR{$sym}) {
940 if ($mod & KMOD_SHIFT) {
941 $self->{shft}++;
942 $::CONN->send ("command fire $DIR{$sym}[0]");
943 } elsif ($mod & KMOD_CTRL) {
944 $self->{ctrl}++;
945 $::CONN->send ("command run $DIR{$sym}[0]");
946 } else {
947 $::CONN->send ("command $DIR{$sym}[1]");
948 }
949 } 2154 }
950}
951 2155
952sub key_up { 2156 $self->{children}[1]->draw;
953 my ($self, $ev) = @_;
954 2157
955 my $mod = $ev->key_mod;
956 my $sym = $ev->key_sym;
957
958 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
959 $::CONN->send ("command fire_stop");
960 }
961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
962 $::CONN->send ("command run_stop");
963 }
964} 2158}
965 2159
966############################################################################# 2160#############################################################################
967 2161
968package Crossfire::Client::Widget::Animator; 2162package CFClient::UI::Animator;
969 2163
970use SDL::OpenGL; 2164use CFClient::OpenGL;
971 2165
972our @ISA = Crossfire::Client::Widget::Bin::; 2166our @ISA = CFClient::UI::Bin::;
973 2167
974sub moveto { 2168sub moveto {
975 my ($self, $x, $y) = @_; 2169 my ($self, $x, $y) = @_;
976 2170
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2171 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2; 2172 $self->{speed} = 0.001;
979 $self->{time} = 1; 2173 $self->{time} = 1;
980 2174
981 ::animation_start $self; 2175 ::animation_start $self;
982} 2176}
983 2177
… …
1005 glPopMatrix; 2199 glPopMatrix;
1006} 2200}
1007 2201
1008############################################################################# 2202#############################################################################
1009 2203
1010package Crossfire::Client::Widget::Toplevel; 2204package CFClient::UI::Flopper;
1011 2205
2206our @ISA = CFClient::UI::Button::;
2207
2208sub new {
2209 my $class = shift;
2210
2211 my $self = $class->SUPER::new (
2212 state => 0,
2213 connect_activate => \&toggle_flopper,
2214 @_
2215 );
2216
2217 if ($self->{state}) {
2218 $self->{state} = 0;
2219 $self->toggle_flopper;
2220 }
2221
2222 $self
2223}
2224
2225sub toggle_flopper {
2226 my ($self) = @_;
2227
2228 # TODO: use animation
2229 if ($self->{state} = !$self->{state}) {
2230 $CFClient::UI::ROOT->add ($self->{other});
2231 $self->{other}->move ($self->coord2global (0, $self->{h}));
2232 $self->emit ("open");
2233 } else {
2234 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close");
2236 }
2237
2238 $self->emit (changed => $self->{state});
2239}
2240
2241#############################################################################
2242
2243package CFClient::UI::Tooltip;
2244
2245our @ISA = CFClient::UI::Bin::;
2246
2247use CFClient::OpenGL;
2248
2249sub new {
2250 my $class = shift;
2251
2252 $class->SUPER::new (
2253 @_,
2254 can_events => 0,
2255 )
2256}
2257
2258sub set_markup {
2259 my ($self, $text) = @_;
2260
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2262 $self->{label}->set_markup ($text);
2263 $self->add ($self->{label});
2264}
2265
2266sub size_request {
2267 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272
2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375;
2287
2288 my ($w, $h) = @$self{qw(w h)};
2289
2290 glColor 1, 0.8, 0.4;
2291 glBegin GL_QUADS;
2292 glVertex 0 , 0;
2293 glVertex 0 , $h;
2294 glVertex $w, $h;
2295 glVertex $w, 0;
2296 glEnd;
2297
2298 glColor 0, 0, 0;
2299 glBegin GL_LINE_LOOP;
2300 glVertex 0 , 0;
2301 glVertex 0 , $h;
2302 glVertex $w, $h;
2303 glVertex $w, 0;
2304 glEnd;
2305
2306 glPopMatrix;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw;
2310}
2311
2312#############################################################################
2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2352package CFClient::UI::Root;
2353
1012our @ISA = Crossfire::Client::Widget::Container::; 2354our @ISA = CFClient::UI::Container::;
2355
2356use CFClient::OpenGL;
2357
2358sub check_size {
2359 my ($self) = @_;
2360
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2362}
1013 2363
1014sub size_request { 2364sub size_request {
1015 ($::WIDTH, $::HEIGHT) 2365 ($::WIDTH, $::HEIGHT)
1016} 2366}
1017 2367
1018sub size_allocate { 2368sub configure {
2369 my ($self, $x, $y, $w, $h) = @_;
2370
2371 $self->SUPER::configure ($x, $y, $w, $h);
2372
2373 for my $child (@{$self->{children}}) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H);
2379 }
2380}
2381
2382sub _topleft {
1019 my ($self, $w, $h) = @_; 2383 my ($self, $x, $y) = @_;
1020 2384
1021 $self->SUPER::size_allocate ($w, $h); 2385 ($x, $y)
1022
1023 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}};
1025} 2386}
1026 2387
1027sub update { 2388sub update {
1028 my ($self) = @_; 2389 my ($self) = @_;
1029 2390
1030 $self->size_allocate ($self->size_request); 2391 $self->check_size;
1031 ::refresh (); 2392 ::refresh ();
1032} 2393}
1033 2394
1034sub add { 2395sub add {
1035 my ($self, $widget) = @_; 2396 my ($self, $child) = @_;
1036 2397
2398 # integerize window positions
2399 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y};
2401
1037 $self->SUPER::add ($widget); 2402 $self->SUPER::add ($child);
2403}
1038 2404
1039 $widget->size_allocate ($widget->size_request); 2405sub on_refresh {
2406 my ($self, $id, $cb) = @_;
2407
2408 $self->{refresh_hook}{$id} = $cb;
1040} 2409}
1041 2410
1042sub draw { 2411sub draw {
1043 my ($self) = @_; 2412 my ($self) = @_;
1044 2413
2414 while (my $rcb = delete $self->{refresh_hook}) {
2415 $_->() for values %$rcb;
2416 }
2417
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT;
2421
2422 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2425 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity;
2427
1045 $self->_draw; 2428 $self->_draw;
1046} 2429}
1047 2430
1048############################################################################# 2431#############################################################################
1049 2432
1050package Crossfire::Client::Widget; 2433package CFClient::UI;
1051 2434
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 2435$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip;
1053 2437
10541 24381
1055 2439

Diff Legend

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