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.37 by root, Sun Apr 9 21:05:50 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 14:55:28 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 ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10our $FOCUS; # the widget with current focus
11
12# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { }
17 80
18sub new { 81sub new {
19 my $class = shift; 82 my $class = shift;
20 83
21 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
22} 100}
23 101
24sub move { 102sub move {
25 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 104 $self->{x} = $x;
… …
35sub size_request { 113sub size_request {
36 require Carp; 114 require Carp;
37 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
38} 116}
39 117
118sub _size_allocate {
119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
125
126 $self->{w} = $w;
127 $self->{h} = $h;
128
129 1
130}
131
40sub size_allocate { 132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
41 my ($self, $w, $h) = @_; 140 my ($self, $x, $y) = @_;
42 $self->w ($w); 141
43 $self->h ($h); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 143}
45 144
46sub focus_in { 145sub focus_in {
47 my ($widget) = @_; 146 my ($self) = @_;
48 $FOCUS = $widget; 147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
150
151 my $focus = $FOCUS; $FOCUS = $self;
152 $focus->update if $focus;
153 $FOCUS->update;
49} 154}
50 155
51sub focus_out { 156sub focus_out {
52 my ($widget) = @_; 157 my ($self) = @_;
53}
54 158
159 return unless $FOCUS == $self;
160
161 my $focus = $FOCUS; undef $FOCUS;
162 $focus->update if $focus; #?
163}
164
165sub mouse_motion { }
166sub button_up { }
55sub key_down { 167sub key_down { }
56 my ($widget, $sdlev) = @_;
57}
58
59sub key_up { 168sub key_up { }
60 my ($widget, $sdlev) = @_;
61}
62 169
63sub button_down { 170sub button_down {
64 my ($widget, $sdlev) = @_; 171 my ($self, $ev, $x, $y) = @_;
65}
66 172
67sub button_up { 173 $self->focus_in;
68 my ($widget, $sdlev) = @_;
69} 174}
70 175
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 181
77sub draw { 182sub draw {
78 my ($self) = @_; 183 my ($self) = @_;
184
185 return unless $self->{h} && $self->{w};
79 186
80 glPushMatrix; 187 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 189 $self->_draw;
83 glPopMatrix; 190 glPopMatrix;
191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS;
199 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y;
201 glVertex $x + $self->{w}, $y + $self->{h};
202 glVertex $x , $y + $self->{h};
203 glEnd;
204 glDisable GL_BLEND;
205 }
84} 206}
85 207
86sub _draw { 208sub _draw {
87 my ($widget) = @_; 209 my ($self) = @_;
88}
89 210
90sub bbox { 211 warn "no draw defined for $self\n";
212}
213
214sub find_widget {
91 my ($self) = @_; 215 my ($self, $x, $y) = @_;
92 my ($w, $h) = $self->size_request; 216
217 return $self
218 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
220
93 ( 221 ()
94 $self->{x},
95 $self->{y},
96 $self->{x} = $w,
97 $self->{y} = $h
98 )
99} 222}
100
101sub del_parent { $_[0]->{parent} = undef }
102 223
103sub set_parent { 224sub set_parent {
104 my ($self, $par) = @_; 225 my ($self, $par) = @_;
105 226
106 $self->{parent} = $par; 227 $self->{parent} = $par;
… …
116 237
117 $self->{parent}->update 238 $self->{parent}->update
118 if $self->{parent}; 239 if $self->{parent};
119} 240}
120 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
121sub DESTROY { 255sub DESTROY {
122 my ($self) = @_; 256 my ($self) = @_;
123 257
124 #$self->deactivate; 258 #$self->deactivate;
125} 259}
126 260
127package Crossfire::Client::Widget::Bin; 261#############################################################################
128 262
129our @ISA = Crossfire::Client::Widget::; 263package CFClient::UI::DrawBG;
130 264
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] } 265our @ISA = CFClient::UI::Base::;
132sub get { $_[0]->{child} }
133 266
134sub remove { 267use strict;
268use SDL::OpenGL;
269
270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
135 my ($self, $chld) = @_; 283 my ($self) = @_;
136 delete $self->{child} 284
137 if $self->{child} == $chld; 285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
138} 299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
139 306
140sub size_request { 307sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 308 (0, 0)
142} 309}
143sub size_allocate {
144 my ($self, $w, $h) = @_;
145 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h)
147 if $self->{child}
148}
149 310
150sub _draw { 311sub draw { }
151 my ($self) = @_;
152 312
153 $self->{child}->draw; 313#############################################################################
154}
155 314
156package Crossfire::Client::Widget::Toplevel; 315package CFClient::UI::Container;
157 316
158our @ISA = Crossfire::Client::Widget::; 317our @ISA = CFClient::UI::Base::;
159 318
160use SDL::OpenGL; 319sub new {
320 my ($class, %arg) = @_;
321
322 my $children = delete $arg{children} || [];
323
324 my $self = $class->SUPER::new (children => [], %arg);
325 $self->add ($_) for @$children;
326
327 $self
328}
161 329
162sub add { 330sub add {
163 my ($self, $chld) = @_; 331 my ($self, $chld) = @_;
164 332
165 push @{$self->{childs}}, $chld; 333 $chld->set_parent ($self);
334
166 @{$self->{childs}} = 335 $self->{children} = [
167 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}}; 337 @{$self->{children}}, $chld
338 ];
169 339
170 $chld->set_parent ($self); 340 $self->{w} = $self->{h} = -1;
171 $chld->size_allocate ($chld->size_request); 341 $self->update;
172} 342}
173 343
174sub remove { 344sub remove {
175 my ($self, $chld) = @_; 345 my ($self, $widget) = @_;
346
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348
349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
350}
351
352sub find_widget {
353 my ($self, $x, $y) = @_;
354
355 $x -= $self->{x};
356 $y -= $self->{y};
357
358 my $res;
359
360 for (reverse @{ $self->{children} }) {
361 $res = $_->find_widget ($x, $y)
362 and return $res;
363 }
364
365 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
366}
367
368sub _draw {
369 my ($self) = @_;
370
371 $_->draw for @{$self->{children}};
372}
373
374#############################################################################
375
376package CFClient::UI::Bin;
377
378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
176 @{$self->{childs}} = 391 $self->{children} = [];
177 sort { $a->{z} <=> $b->{z} } 392
178 grep { $_ && $_ != $_[0] } 393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
179 @{$self->{childs}} 402 unless @{$self->{children}};
403}
404
405sub child { $_[0]->{children}[0] }
406
407sub size_request {
408 $_[0]{children}[0]->size_request
409}
410
411sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_;
413
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
417}
418
419#############################################################################
420
421package CFClient::UI::Window;
422
423our @ISA = CFClient::UI::Bin::;
424
425use SDL::OpenGL;
426
427sub new {
428 my ($class, %arg) = @_;
429
430 my $self = $class->SUPER::new (%arg);
180} 431}
181 432
182sub update { 433sub update {
183 my ($self) = @_; 434 my ($self) = @_;
184 ::refresh ();
185}
186 435
187sub _draw { 436 # we want to do this delayed...
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 warn "ADD $chld\n";
202 $self->SUPER::add ($chld);
203 $chld->set_parent ($self);
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 # $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 437 $self->render_chld;
438 $self->SUPER::update;
215} 439}
216 440
217sub render_chld { 441sub render_chld {
218 my ($self) = @_; 442 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 443
222 require Carp; 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
223 Carp::cluck "RENDERCHI $w $h"; 445 glClearColor 0, 0, 0, 1;
224 warn "RENDERCHI $w $h\n"; 446 glClear GL_COLOR_BUFFER_BIT;
225 $self->{texture} = 447 $self->child->draw;
226 Crossfire::Client::Texture->new_from_opengl ( 448 };
227 $w, $h, sub { $chld->draw }
228 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 449}
236 450
237sub size_allocate { 451sub size_allocate {
238 my ($self, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
239 453
240 $self->w ($w); 454 $self->_size_allocate ($x, $y, $w, $h) or return;
241 $self->h ($h); 455
242 $self->get->size_allocate ($w, $h); 456 $self->child->size_allocate (0, 0, $w, $h);
243 457
244 $self->update; #TODO: Move this to the size_request event propably? 458 $self->render_chld;
245} 459}
246 460
247sub _draw { 461sub _draw {
248 my ($self) = @_; 462 my ($self) = @_;
249 463
… …
251 465
252 my $tex = $self->{texture} 466 my $tex = $self->{texture}
253 or return; 467 or return;
254 468
255 glEnable GL_BLEND; 469 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
256 glEnable GL_TEXTURE_2D; 471 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 473
260 glBegin GL_QUADS; 474 $tex->draw_quad (0, 0, $w, $h);
261 glTexCoord 0, 0; glVertex 0, 0;
262 glTexCoord 0, 1; glVertex 0, $h;
263 glTexCoord 1, 1; glVertex $w, $h;
264 glTexCoord 1, 0; glVertex $w, 0;
265 glEnd;
266 475
267 glDisable GL_BLEND; 476 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
269} 478}
270 479
271package Crossfire::Client::Widget::Frame; 480#############################################################################
272 481
273our @ISA = Crossfire::Client::Widget::Bin::; 482package CFClient::UI::Frame;
483
484our @ISA = CFClient::UI::Bin::;
274 485
275use SDL::OpenGL; 486use SDL::OpenGL;
276 487
277sub size_request { 488sub size_request {
278 my ($self) = @_; 489 my ($self) = @_;
279 my $chld = $self->get 490 my $chld = $self->child
280 or return (0, 0); 491 or return (0, 0);
281 492
282 $chld->move (2, 2); 493 $chld->move (2, 2);
283 494
284 map { $_ + 4 } $chld->size_request; 495 map { $_ + 4 } $chld->size_request;
285} 496}
286 497
287sub size_allocate { 498sub size_allocate {
288 my ($self, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
500
501 $self->_size_allocate ($x, $y, $w, $h) or return;
289 502
290 $self->w ($w);
291 $self->h ($h);
292
293 $self->get->size_allocate ($w - 4, $h - 4); 503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
294 $self->get->move (2, 2);
295} 504}
296 505
297sub _draw { 506sub _draw {
298 my ($self) = @_; 507 my ($self) = @_;
299 508
300 my $chld = $self->get; 509 my $chld = $self->child;
301 510
302 my ($w, $h) = $chld->size_request; 511 my ($w, $h) = $chld->size_request;
303 512
304 glBegin GL_QUADS; 513 glBegin GL_QUADS;
305 glColor 0, 0, 0; 514 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0; 515 glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4; 516 glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 517 glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0; 518 glVertex $w + 4 , 0;
310 glEnd; 519 glEnd;
311 520
312 $chld->draw; 521 $chld->draw;
313} 522}
314 523
524#############################################################################
525
315package Crossfire::Client::Widget::FancyFrame; 526package CFClient::UI::FancyFrame;
316 527
317our @ISA = Crossfire::Client::Widget::Frame::; 528our @ISA = CFClient::UI::Bin::;
318 529
319use SDL::OpenGL; 530use SDL::OpenGL;
320 531
532my @tex =
533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
535
321sub new { 536sub new {
537 my $class = shift;
538
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new (
542 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8,
545 @_
546 )
547}
548
549sub size_request {
322 my ($self, $theme) = @_; 550 my ($self) = @_;
551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
554 my ($w, $h) = $self->SUPER::size_request;
555
556 (
557 $w + $self->{border} * 2,
558 $h + $self->{border} * 2,
559 )
560}
561
562sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_;
564
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566
567 $h -= List::Util::max 0, $self->{border} * 2;
568 $w -= List::Util::max 0, $self->{border} * 2;
569
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
571}
572
573sub button_down {
574 my ($self, $ev, $x, $y) = @_;
575
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h});
581
582 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_;
584
585 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586
587 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy;
589 $self->update;
590 };
591
592 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y});
597
598 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_;
600
601 ($x, $y) = ($ev->motion_x, $ev->motion_y);
602
603 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update;
605 };
606 }
607}
608
609sub button_up {
610 my ($self, $ev, $x, $y) = @_;
611
612 delete $self->{motion};
613}
614
615sub mouse_motion {
616 my ($self, $ev, $x, $y) = @_;
617
618 $self->{motion}->($ev, $x, $y) if $self->{motion};
619}
620
621sub _draw {
622 my ($self) = @_;
623
624 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626
627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631
632 glColor @{ $self->{border_bg} };
633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
637
638 my $bg = $tex[0];
639
640 # TODO: repeat texture not scale
641 my $rep_x = $cw / $bg->{w};
642 my $rep_y = $ch / $bg->{h};
643
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
650
651 glDisable GL_TEXTURE_2D;
652 glDisable GL_BLEND;
653
654 $self->child->draw;
655}
656
657#############################################################################
658
659package CFClient::UI::Table;
660
661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
664
665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
675
676sub add {
677 my ($self, $x, $y, $chld) = @_;
678
679 $self->{children}[$y][$x] = $chld;
680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
683 $self->update;
684}
685
686sub get_wh {
687 my ($self) = @_;
688
689 my (@w, @h);
690
691 for my $y (0 .. $#{$self->{children}}) {
692 my $row = $self->{children}[$y]
693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
698 my ($w, $h) = $widget->size_request;
699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
702 }
703 }
704
705 (\@w, \@h)
706}
707
708sub size_request {
709 my ($self) = @_;
710
711 my ($ws, $hs) = $self->get_wh;
712
713 (
714 (sum @$ws),
715 (sum @$hs),
716 )
717}
718
719sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723
724 my ($ws, $hs) = $self->get_wh;
725
726 my $req_w = sum @$ws;
727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
733
734 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 my $y;
739
740 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r]
742 or next;
743
744 my $x = 0;
745 my $row_h = $hs->[$r];
746
747 for my $c (0 .. $#$row) {
748 my $col_w = $ws->[$c];
749
750 if (my $widget = $row->[$c]) {
751 $widget->size_allocate ($x, $y, $col_w, $row_h);
752 }
753
754 $x += $col_w;
755 }
756
757 $y += $row_h;
758 }
759
760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 $x -= $self->{x};
766 $y -= $self->{y};
767
768 my $res;
769
770 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
771 $res = $_->find_widget ($x, $y)
772 and return $res;
773 }
774
775 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
776}
777
778sub _draw {
779 my ($self) = @_;
780
781 for (grep $_, @{$self->{children}}) {
782 $_->draw for grep $_, @$_;
783 }
784}
785
786#############################################################################
787
788package CFClient::UI::HBox;
789
790# TODO: wrap into common Box base class
791
792our @ISA = CFClient::UI::Container::;
793
794sub size_request {
795 my ($self) = @_;
796
797 my @alloc = map [$_->size_request], @{$self->{children}};
798
799 (
800 (List::Util::sum map $_->[0], @alloc),
801 (List::Util::max map $_->[1], @alloc),
802 )
803}
804
805sub size_allocate {
806 my ($self, $x, $y, $w, $h) = @_;
807
808 $self->_size_allocate ($x, $y, $w, $h);
809
810 ($h, $w) = ($w, $h);
811
812 my $children = $self->{children};
813
814 my @h = map +($_->size_request)[0], @$children;
815
816 my $req_h = List::Util::sum @h;
817
818 if ($req_h > $h) {
819 # ah well, not enough space
820 $_ *= $h / $req_h for @h;
821 } else {
822 my $exp = List::Util::sum map $_->{expand}, @$children;
823 $exp ||= 1;
824
825 for (0 .. $#$children) {
826 my $child = $children->[$_];
827
828 my $alloc_h = $h[$_];
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h;
831 }
832 }
833
834 my $y = 0;
835 for (0 .. $#$children) {
836 my $child = $children->[$_];
837 my $h = int $h[$_];
838 $child->size_allocate ($y, 0, $h, $w);
839
840 $y += $h;
841 }
842}
843
844#############################################################################
845
846package CFClient::UI::VBox;
847
848# TODO: wrap into common Box base class
849
850our @ISA = CFClient::UI::Container::;
851
852sub size_request {
853 my ($self) = @_;
854
855 my @alloc = map [$_->size_request], @{$self->{children}};
856
857 (
858 (List::Util::max map $_->[0], @alloc),
859 (List::Util::sum map $_->[1], @alloc),
860 )
861}
862
863sub size_allocate {
864 my ($self, $x, $y, $w, $h) = @_;
865
866 $self->_size_allocate ($x, $y, $w, $h);
867
868 my $children = $self->{children};
869
870 my @h = map +($_->size_request)[1], @$children;
871
872 my $req_h = List::Util::sum @h;
873
874 if ($req_h > $h) {
875 # ah well, not enough space
876 $_ *= $h / $req_h for @h;
877 } else {
878 my $exp = List::Util::sum map $_->{expand}, @$children;
879 $exp ||= 1;
880
881 for (0 .. $#$children) {
882 my $child = $children->[$_];
883
884 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885 }
886 }
887
888 my $y = 0;
889 for (0 .. $#$children) {
890 my $child = $children->[$_];
891 my $h = int $h[$_];
892 $child->size_allocate (0, $y, $w, $h);
893
894 $y += $h;
895 }
896}
897
898#############################################################################
899
900package CFClient::UI::Label;
901
902our @ISA = CFClient::UI::Base::;
903
904use SDL::OpenGL;
905
906sub new {
907 my ($class, %arg) = @_;
908
323 $self = $self->SUPER::new; 909 my $self = $class->SUPER::new (
324 910 fg => [1, 1, 1],
325 $self->{txts} = [ 911 fontsize => $::FONTSIZE,
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 912 text => "",
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 913 align => -1,
914 padding => 2,
915 layout => new CFClient::Layout,
916 %arg
328 ]; 917 );
918
919 $self->set_text ($self->{text});
920
329 $self 921 $self
330} 922}
331 923
924sub escape_text {
925 local $_ = $_[1];
926
927 s/&/&amp;/g;
928 s/>/&gt;/g;
929 s/</&lt;/g;
930
931 $_[1]
932}
933
934sub set_text {
935 my ($self, $text) = @_;
936
937 $self->{text} = $text;
938 $self->{layout}->set_markup ($text);
939
940 delete $self->{texture};
941# $self->{w} = $self->{h} = -1;
942 $self->update;
943}
944
945sub get_text {
946 my ($self, $text) = @_;
947
948 $self->{text}
949}
950
332sub size_request { 951sub size_request {
333 my ($self) = @_; 952 my ($self) = @_;
953
954 $self->{layout}->set_width;
955 $self->{layout}->set_height ($self->{fontsize});
334 my ($w, $h) = $self->get->size_request; 956 my ($w, $h) = $self->{layout}->size;
335 957
336 $h += $self->{txts}->[1]->{height}; 958 (
337 $h += $self->{txts}->[4]->{height}; 959 $w + $self->{padding} * 2,
338 $w += $self->{txts}->[2]->{width}; 960 $h + $self->{padding} * 2,
339 $w += $self->{txts}->[3]->{width}; 961 )
340
341 ($w, $h)
342} 962}
343 963
344sub size_allocate { 964sub size_allocate {
345 my ($self, $w, $h) = @_; 965 my ($self, $x, $y, $w, $h) = @_;
346 966
347 $self->w ($w); 967 $self->_size_allocate ($x, $y, $w, $h) or return;
348 $self->h ($h);
349 $h -= $self->{txts}->[1]->{height};
350 $h -= $self->{txts}->[4]->{height};
351 $w -= $self->{txts}->[2]->{width};
352 $w -= $self->{txts}->[3]->{width};
353 968
354 $h = $h < 0 ? 0 : $h; 969 delete $self->{texture};
355 $w = $w < 0 ? 0 : $w; 970}
356 warn "CHILD:$w $h\n"; 971
357 $self->get->size_allocate ($w, $h); 972sub update {
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 973 my ($self) = @_;
974
975 delete $self->{texture};
976 $self->SUPER::update;
359} 977}
360 978
361sub _draw { 979sub _draw {
362 my ($self) = @_; 980 my ($self) = @_;
363 981
364 my ($w, $h) = ($self->w, $self->h); 982 my $tex = $self->{texture} ||= do {
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 983 $self->{layout}->set_width ($self->{w});
984 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
985 new_from_layout CFClient::Texture $self->{layout}
986 };
987
988 glEnable GL_BLEND;
989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992
993 glColor @{$self->{fg}};
994
995 my $x =
996 $self->{align} < 0 ? $self->{padding}
997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998 : ($self->{w} - $tex->{w}) * 0.5;
999
1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1001
1002 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND;
1004}
1005
1006#############################################################################
1007
1008package CFClient::UI::Entry;
1009
1010our @ISA = CFClient::UI::Label::;
1011
1012use SDL;
1013use SDL::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1025 @_
1026 )
1027}
1028
1029sub _set_text {
1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051}
1052
1053sub size_request {
1054 my ($self) = @_;
1055
1056 my ($w, $h) = $self->SUPER::size_request;
1057
1058 ($w + 1, $h) # add 1 for cursor
1059}
1060
1061sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065
1066 $self->_set_text ($self->{text});
1067}
1068
1069sub set_text {
1070 my ($self, $text) = @_;
1071
1072 $self->{cursor} = length $text;
1073 $self->_set_text ($text);
1074 $self->update;
1075}
1076
1077sub key_down {
1078 my ($self, $ev) = @_;
1079
1080 my $mod = $ev->key_mod;
1081 my $sym = $ev->key_sym;
1082
1083 my $uni = $ev->key_unicode;
1084
1085 my $text = $self->get_text;
1086
1087 if ($sym == SDLK_BACKSPACE) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) {
1090 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1101 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni;
1103 }
1104
1105 $self->_set_text ($text);
1106 $self->update;
1107}
1108
1109sub focus_in {
1110 my ($self) = @_;
1111
1112 $self->{last_activity} = $::NOW;
1113
1114 $self->SUPER::focus_in;
1115}
1116
1117sub button_down {
1118 my ($self, $ev, $x, $y) = @_;
1119
1120 $self->SUPER::button_down ($ev, $x, $y);
1121
1122 my $idx = $self->{layout}->xy_to_index ($x, $y);
1123
1124 # byte-index to char-index
1125 my $text = $self->{text};
1126 utf8::encode $text;
1127 $self->{cursor} = length substr $text, 0, $idx;
1128
1129 $self->_set_text ($self->{text});
1130 $self->update;
1131}
1132
1133sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_;
1135# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1136}
1137
1138sub _draw {
1139 my ($self) = @_;
1140
1141 local $self->{fg} = $self->{fg};
1142
1143 if ($FOCUS == $self) {
1144 glColor @{$self->{active_bg}};
1145 $self->{fg} = $self->{active_fg};
1146 } else {
1147 glColor @{$self->{bg}};
1148 }
1149
1150 glEnable GL_BLEND;
1151 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1152 glBegin GL_QUADS;
1153 glVertex 0 , 0;
1154 glVertex 0 , $self->{h};
1155 glVertex $self->{w}, $self->{h};
1156 glVertex $self->{w}, 0;
1157 glEnd;
1158 glDisable GL_BLEND;
1159
1160 $self->SUPER::_draw;
1161
1162 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1164 glColor @{$self->{fg}};
1165 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1168 glEnd;
1169 }
1170}
1171
1172package CFClient::UI::LineEntry;
1173
1174our @ISA = CFClient::UI::Entry::;
1175
1176use SDL;
1177use SDL::OpenGL;
1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1206
1207sub new {
1208 my $class = shift;
1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
1217 )
1218}
1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
1227}
1228
1229sub _draw {
1230 my ($self) = @_;
1231
1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
366 1234
367 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
368 glEnable GL_TEXTURE_2D; 1236 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 1245
372 my $top = $self->{txts}->[1]; 1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
373 glBindTexture GL_TEXTURE_2D, $top->{name};
374 1247
375 glBegin GL_QUADS; 1248 glDisable GL_TEXTURE_2D;
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $top->{height};
378 glTexCoord 1, 1; glVertex $w , $top->{height};
379 glTexCoord 1, 0; glVertex $w , 0;
380 glEnd;
381
382 my $left = $self->{txts}->[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name};
384
385 glBegin GL_QUADS;
386 glTexCoord 0, 0; glVertex 0 , $top->{height};
387 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
388 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
389 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
390 glEnd;
391
392 my $right = $self->{txts}->[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name};
394
395 glBegin GL_QUADS;
396 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
397 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
398 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
399 glTexCoord 1, 0; glVertex $w , $top->{height};
400 glEnd;
401
402 my $bottom = $self->{txts}->[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name};
404
405 glBegin GL_QUADS;
406 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
407 glTexCoord 0, 1; glVertex 0 , $h;
408 glTexCoord 1, 1; glVertex $w , $h;
409 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
410 glEnd;
411
412 my $bg = $self->{txts}->[0];
413 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417
418 my $rep_x = $cw / $bg->{width};
419 my $rep_y = $ch / $bg->{height};
420
421 glBegin GL_QUADS;
422 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
423 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
425 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
426 glEnd;
427
428 glDisable GL_BLEND; 1249 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D;
430 1250
431 $self->get->draw; 1251 $self->SUPER::_draw;
432
433} 1252}
434 1253
435package Crossfire::Client::Widget::Table; 1254#############################################################################
436 1255
437our @ISA = Crossfire::Client::Widget::Bin::; 1256package CFClient::UI::CheckBox;
438 1257
1258our @ISA = CFClient::UI::DrawBG::;
1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1264use SDL;
439use SDL::OpenGL; 1265use SDL::OpenGL;
440 1266
441sub add { 1267sub new {
442 my ($self, $x, $y, $chld) = @_; 1268 my $class = shift;
443 my $old_chld = $self->{childs}[$y][$x];
444 1269
445 $self->{childs}[$y][$x] = $chld; 1270 $class->SUPER::new (
446 $chld->set_parent ($self); 1271 padding => 2,
447 $self->update; 1272 fg => [1, 1, 1],
448} 1273 active_fg => [1, 1, 0],
449 1274 state => 0,
450sub max_row_height { 1275 can_hover => 1,
451 my ($self, $row) = @_;
452
453 my $hs = 0;
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
455 my $c = $self->{childs}->[$row]->[$xi];
456 if ($c) {
457 my ($w, $h) = $c->size_request;
458 if ($hs < $h) { $hs = $h }
459 } 1276 @_
460 } 1277 )
461 return $hs;
462}
463
464sub max_col_width {
465 my ($self, $col) = @_;
466
467 my $ws = 0;
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
469 my $c = ($self->{childs}->[$yi] || [])->[$col];
470 if ($c) {
471 my ($w, $h) = $c->size_request;
472 if ($ws < $w) { $ws = $w }
473 }
474 }
475 return $ws;
476} 1278}
477 1279
478sub size_request { 1280sub size_request {
479 my ($self) = @_; 1281 my ($self) = @_;
480 1282
481 my ($hs, $ws) = (0, 0); 1283 ($self->{padding} * 2 + 6) x 2
1284}
482 1285
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 1286sub size_allocate {
484 $hs += $self->max_row_height ($yi); 1287 my ($self, $x, $y, $w, $h) = @_;
485 }
486 1288
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 1289 $self->_size_allocate ($x, $y, $w, $h);
488 my $wm = 0; 1290}
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
490 $wm += $self->max_col_width ($xi)
491 }
492 if ($ws < $wm) { $ws = $wm }
493 }
494 1291
495 return ($ws, $hs); 1292sub button_down {
1293 my ($self, $ev, $x, $y) = @_;
1294
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1297 $self->{state} = !$self->{state};
1298 $self->emit (changed => $self->{state});
1299 }
496} 1300}
497 1301
498sub _draw { 1302sub _draw {
499 my ($self) = @_; 1303 my ($self) = @_;
500 1304
501 my $y = 0; 1305 $self->SUPER::_draw;
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
503 my $x = 0;
504 1306
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
506 1308
507 my $c = $self->{childs}->[$yi]->[$xi]; 1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
508 if ($c) {
509 $c->move ($x, $y, 0); #TODO: Move to size_request
510 $c->draw if $c;
511 }
512 1310
513 $x += $self->max_col_width ($xi); 1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
514 }
515
516 $y += $self->max_row_height ($yi);
517 }
518}
519
520package Crossfire::Client::Widget::VBox;
521
522our @ISA = Crossfire::Client::Widget::Bin::;
523
524use SDL::OpenGL;
525
526sub add {
527 my ($self, $chld, $expand) = @_;
528 push @{$self->{childs}}, $chld;
529 $chld->{expand} = $expand;
530 $chld->set_parent ($self);
531 $self->update;
532}
533
534sub size_request {
535 my ($self) = @_;
536
537 my ($hs, $ws) = (0, 0);
538 for (@{$self->{childs} || []}) {
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 }
543
544 return ($ws, $hs);
545}
546
547sub size_allocate {
548 my ($self, $w, $h) = @_;
549
550 $self->w ($w);
551 $self->h ($h);
552
553 my $exp;
554 my @oth;
555 # find expand widget
556 for (@{$self->{childs}}) {
557 if ($_->{expand}) {
558 $exp = $_;
559 last;
560 }
561 push @oth, $_;
562 }
563
564 my ($ow, $oh);
565
566 # get sizes of other widgets
567 for (@oth) {
568 my ($w, $h) = $_->size_request;
569 $oh += $h;
570 if ($ow < $w) { $ow = $w }
571 }
572
573 my $y = 0;
574 for (@{$self->{childs}}) {
575 $_->move (0, $y);
576
577 if ($_ == $exp) {
578 $_->size_allocate ($w, $h - $oh);
579 $y += $h - $oh;
580 } else {
581 my ($cw, $h) = $_->size_request;
582 $_->size_allocate ($w, $h);
583 $y += $h;
584 }
585 }
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 my ($x, $y);
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597
598package Crossfire::Client::Widget::Label;
599
600our @ISA = Crossfire::Client::Widget::;
601
602use SDL::OpenGL;
603
604sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_;
606
607 # TODO: color, and make height, xyz etc. optional
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
609
610 $self->set_text ($text);
611
612 $self
613}
614
615sub set_text {
616 my ($self, $text) = @_;
617
618 $self->{text} = $text;
619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
620
621 $self->update;
622}
623
624sub get_text {
625 my ($self, $text) = @_;
626
627 $self->{text}
628}
629
630sub size_request {
631 my ($self) = @_;
632
633 (
634 $self->{texture}{width},
635 $self->{texture}{height},
636 )
637}
638
639sub _draw {
640 my ($self) = @_;
641
642 my $tex = $self->{texture};
643 1312
644 glEnable GL_BLEND; 1313 glEnable GL_BLEND;
645 glEnable GL_TEXTURE_2D; 1314 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1316
1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1318
1319 $tex->draw_quad (0, 0, $s, $s);
1320
1321 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND;
1323}
1324
1325#############################################################################
1326
1327package CFClient::UI::Slider;
1328
1329use strict;
1330
1331use SDL::OpenGL;
1332
1333our @ISA = CFClient::UI::DrawBG::;
1334
1335my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1337 qw(s1_slider.png s1_slider_bg.png);
1338
1339sub new {
1340 my $class = shift;
1341
1342 # range [value, low, high, page]
1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1347 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10],
1351 req_w => 40,
1352 req_h => 13,
1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1356 @_
1357 );
1358
1359 $self
1360}
1361
1362sub size_request {
1363 my ($self) = @_;
1364
1365 my $w = $self->{req_w};
1366 my $h = $self->{req_h};
1367
1368 $self->{vertical} ? ($h, $w) : ($w, $h)
1369}
1370
1371sub button_down {
1372 my ($self, $ev, $x, $y) = @_;
1373
1374 $self->SUPER::button_down ($ev, $x, $y);
1375 $self->mouse_motion ($ev, $x, $y);
1376}
1377
1378sub mouse_motion {
1379 my ($self, $ev, $x, $y) = @_;
1380
1381 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1391 $x = $lo if $x < $lo;
1392 $x = $hi - $page if $x > $hi - $page;
1393 $self->{range}[0] = $x;
1394
1395 $self->emit (changed => $x);
1396 $self->update;
1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1406}
1407
1408sub _draw {
1409 my ($self) = @_;
1410
1411 $self->SUPER::_draw ();
1412
1413 my ($w, $h) = @$self{qw(w h)};
1414
1415 if ($self->{vertical}) {
1416 # draw a vertical slider like a rotated horizontal slider
1417
1418 glRotate 90, 0, 0, 1;
1419 glTranslate 0, -$self->{w}, 0;
1420
1421 ($w, $h) = ($h, $w);
1422 }
1423
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426
1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431
1432 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1434
1435 $w -= $page;
1436 $page &= ~1;
1437 glTranslate $page * 0.5, 0, 0;
1438 $page ||= 2;
1439
1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1442
1443 glEnable GL_BLEND;
1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1445 glEnable GL_TEXTURE_2D;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649 1447
650 glColor 1, 0, 0, 1; # TODO color 1448 # draw background
1449 $tex[1]->draw_quad (0, 0, $w, $h);
651 1450
652 glBegin GL_QUADS; 1451 # draw handle
653 glTexCoord 0, 0; glVertex 0 , 0; 1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
654 glTexCoord 0, 1; glVertex 0 , $tex->{height};
655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
656 glTexCoord 1, 0; glVertex $tex->{width}, 0;
657 glEnd;
658 1453
659 glDisable GL_BLEND; 1454 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
661} 1456}
662 1457
663package Crossfire::Client::Widget::TextEntry; 1458#############################################################################
664 1459
665our @ISA = Crossfire::Client::Widget::Label::; 1460package CFClient::UI::TextView;
1461
1462our @ISA = CFClient::UI::HBox::;
1463
1464use SDL::OpenGL;
1465
1466sub new {
1467 my $class = shift;
1468
1469 my $self = $class->SUPER::new (
1470 req_w => $::WIDTH / 6,
1471 req_h => $::HEIGHT / 6,
1472 fontsize => $::FONTSIZE,
1473 @_,
1474
1475 layout => (new CFClient::Layout),
1476 par => [],
1477 height => 0,
1478 children => [
1479 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1),
1481 ],
1482 );
1483
1484 $self
1485}
1486
1487sub text_height {
1488 my ($self, $text) = @_;
1489
1490 my $layout = $self->{layout};
1491
1492 $layout->set_height ($self->{fontsize});
1493 $layout->set_width ($self->{w});
1494 $layout->set_text ($text);
1495
1496 ($layout->size)[1]
1497}
1498
1499sub reflow {
1500 my ($self) = @_;
1501
1502 my $height = 0;
1503
1504 for (@{$self->{par}}) {
1505 $height += $_->[0] = $self->text_height ($_->[2]);
1506 }
1507
1508 $self->{height} = $height;
1509
1510 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 ($self->{req_w}, $self->{req_h})
1517}
1518
1519sub size_allocate {
1520 my ($self, $x, $y, $w, $h) = @_;
1521
1522 $self->SUPER::size_allocate ($x, $y, $w, $h);
1523
1524 $self->{layout}->set_height ($self->{fontsize});
1525 $self->{layout}->set_width ($self->{w});
1526
1527 $self->reflow;
1528 $self->update;
1529}
1530
1531sub add_paragraph {
1532 my ($self, $color, $text) = @_;
1533
1534 #TODO: intelligently "reformat" paragraph
1535
1536 my $height = $self->text_height ($text);
1537
1538 $self->{height} += $height;
1539
1540 push @{$self->{par}}, [$height, $color, $text];
1541
1542 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1543 $self->{children}[1]->update;
1544}
1545
1546sub update {
1547 my ($self) = @_;
1548
1549 $self->SUPER::update;
1550
1551 return unless $self->{h} > 0;
1552
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT;
1556
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564
1565 my $y = 0;
1566
1567 my $layout = $self->{layout};
1568
1569 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0];
1571
1572 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]);
1574
1575 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1578 }
1579
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND;
1585 };
1586}
1587
1588sub _draw {
1589 my ($self) = @_;
1590
1591 if ($self->{texture}) {
1592 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D;
1596 }
1597
1598}
1599
1600#############################################################################
1601
1602package CFClient::UI::MapWidget;
1603
1604use strict;
1605
1606use List::Util qw(min max);
666 1607
667use SDL; 1608use SDL;
668use SDL::OpenGL; 1609use SDL::OpenGL;
669 1610
670sub key_down { 1611our @ISA = CFClient::UI::Base::;
671 my ($self, $ev) = @_;
672 1612
673 my $mod = $ev->key_mod; 1613sub new {
674 my $sym = $ev->key_sym; 1614 my $class = shift;
675 1615
676 $ev->set_unicode (1); 1616 $class->SUPER::new (
677 my $uni = $ev->key_unicode; 1617 z => -1,
678 1618 can_focus => 1,
679 my $text = $self->get_text; 1619 list => (glGenLists 1),
680 1620 @_
681 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, '';
683
684 } elsif ($uni) {
685 $text .= chr $uni;
686 } 1621 )
687 $self->set_text ($text);
688} 1622}
689
690package Crossfire::Client::Widget::MapWidget;
691
692use strict;
693
694use List::Util qw(min max);
695
696use SDL;
697use SDL::OpenGL;
698use SDL::OpenGL::Constants;
699
700our @ISA = Crossfire::Client::Widget::;
701 1623
702sub key_down { 1624sub key_down {
703 print "MAPKEYDOWN\n"; 1625 print "MAPKEYDOWN\n";
704} 1626}
705 1627
706sub key_up { 1628sub key_up {
707} 1629}
708 1630
709sub size_request { 1631sub size_request {
710 1632 (
1633 1 + 32 * int $::WIDTH / 32,
1634 1 + 32 * int $::HEIGHT / 32,
1635 )
711} 1636}
712 1637
713sub size_allocate { 1638sub update {
714} 1639 my ($self) = @_;
715 1640
1641 $self->{need_update} = 1;
1642 $self->SUPER::update;
1643}
1644
716sub _draw { 1645sub draw {
717 my ($self) = @_; 1646 my ($self) = @_;
718 1647
719 my $mx = $::CONN->{mapx}; 1648 $self->{need_update}++;#d#
720 my $my = $::CONN->{mapy}; 1649 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE;
721 1651
722 my $map = $::CONN->{map};
723
724 my ($xofs, $yofs);
725
726 my $sw = 1 + int $::WIDTH / 32; 1652 my $sw = int $::WIDTH / 32;
727 my $sh = 1 + int $::HEIGHT / 32; 1653 my $sh = int $::HEIGHT / 32;
728 1654
729 if ($::CONN->{mapw} > $sw) { 1655 if ($::MAP) {
730 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
731 } else {
732 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
733 }
734 1657
735 if ($::CONN->{maph} > $sh) { 1658 if ($::CFG->{fow_enable}) {
736 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1659 if ($::CFG->{fow_smooth}) { # smooth fog of war
737 } else { 1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1661 glConvolutionFilter2D
739 } 1662 GL_CONVOLUTION_2D,
740 1663 GL_ALPHA,
741 glEnable GL_TEXTURE_2D; 1664 3, 3,
742 glEnable GL_BLEND; 1665 GL_ALPHA, GL_FLOAT,
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1666 pack "f*",
744 1667 0.1, 0.1, 0.1,
745 my $sw4 = ($sw + 3) & ~3; 1668 0.1, 0.2, 0.1,
746 my $lighting = "\x00" x ($sw4 * $sh); 1669 0.1, 0.1, 0.1,
747 1670 ;
748 for my $x (0 .. $sw - 1) { 1671 glEnable GL_CONVOLUTION_2D;
749 for my $y (0 .. $sh - 1) {
750
751 my $cell = $map->[$x + $xofs][$y + $yofs]
752 or next;
753
754 my $darkness = $cell->[0] * (1 / 255);
755 if ($darkness < 0) {
756 $darkness = 0.15;
757 } 1672 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759 1673
760 for my $num (grep $_, @$cell[1,2,3]) { 1674 my $tex = new CFClient::Texture
761 my $tex = $::CONN->{face}[$num]{texture} || next; 1675 w => $w,
1676 h => $h,
1677 data => $data,
1678 internalformat => GL_ALPHA,
1679 format => GL_ALPHA;
762 1680
763 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
764 1682
765 my $w = $tex->{width}; 1683 glEnable GL_BLEND;
766 my $h = $tex->{height}; 1684 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
767 1686
768 my $px = ($x + 1) * 32 - $w; 1687 glColor +($::CFG->{fow_intensity}) x 3, 1;
769 my $py = ($y + 1) * 32 - $h; 1688 $tex->draw_quad (0, 0, $w * 32, $h * 32);
770 1689
771 glBegin GL_QUADS; 1690 glDisable GL_TEXTURE_2D;
772 glTexCoord 0, 0; glVertex $px , $py; 1691 glDisable GL_BLEND;
773 glTexCoord 0, 1; glVertex $px , $py + $h;
774 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
775 glTexCoord 1, 0; glVertex $px + $w, $py;
776 glEnd;
777 } 1692 }
778 } 1693 }
779 }
780 1694
781# if (1) { # higher quality darkness 1695 glEndList;
782# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784#
785# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
786#
787# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs;
789# } 1696 }
790 1697
791 $lighting = new Crossfire::Client::Texture 1698 glCallList $self->{list};
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797 1699
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1700 if ($FOCUS != $self) {
799 glColor 0, 0, 0, 0.75; 1701 glColor 64/255, 64/255, 64/255;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1702 glLogicOp GL_AND;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1703 glEnable GL_COLOR_LOGIC_OP;
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS; 1704 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0; 1705 glVertex 0, 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32; 1706 glVertex 0, $::HEIGHT;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; 1707 glVertex $::WIDTH, $::HEIGHT;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0; 1708 glVertex $::WIDTH, 0;
808 glEnd; 1709 glEnd;
809 1710 glDisable GL_COLOR_LOGIC_OP;
810 glDisable GL_TEXTURE_2D; 1711 }
811 glDisable GL_BLEND;
812} 1712}
813 1713
814my %DIR = ( 1714my %DIR = (
815 SDLK_KP8, [1, "north"], 1715 SDLK_KP8, [1, "north"],
816 SDLK_KP9, [2, "northeast"], 1716 SDLK_KP9, [2, "northeast"],
… …
832 1732
833 my $mod = $ev->key_mod; 1733 my $mod = $ev->key_mod;
834 my $sym = $ev->key_sym; 1734 my $sym = $ev->key_sym;
835 1735
836 if ($sym == SDLK_KP5) { 1736 if ($sym == SDLK_KP5) {
837 $::CONN->send ("command stay fire"); 1737 $::CONN->user_send ("command stay fire");
1738 } elsif ($sym == SDLK_a) {
1739 $::CONN->user_send ("command apply");
1740 } elsif ($sym == SDLK_QUOTE) {
1741 $self->emit ('activate_console');
1742 } elsif ($sym == SDLK_SLASH) {
1743 $self->emit ('activate_console' => '/');
838 } elsif (exists $DIR{$sym}) { 1744 } elsif (exists $DIR{$sym}) {
839 if ($mod & KMOD_SHIFT) { 1745 if ($mod & KMOD_SHIFT) {
840 $self->{shft}++; 1746 $self->{shft}++;
841 $::CONN->send ("command fire $DIR{$sym}[0]"); 1747 $::CONN->user_send ("command fire $DIR{$sym}[0]");
842 } elsif ($mod & KMOD_CTRL) { 1748 } elsif ($mod & KMOD_CTRL) {
843 $self->{ctrl}++; 1749 $self->{ctrl}++;
844 $::CONN->send ("command run $DIR{$sym}[0]"); 1750 $::CONN->user_send ("command run $DIR{$sym}[0]");
845 } else { 1751 } else {
846 $::CONN->send ("command $DIR{$sym}[1]"); 1752 $::CONN->user_send ("command $DIR{$sym}[1]");
847 } 1753 }
848 } 1754 }
849} 1755}
850 1756
851sub key_up { 1757sub key_up {
… …
853 1759
854 my $mod = $ev->key_mod; 1760 my $mod = $ev->key_mod;
855 my $sym = $ev->key_sym; 1761 my $sym = $ev->key_sym;
856 1762
857 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1763 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
858 $::CONN->send ("command fire_stop"); 1764 $::CONN->user_send ("command fire_stop");
859 } 1765 }
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1766 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop"); 1767 $::CONN->user_send ("command run_stop");
862 } 1768 }
863} 1769}
864 1770
865package Crossfire::Client::Widget::Animator; 1771#############################################################################
1772
1773package CFClient::UI::Animator;
866 1774
867use SDL::OpenGL; 1775use SDL::OpenGL;
868 1776
869our @ISA = Crossfire::Client::Widget::Bin::; 1777our @ISA = CFClient::UI::Bin::;
870 1778
871sub moveto { 1779sub moveto {
872 my ($self, $x, $y) = @_; 1780 my ($self, $x, $y) = @_;
873 1781
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1782 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.2; 1783 $self->{speed} = 0.001;
876 $self->{time} = 1; 1784 $self->{time} = 1;
877 1785
878 ::animation_start $self; 1786 ::animation_start $self;
879} 1787}
880 1788
… …
895 1803
896sub _draw { 1804sub _draw {
897 my ($self) = @_; 1805 my ($self) = @_;
898 1806
899 glPushMatrix; 1807 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 1808 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 1809 $self->{children}[0]->draw;
902 glPopMatrix; 1810 glPopMatrix;
903} 1811}
904 1812
9051; 1813#############################################################################
906 1814
1815package CFClient::UI::Flopper;
1816
1817our @ISA = CFClient::UI::Button::;
1818
1819sub new {
1820 my $class = shift;
1821
1822 my $self = $class->SUPER::new (
1823 state => 0,
1824 connect_activate => \&toggle_flopper,
1825 @_
1826 );
1827
1828 if ($self->{state}) {
1829 $self->{state} = 0;
1830 $self->toggle_flopper;
1831 }
1832
1833 $self
1834}
1835
1836sub toggle_flopper {
1837 my ($self) = @_;
1838
1839 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other});
1842 $self->{other}->move (
1843 ($::WIDTH - $self->{other}{w}) * 0.5,
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1848 }
1849}
1850
1851#############################################################################
1852
1853package CFClient::UI::Toplevel;
1854
1855our @ISA = CFClient::UI::Container::;
1856
1857sub size_request {
1858 ($::WIDTH, $::HEIGHT)
1859}
1860
1861sub size_allocate {
1862 my ($self, $x, $y, $w, $h) = @_;
1863
1864 $self->_size_allocate ($x, $y, $w, $h);
1865
1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867 for @{$self->{children}};
1868}
1869
1870sub translate {
1871 my ($self, $x, $y) = @_;
1872
1873 ($x, $y)
1874}
1875
1876sub update {
1877 my ($self) = @_;
1878
1879 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1880 ::refresh ();
1881}
1882
1883sub add {
1884 my ($self, $widget) = @_;
1885
1886 $self->SUPER::add ($widget);
1887
1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1889}
1890
1891sub draw {
1892 my ($self) = @_;
1893
1894 $self->_draw;
1895}
1896
1897#############################################################################
1898
1899package CFClient::UI;
1900
1901$TOPLEVEL = new CFClient::UI::Toplevel;
1902
19031
1904

Diff Legend

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