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.74 by root, Tue Apr 11 19:31:18 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_down ($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;
67 $HOVER->update if $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 bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 @_
89 }, $class
22} 90}
23 91
24sub move { 92sub move {
25 my ($self, $x, $y, $z) = @_; 93 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 94 $self->{x} = $x;
… …
37 Carp::confess "size_request is abtract"; 105 Carp::confess "size_request is abtract";
38} 106}
39 107
40sub size_allocate { 108sub size_allocate {
41 my ($self, $w, $h) = @_; 109 my ($self, $w, $h) = @_;
110
42 $self->w ($w); 111 $self->{w} = $w;
43 $self->h ($h); 112 $self->{h} = $h;
113}
114
115# translate global koordinates to local coordinate system
116sub translate {
117 my ($self, $x, $y) = @_;
118
119 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 120}
45 121
46sub focus_in { 122sub focus_in {
47 my ($widget) = @_; 123 my ($self) = @_;
48 $FOCUS = $widget; 124
125 return if $FOCUS == $self;
126
127 my $focus = $FOCUS; $FOCUS = $self;
128 $focus->update if $focus;
129 $FOCUS->update;
49} 130}
50 131
51sub focus_out { 132sub focus_out {
52 my ($widget) = @_; 133 my ($self) = @_;
53}
54 134
135 return unless $FOCUS == $self;
136
137 my $focus = $FOCUS; undef $FOCUS;
138 $focus->update if $focus; #?
139}
140
141sub mouse_motion { }
142sub button_up { }
55sub key_down { 143sub key_down { }
56 my ($widget, $sdlev) = @_;
57}
58
59sub key_up { 144sub key_up { }
60 my ($widget, $sdlev) = @_;
61}
62 145
63sub button_down { 146sub button_down {
64 my ($widget, $sdlev) = @_; 147 my ($self, $ev, $x, $y) = @_;
65}
66 148
67sub button_up { 149 $self->focus_in;
68 my ($widget, $sdlev) = @_;
69} 150}
70 151
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 152sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 153sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 154sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 155sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 156sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 157
77sub draw { 158sub draw {
78 my ($self) = @_; 159 my ($self) = @_;
160
161 return unless $self->{h} && $self->{w};
79 162
80 glPushMatrix; 163 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 164 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 165 $self->_draw;
83 glPopMatrix; 166 glPopMatrix;
167
168 if ($self == $HOVER) {
169 my ($x, $y) = @$self{qw(x y)};
170
171 glColor 1, 1, 1, 0.1;
172 glEnable GL_BLEND;
173 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
174 glBegin GL_QUADS;
175 glVertex $x , $y;
176 glVertex $x + $self->{w}, $y;
177 glVertex $x + $self->{w}, $y + $self->{h};
178 glVertex $x , $y + $self->{h};
179 glEnd;
180 glDisable GL_BLEND;
181 }
84} 182}
85 183
86sub _draw { 184sub _draw {
87 my ($widget) = @_; 185 my ($self) = @_;
186
187 warn "no draw defined for $self\n";
88} 188}
89 189
90sub bbox { 190sub bbox {
91 my ($self) = @_; 191 my ($self) = @_;
92 my ($w, $h) = $self->size_request; 192 my ($w, $h) = $self->size_request;
… …
96 $self->{x} = $w, 196 $self->{x} = $w,
97 $self->{y} = $h 197 $self->{y} = $h
98 ) 198 )
99} 199}
100 200
201sub find_widget {
202 my ($self, $x, $y) = @_;
203
204 return $self
205 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
206 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
207
208 ()
209}
210
101sub del_parent { $_[0]->{parent} = undef } 211sub del_parent { $_[0]->{parent} = undef }
102 212
103sub set_parent { 213sub set_parent {
104 my ($self, $par) = @_; 214 my ($self, $par) = @_;
105 215
… …
116 226
117 $self->{parent}->update 227 $self->{parent}->update
118 if $self->{parent}; 228 if $self->{parent};
119} 229}
120 230
231sub connect {
232 my ($self, $signal, $cb) = @_;
233
234 push @{ $self->{cb}{$signal} }, $cb;
235}
236
237sub emit {
238 my ($self, $signal, @args) = @_;
239
240 $_->($self, @args)
241 for @{$self->{cb}{$signal} || []};
242}
243
121sub DESTROY { 244sub DESTROY {
122 my ($self) = @_; 245 my ($self) = @_;
123 246
124 #$self->deactivate; 247 #$self->deactivate;
125} 248}
126 249
127package Crossfire::Client::Widget::Bin; 250#############################################################################
128 251
129our @ISA = Crossfire::Client::Widget::; 252package CFClient::UI::DrawBG;
130 253
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] } 254our @ISA = CFClient::UI::Base::;
132sub get { $_[0]->{child} } 255
256use strict;
257use SDL::OpenGL;
258
259sub new {
260 my $class = shift;
261
262 # range [value, low, high, page]
263
264 $class->SUPER::new (
265 bg => [0, 0, 0, 0.4],
266 active_bg => [1, 1, 1],
267 @_
268 )
269}
270
271sub _draw {
272 my ($self) = @_;
273
274 my ($w, $h) = @$self{qw(w h)};
275
276 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
277 glBegin GL_QUADS;
278 glVertex 0 , 0;
279 glVertex 0 , $h;
280 glVertex $w, $h;
281 glVertex $w, 0;
282 glEnd;
283}
284
285#############################################################################
286
287package CFClient::UI::Empty;
288
289our @ISA = CFClient::UI::Base::;
290
291sub size_request {
292 (0, 0)
293}
294
295sub draw { }
296
297#############################################################################
298
299package CFClient::UI::Container;
300
301our @ISA = CFClient::UI::Base::;
302
303sub new {
304 my ($class, %arg) = @_;
305
306 my $children = delete $arg{children} || [];
307
308 my $self = $class->SUPER::new (children => [], %arg);
309 $self->add ($_) for @$children;
310
311 $self
312}
313
314sub add {
315 my ($self, $chld, $expand) = @_;
316
317 $chld->{expand} = $expand;
318 $chld->set_parent ($self);
319
320 $self->{children} = [
321 sort { $a->{z} <=> $b->{z} }
322 @{$self->{children}}, $chld
323 ];
324
325 $self->size_allocate ($self->{w}, $self->{h})
326 if $self->{w}; #TODO: check for "realised state"
327}
133 328
134sub remove { 329sub remove {
135 my ($self, $chld) = @_; 330 my ($self, $widget) = @_;
136 delete $self->{child} 331
137 if $self->{child} == $chld; 332 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
333
334 $self->size_allocate ($self->{w}, $self->{h});
138} 335}
336
337sub find_widget {
338 my ($self, $x, $y) = @_;
339
340 $x -= $self->{x};
341 $y -= $self->{y};
342
343 my $res;
344
345 for (reverse @{ $self->{children} }) {
346 $res = $_->find_widget ($x, $y)
347 and return $res;
348 }
349
350 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
351}
352
353sub _draw {
354 my ($self) = @_;
355
356 $_->draw for @{$self->{children}};
357}
358
359#############################################################################
360
361package CFClient::UI::Bin;
362
363our @ISA = CFClient::UI::Container::;
364
365sub new {
366 my ($class, %arg) = @_;
367
368 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
369
370 $class->SUPER::new (children => [$child], %arg)
371}
372
373sub add {
374 my ($self, $widget) = @_;
375
376 $self->{children} = [];
377
378 $self->SUPER::add ($widget);
379}
380
381sub remove {
382 my ($self, $widget) = @_;
383
384 $self->SUPER::remove ($widget);
385
386 $self->{children} = [new CFClient::UI::Empty]
387 unless @{$self->{children}};
388}
389
390sub child { $_[0]->{children}[0] }
139 391
140sub size_request { 392sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 393 $_[0]{children}[0]->size_request
142} 394}
395
143sub size_allocate { 396sub size_allocate {
144 my ($self, $w, $h) = @_; 397 my ($self, $w, $h) = @_;
398
399 return unless $self->{w} != $w || $self->{h} != $h;
400
145 $self->SUPER::size_allocate ($w, $h); 401 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h) 402 $self->{children}[0]->size_allocate ($w, $h);
147 if $self->{child}
148} 403}
149 404
150sub _draw { 405#############################################################################
151 my ($self) = @_;
152 406
153 $self->{child}->draw; 407package CFClient::UI::Window;
154}
155 408
156package Crossfire::Client::Widget::Toplevel; 409our @ISA = CFClient::UI::Bin::;
157
158our @ISA = Crossfire::Client::Widget::;
159 410
160use SDL::OpenGL; 411use SDL::OpenGL;
161 412
162sub add { 413sub new {
163 my ($self, $chld) = @_; 414 my ($class, %arg) = @_;
164 415
165 push @{$self->{childs}}, $chld; 416 my $self = $class->SUPER::new (%arg);
166 @{$self->{childs}} =
167 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}};
169
170 $chld->set_parent ($self);
171 $chld->size_allocate ($chld->size_request);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 417}
181 418
182sub update { 419sub update {
183 my ($self) = @_; 420 my ($self) = @_;
184 ::refresh ();
185}
186 421
187sub _draw { 422 # 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; 423 $self->render_chld;
424 $self->SUPER::update;
215} 425}
216 426
217sub render_chld { 427sub render_chld {
218 my ($self) = @_; 428 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 429
222 require Carp;
223 Carp::cluck "RENDERCHI $w $h";
224 warn "RENDERCHI $w $h\n";
225 $self->{texture} = 430 $self->{texture} =
226 Crossfire::Client::Texture->new_from_opengl ( 431 CFClient::Texture->new_from_opengl (
227 $w, $h, sub { $chld->draw } 432 $self->{w}, $self->{h}, sub { $self->child->draw }
228 ); 433 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 434}
236 435
237sub size_allocate { 436sub size_allocate {
238 my ($self, $w, $h) = @_; 437 my ($self, $w, $h) = @_;
239 438
439 return unless $self->{w} != $w || $self->{h} != $h;
440
240 $self->w ($w); 441 $self->{w} = $w;
241 $self->h ($h); 442 $self->{h} = $h;
443
242 $self->get->size_allocate ($w, $h); 444 $self->child->size_allocate ($w, $h);
243 445
244 $self->update; #TODO: Move this to the size_request event propably? 446 $self->render_chld;
245} 447}
246 448
247sub _draw { 449sub _draw {
248 my ($self) = @_; 450 my ($self) = @_;
249 451
… …
251 453
252 my $tex = $self->{texture} 454 my $tex = $self->{texture}
253 or return; 455 or return;
254 456
255 glEnable GL_BLEND; 457 glEnable GL_BLEND;
458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
256 glEnable GL_TEXTURE_2D; 459 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 461
260 glBegin GL_QUADS; 462 $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 463
267 glDisable GL_BLEND; 464 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 465 glDisable GL_TEXTURE_2D;
269} 466}
270 467
271package Crossfire::Client::Widget::Frame; 468#############################################################################
272 469
273our @ISA = Crossfire::Client::Widget::Bin::; 470package CFClient::UI::Frame;
471
472our @ISA = CFClient::UI::Bin::;
274 473
275use SDL::OpenGL; 474use SDL::OpenGL;
276 475
277sub size_request { 476sub size_request {
278 my ($self) = @_; 477 my ($self) = @_;
279 my $chld = $self->get 478 my $chld = $self->child
280 or return (0, 0); 479 or return (0, 0);
281 480
282 $chld->move (2, 2); 481 $chld->move (2, 2);
283 482
284 map { $_ + 4 } $chld->size_request; 483 map { $_ + 4 } $chld->size_request;
285} 484}
286 485
287sub size_allocate { 486sub size_allocate {
288 my ($self, $w, $h) = @_; 487 my ($self, $w, $h) = @_;
488
489 return unless $self->{w} != $w || $self->{h} != $h;
289 490
290 $self->w ($w); 491 $self->{w} = $w;
291 $self->h ($h); 492 $self->{h} = $h;
292 493
293 $self->get->size_allocate ($w - 4, $h - 4); 494 $self->child->size_allocate ($w - 4, $h - 4);
294 $self->get->move (2, 2); 495 $self->child->move (2, 2);
295} 496}
296 497
297sub _draw { 498sub _draw {
298 my ($self) = @_; 499 my ($self) = @_;
299 500
300 my $chld = $self->get; 501 my $chld = $self->child;
301 502
302 my ($w, $h) = $chld->size_request; 503 my ($w, $h) = $chld->size_request;
303 504
304 glBegin GL_QUADS; 505 glBegin GL_QUADS;
305 glColor 0, 0, 0; 506 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0; 507 glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4; 508 glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 509 glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0; 510 glVertex $w + 4 , 0;
310 glEnd; 511 glEnd;
311 512
312 $chld->draw; 513 $chld->draw;
313} 514}
314 515
516#############################################################################
517
315package Crossfire::Client::Widget::FancyFrame; 518package CFClient::UI::FancyFrame;
316 519
317our @ISA = Crossfire::Client::Widget::Frame::; 520our @ISA = CFClient::UI::Bin::;
318 521
319use SDL::OpenGL; 522use SDL::OpenGL;
320 523
321sub new { 524my @tex =
322 my ($self, $theme) = @_;
323 $self = $self->SUPER::new;
324
325 $self->{txts} = [
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 525 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 526 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
328 ];
329 $self
330}
331 527
332sub size_request { 528sub size_request {
333 my ($self) = @_; 529 my ($self) = @_;
530
334 my ($w, $h) = $self->get->size_request; 531 my ($w, $h) = $self->SUPER::size_request;
335 532
336 $h += $self->{txts}->[1]->{height}; 533 $h += $tex[1]->{h};
337 $h += $self->{txts}->[4]->{height}; 534 $h += $tex[4]->{h};
338 $w += $self->{txts}->[2]->{width}; 535 $w += $tex[2]->{w};
339 $w += $self->{txts}->[3]->{width}; 536 $w += $tex[3]->{w};
340 537
341 ($w, $h) 538 ($w, $h)
342} 539}
343 540
344sub size_allocate { 541sub size_allocate {
345 my ($self, $w, $h) = @_; 542 my ($self, $w, $h) = @_;
346 543
347 $self->w ($w); 544 return unless $self->{w} != $w || $self->{h} != $h;
348 $self->h ($h); 545
349 $h -= $self->{txts}->[1]->{height}; 546 $self->SUPER::size_allocate ($w, $h);
350 $h -= $self->{txts}->[4]->{height}; 547
351 $w -= $self->{txts}->[2]->{width}; 548 $h -= $tex[1]->{h};
352 $w -= $self->{txts}->[3]->{width}; 549 $h -= $tex[4]->{h};
550 $w -= $tex[2]->{w};
551 $w -= $tex[3]->{w};
353 552
354 $h = $h < 0 ? 0 : $h; 553 $h = $h < 0 ? 0 : $h;
355 $w = $w < 0 ? 0 : $w; 554 $w = $w < 0 ? 0 : $w;
356 warn "CHILD:$w $h\n"; 555
556 my $child = $self->child;
557
357 $self->get->size_allocate ($w, $h); 558 $child->size_allocate ($w, $h);
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 559 $child->move ($tex[3]->{w}, $tex[1]->{h});
359} 560}
360 561
361sub _draw { 562sub _draw {
362 my ($self) = @_; 563 my ($self) = @_;
363 564
364 my ($w, $h) = ($self->w, $self->h); 565 my ($w, $h) = ($self->{w}, $self->{h});
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 566 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
366 567
367 glEnable GL_BLEND; 568 glEnable GL_BLEND;
569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
368 glEnable GL_TEXTURE_2D; 570 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 572
372 my $top = $self->{txts}->[1]; 573 my $top = $tex[1];
373 glBindTexture GL_TEXTURE_2D, $top->{name}; 574 $top->draw_quad (0, 0, $w, $top->{h});
374 575
375 glBegin GL_QUADS;
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]; 576 my $left = $tex[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name}; 577 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
384 578
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]; 579 my $right = $tex[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name}; 580 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
394 581
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]; 582 my $bottom = $tex[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 583 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
404 584
405 glBegin GL_QUADS; 585 my $bg = $tex[0];
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}; 586 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 588 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 589 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417 590
418 my $rep_x = $cw / $bg->{width}; 591 my $rep_x = $cw / $bg->{w};
419 my $rep_y = $ch / $bg->{height}; 592 my $rep_y = $ch / $bg->{h};
420 593
421 glBegin GL_QUADS; 594 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
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 595
428 glDisable GL_BLEND; 596 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D; 597 glDisable GL_TEXTURE_2D;
430 598
431 $self->get->draw; 599 $self->child->draw;
432 600
433} 601}
434 602
435package Crossfire::Client::Widget::Table; 603#############################################################################
436 604
437our @ISA = Crossfire::Client::Widget::Bin::; 605package CFClient::UI::Table;
606
607our @ISA = CFClient::UI::Base::;
438 608
439use SDL::OpenGL; 609use SDL::OpenGL;
440 610
441sub add { 611sub add {
442 my ($self, $x, $y, $chld) = @_; 612 my ($self, $x, $y, $chld) = @_;
443 my $old_chld = $self->{childs}[$y][$x]; 613 my $old_chld = $self->{children}[$y][$x];
444 614
445 $self->{childs}[$y][$x] = $chld; 615 $self->{children}[$y][$x] = $chld;
446 $chld->set_parent ($self); 616 $chld->set_parent ($self);
447 $self->update; 617 $self->update;
448} 618}
449 619
450sub max_row_height { 620sub max_row_height {
451 my ($self, $row) = @_; 621 my ($self, $row) = @_;
452 622
453 my $hs = 0; 623 my $hs = 0;
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 624 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
455 my $c = $self->{childs}->[$row]->[$xi]; 625 my $c = $self->{children}->[$row]->[$xi];
456 if ($c) { 626 if ($c) {
457 my ($w, $h) = $c->size_request; 627 my ($w, $h) = $c->size_request;
458 if ($hs < $h) { $hs = $h } 628 if ($hs < $h) { $hs = $h }
459 } 629 }
460 } 630 }
… …
463 633
464sub max_col_width { 634sub max_col_width {
465 my ($self, $col) = @_; 635 my ($self, $col) = @_;
466 636
467 my $ws = 0; 637 my $ws = 0;
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 638 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
469 my $c = ($self->{childs}->[$yi] || [])->[$col]; 639 my $c = ($self->{children}->[$yi] || [])->[$col];
470 if ($c) { 640 if ($c) {
471 my ($w, $h) = $c->size_request; 641 my ($w, $h) = $c->size_request;
472 if ($ws < $w) { $ws = $w } 642 if ($ws < $w) { $ws = $w }
473 } 643 }
474 } 644 }
… …
478sub size_request { 648sub size_request {
479 my ($self) = @_; 649 my ($self) = @_;
480 650
481 my ($hs, $ws) = (0, 0); 651 my ($hs, $ws) = (0, 0);
482 652
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 653 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
484 $hs += $self->max_row_height ($yi); 654 $hs += $self->max_row_height ($yi);
485 } 655 }
486 656
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 657 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
488 my $wm = 0; 658 my $wm = 0;
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 659 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
490 $wm += $self->max_col_width ($xi) 660 $wm += $self->max_col_width ($xi)
491 } 661 }
492 if ($ws < $wm) { $ws = $wm } 662 if ($ws < $wm) { $ws = $wm }
493 } 663 }
494 664
… …
497 667
498sub _draw { 668sub _draw {
499 my ($self) = @_; 669 my ($self) = @_;
500 670
501 my $y = 0; 671 my $y = 0;
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 672 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
503 my $x = 0; 673 my $x = 0;
504 674
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 675 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
506 676
507 my $c = $self->{childs}->[$yi]->[$xi]; 677 my $c = $self->{children}->[$yi]->[$xi];
508 if ($c) { 678 if ($c) {
509 $c->move ($x, $y, 0); #TODO: Move to size_request 679 $c->move ($x, $y, 0); #TODO: Move to size_request
510 $c->draw if $c; 680 $c->draw if $c;
511 } 681 }
512 682
… …
515 685
516 $y += $self->max_row_height ($yi); 686 $y += $self->max_row_height ($yi);
517 } 687 }
518} 688}
519 689
520package Crossfire::Client::Widget::VBox; 690#############################################################################
521 691
522our @ISA = Crossfire::Client::Widget::Bin::; 692package CFClient::UI::VBox;
693
694our @ISA = CFClient::UI::Container::;
523 695
524use SDL::OpenGL; 696use SDL::OpenGL;
525 697
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 { 698sub size_request {
535 my ($self) = @_; 699 my ($self) = @_;
536 700
537 my ($hs, $ws) = (0, 0); 701 my @alloc = map [$_->size_request], @{$self->{children}};
538 for (@{$self->{childs} || []}) { 702
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 } 703 (
543 704 (List::Util::max map $_->[0], @alloc),
544 return ($ws, $hs); 705 (List::Util::sum map $_->[1], @alloc),
706 )
545} 707}
546 708
547sub size_allocate { 709sub size_allocate {
548 my ($self, $w, $h) = @_; 710 my ($self, $w, $h) = @_;
549 711
712 return unless $self->{w} != $w || $self->{h} != $h;
713
550 $self->w ($w); 714 $self->{w} = $w;
551 $self->h ($h); 715 $self->{h} = $h;
552 716
553 my $exp; 717 return unless $self->{h};
554 my @oth; 718
555 # find expand widget 719 my $children = $self->{children};
556 for (@{$self->{childs}}) { 720
557 if ($_->{expand}) { 721 my @h = map +($_->size_request)[1], @$children;
558 $exp = $_; 722
559 last; 723 my $req_h = List::Util::sum @h;
724
725 if ($req_h > $h) {
726 # ah well, not enough space
727 $_ = $h[$_] * $h / $req_h for @h;
728 } else {
729 my @exp = grep $_->{expand}, @$children;
730 @exp = @$children unless @exp;
731
732 my %exp = map +($_ => 1), @exp;
733
734 for (0 .. $#$children) {
735 my $child = $children->[$_];
736
737 my $alloc_h = $h[$_];
738 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
739 $h[$_] = $alloc_h;
560 } 740 }
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 } 741 }
572 742
573 my $y = 0; 743 my $y = 0;
574 for (@{$self->{childs}}) { 744 for (0 .. $#$children) {
745 my $child = $children->[$_];
746 my $h = $h[$_];
575 $_->move (0, $y); 747 $child->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); 748 $child->size_allocate ($w, $h);
749
583 $y += $h; 750 $y += $h;
584 }
585 } 751 }
586} 752}
587 753
588sub _draw { 754#############################################################################
589 my ($self) = @_;
590 755
591 my ($x, $y); 756package CFClient::UI::Label;
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597 757
598package Crossfire::Client::Widget::Label; 758our @ISA = CFClient::UI::Base::;
599
600our @ISA = Crossfire::Client::Widget::;
601 759
602use SDL::OpenGL; 760use SDL::OpenGL;
603 761
604sub new { 762sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_; 763 my ($class, %arg) = @_;
606 764
607 # TODO: color, and make height, xyz etc. optional 765 my $self = $class->SUPER::new (
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 766 fg => [1, 1, 1],
767 height => $::FONTSIZE,
768 text => "",
769 align => -1,
770 layout => new CFClient::Layout,
771 %arg
772 );
609 773
610 $self->set_text ($text); 774 $self->set_text ($self->{text});
611 775
612 $self 776 $self
777}
778
779sub escape_text {
780 local $_ = $_[1];
781
782 s/&/&amp;/g;
783 s/>/&gt;/g;
784 s/</&lt;/g;
785
786 $_[1]
613} 787}
614 788
615sub set_text { 789sub set_text {
616 my ($self, $text) = @_; 790 my ($self, $text) = @_;
617 791
618 $self->{text} = $text; 792 $self->{text} = $text;
619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 793 $self->{layout}->set_markup ($text);
620 794
795 delete $self->{texture};
621 $self->update; 796 $self->update;
622} 797}
623 798
624sub get_text { 799sub get_text {
625 my ($self, $text) = @_; 800 my ($self, $text) = @_;
… …
628} 803}
629 804
630sub size_request { 805sub size_request {
631 my ($self) = @_; 806 my ($self) = @_;
632 807
633 ( 808 $self->{layout}->set_width;
809 $self->{layout}->set_height ($self->{height});
810 $self->{layout}->size
811# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
812# (
634 $self->{texture}{width}, 813# $self->{texture}{w},
635 $self->{texture}{height}, 814# $self->{texture}{h},
636 ) 815# )
816# } else {
817# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
818#
819# ($w, $h)
820# }
821}
822
823sub size_allocate {
824 my ($self, $w, $h) = @_;
825
826 return unless $self->{w} != $w || $self->{h} != $h;
827
828 $self->SUPER::size_allocate ($w, $h);
829 delete $self->{texture};
830}
831
832sub update {
833 my ($self) = @_;
834
835 delete $self->{texture};
836 $self->SUPER::update;
637} 837}
638 838
639sub _draw { 839sub _draw {
640 my ($self) = @_; 840 my ($self) = @_;
641 841
642 my $tex = $self->{texture}; 842 my $tex = $self->{texture} ||= do {
843 $self->{layout}->set_width ($self->{w});
844 new_from_layout CFClient::Texture $self->{layout}
845 };
643 846
644 glEnable GL_BLEND; 847 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
645 glEnable GL_TEXTURE_2D; 849 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 850 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649 851
650 glColor 1, 0, 0, 1; # TODO color 852 glColor @{$self->{fg}};
651 853
652 glBegin GL_QUADS; 854 my $x =
653 glTexCoord 0, 0; glVertex 0 , 0; 855 $self->{align} < 0 ? 0
654 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 856 : $self->{align} > 0 ? $self->{w} - $tex->{w}
655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 857 : ($self->{w} - $tex->{w}) * 0.5;
656 glTexCoord 1, 0; glVertex $tex->{width}, 0;
657 glEnd;
658 858
859 $tex->draw_quad ($x, 0);
860
861 glDisable GL_TEXTURE_2D;
659 glDisable GL_BLEND; 862 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D; 863 glGetError and die;
661} 864}
662 865
663package Crossfire::Client::Widget::TextEntry; 866#############################################################################
664 867
868package CFClient::UI::Entry;
869
665our @ISA = Crossfire::Client::Widget::Label::; 870our @ISA = CFClient::UI::Label::;
666 871
667use SDL; 872use SDL;
668use SDL::OpenGL; 873use SDL::OpenGL;
669 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 fg => [1, 1, 1],
880 bg => [0, 0, 0, 0.4],
881 active_bg => [1, 1, 1],
882 active_fg => [0, 0, 0],
883 @_
884 )
885}
886
887sub _set_text {
888 my ($self, $text) = @_;
889
890 $self->{last_activity} = $::NOW;
891
892 $self->{text} = $text;
893 $self->{layout}->set_width ($self->{w});
894
895 $text =~ s/./*/g if $self->{hidden};
896
897
898 $self->{layout}->set_markup ($self->escape_text ($text));
899
900 $text = substr $text, 0, $self->{cursor};
901 utf8::encode $text;
902
903 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
904}
905
906sub size_request {
907 my ($self) = @_;
908
909 my ($w, $h) = $self->SUPER::size_request;
910
911 ($w + 1, $h) # add 1 for cursor
912}
913
914sub size_allocate {
915 my ($self, $w, $h) = @_;
916
917 return unless $self->{w} != $w || $self->{h} != $h;
918
919 $self->SUPER::size_allocate ($w, $h);
920
921 $self->_set_text ($self->{text});
922}
923
924sub set_text {
925 my ($self, $text) = @_;
926
927 $self->{cursor} = length $text;
928 $self->_set_text ($text);
929 $self->update;
930}
931
670sub key_down { 932sub key_down {
671 my ($self, $ev) = @_; 933 my ($self, $ev) = @_;
672 934
673 my $mod = $ev->key_mod; 935 my $mod = $ev->key_mod;
674 my $sym = $ev->key_sym; 936 my $sym = $ev->key_sym;
675 937
676 $ev->set_unicode (1);
677 my $uni = $ev->key_unicode; 938 my $uni = $ev->key_unicode;
678 939
679 my $text = $self->get_text; 940 my $text = $self->get_text;
680 941
681 if ($sym == SDLK_BACKSPACE) { 942 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, ''; 943 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
683 944 } elsif ($sym == SDLK_DELETE) {
945 substr $text, $self->{cursor}, 1, "";
946 } elsif ($sym == SDLK_LEFT) {
947 --$self->{cursor} if $self->{cursor};
948 } elsif ($sym == SDLK_RIGHT) {
949 ++$self->{cursor} if $self->{cursor} < length $self->{text};
684 } elsif ($uni) { 950 } elsif ($uni) {
685 $text .= chr $uni; 951 substr $text, $self->{cursor}++, 0, chr $uni;
686 } 952 }
953
687 $self->set_text ($text); 954 $self->_set_text ($text);
955 $self->update;
688} 956}
689 957
958sub focus_in {
959 my ($self) = @_;
960
961 $self->{last_activity} = $::NOW;
962
963 $self->SUPER::focus_in;
964}
965
966sub button_down {
967 my ($self, $ev, $x, $y) = @_;
968
969 $self->SUPER::button_down ($ev, $x, $y);
970
971 my $idx = $self->{layout}->xy_to_index ($x, $y);
972
973 # byte-index to char-index
974 my $text = $self->{layout};
975 utf8::encode $text;
976 $self->{cursor} = length substr $text, 0, $idx;
977
978 $self->_set_text ($self->{text});
979 $self->update;
980}
981
982sub mouse_motion {
983 my ($self, $ev, $x, $y) = @_;
984# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
985}
986
987sub _draw {
988 my ($self) = @_;
989
990 local $self->{fg} = $self->{fg};
991
992 if ($FOCUS == $self) {
993 glColor @{$self->{active_bg}};
994 $self->{fg} = $self->{active_fg};
995 } else {
996 glColor @{$self->{bg}};
997 }
998
999 glBegin GL_QUADS;
1000 glVertex 0 , 0;
1001 glVertex 0 , $self->{h};
1002 glVertex $self->{w}, $self->{h};
1003 glVertex $self->{w}, 0;
1004 glEnd;
1005
1006 $self->SUPER::_draw;
1007
1008 #TODO: force update every cursor change :(
1009 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1010 glColor @{$self->{fg}};
1011 glBegin GL_LINES;
1012 glVertex $self->{cur_x}, $self->{cur_y};
1013 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1014 glEnd;
1015 }
1016}
1017
1018#############################################################################
1019
1020package CFClient::UI::Slider;
1021
1022use strict;
1023
1024use SDL::OpenGL;
1025
1026our @ISA = CFClient::UI::DrawBG::;
1027
1028sub size_request {
1029 my ($self) = @_;
1030
1031 my $w = 50;
1032 my $h = 10;
1033
1034 $self->{vertical} ? ($h, $w) : ($w, $h)
1035}
1036
1037sub new {
1038 my $class = shift;
1039
1040 # range [value, low, high, page]
1041
1042 $class->SUPER::new (
1043 fg => [1, 1, 1],
1044 active_fg => [0, 0, 0],
1045 range => [0, 0, 100, 10],
1046 vertical => 1,
1047 @_
1048 )
1049}
1050
1051sub button_down {
1052 my ($self, $ev, $x, $y) = @_;
1053
1054 $self->SUPER::button_down ($ev, $x, $y);
1055 $self->mouse_motion ($ev, $x, $y);
1056}
1057
1058sub mouse_motion {
1059 my ($self, $ev, $x, $y) = @_;
1060
1061 if ($GRAB == $self) {
1062 my ($value, $lo, $hi, $page) = @{$self->{range}};
1063
1064 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1065
1066 $x = $x * ($hi - $lo) / $w + $lo;
1067 $x = $lo if $x < $lo;
1068 $x = $hi - $page if $x > $hi - $page;
1069 $self->{range}[0] = $x;
1070
1071 $self->emit (changed => $x);
1072 $self->update;
1073 }
1074}
1075
1076sub _draw {
1077 my ($self) = @_;
1078
1079 $self->SUPER::_draw ();
1080
1081 my ($w, $h) = @$self{qw(w h)};
1082
1083 if ($self->{vertical}) {
1084 # draw a vertical slider like a rotated horizontal slider
1085
1086 glRotate 90, 0, 0, 1;
1087 glTranslate 0, -$self->{w}, 0;
1088
1089 ($w, $h) = ($h, $w);
1090 }
1091
1092 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1093 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1094
1095 my ($value, $lo, $hi, $page) = @{$self->{range}};
1096
1097 $page = int $page * $w / ($hi - $lo);
1098 $value = int +($value - $lo) * $w / ($hi - $lo);
1099
1100 $w -= $page;
1101 $page &= ~1;
1102 glTranslate $page * 0.5, 0, 0;
1103
1104 glColor @$fg;
1105 glBegin GL_LINES;
1106 glVertex 0, 0; glVertex 0, $h;
1107 glVertex $w - 1, 0; glVertex $w - 1, $h;
1108 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1109 glEnd;
1110
1111 my $knob_a = $value - $page * 0.5;
1112 my $knob_b = $value + $page * 0.5;
1113
1114 glBegin GL_QUADS;
1115 glColor @$fg;
1116 glVertex $knob_a, 0;
1117 glVertex $knob_a, $h;
1118 glVertex $knob_b, $h;
1119 glVertex $knob_b, 0;
1120
1121 if ($knob_a < $knob_b - 2) {
1122 glColor @$bg;
1123 glVertex $knob_a + 1, 1;
1124 glVertex $knob_a + 1, $h - 1;
1125 glVertex $knob_b - 1, $h - 1;
1126 glVertex $knob_b - 1, 1;
1127 }
1128 glEnd;
1129}
1130
1131#############################################################################
1132
690package Crossfire::Client::Widget::MapWidget; 1133package CFClient::UI::MapWidget;
691 1134
692use strict; 1135use strict;
693 1136
694use List::Util qw(min max); 1137use List::Util qw(min max);
695 1138
696use SDL; 1139use SDL;
697use SDL::OpenGL; 1140use SDL::OpenGL;
698use SDL::OpenGL::Constants;
699 1141
700our @ISA = Crossfire::Client::Widget::; 1142our @ISA = CFClient::UI::Base::;
1143
1144sub new {
1145 my $class = shift;
1146
1147 $class->SUPER::new (
1148 z => -1,
1149 list => (glGenLists 1),
1150 @_
1151 )
1152}
701 1153
702sub key_down { 1154sub key_down {
703 print "MAPKEYDOWN\n"; 1155 print "MAPKEYDOWN\n";
704} 1156}
705 1157
706sub key_up { 1158sub key_up {
707} 1159}
708 1160
709sub size_request { 1161sub size_request {
710 1162 (
1163 1 + int $::WIDTH / 32,
1164 1 + int $::HEIGHT / 32,
1165 )
711} 1166}
712 1167
713sub size_allocate { 1168sub update {
1169 my ($self) = @_;
1170
1171 $self->{need_update} = 1;
1172 $self->SUPER::update;
714} 1173}
715 1174
716sub _draw { 1175sub _draw {
717 my ($self) = @_; 1176 my ($self) = @_;
718 1177
1178 if (delete $self->{need_update}) {
1179 glNewList $self->{list}, GL_COMPILE;
1180
719 my $mx = $::CONN->{mapx}; 1181 my $mx = $::CONN->{mapx};
720 my $my = $::CONN->{mapy}; 1182 my $my = $::CONN->{mapy};
721 1183
722 my $map = $::CONN->{map}; 1184 my $map = $::CONN->{map};
723 1185
724 my ($xofs, $yofs); 1186 my ($xofs, $yofs);
725 1187
726 my $sw = 1 + int $::WIDTH / 32; 1188 my $sw = 1 + int $::WIDTH / 32;
727 my $sh = 1 + int $::HEIGHT / 32; 1189 my $sh = 1 + int $::HEIGHT / 32;
728 1190
729 if ($::CONN->{mapw} > $sw) { 1191 if ($::CONN->{mapw} > $sw) {
730 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1192 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
731 } else { 1193 } else {
732 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1194 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
733 } 1195 }
734 1196
735 if ($::CONN->{maph} > $sh) { 1197 if ($::CONN->{maph} > $sh) {
736 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1198 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
737 } else { 1199 } else {
738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1200 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
739 } 1201 }
740 1202
741 glEnable GL_TEXTURE_2D; 1203 glEnable GL_TEXTURE_2D;
742 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 1207
745 my $sw4 = ($sw + 3) & ~3; 1208 my $sw4 = ($sw + 3) & ~3;
746 my $lighting = "\x00" x ($sw4 * $sh); 1209 my $darkness = "\x00" x ($sw4 * $sh);
747 1210
748 for my $x (0 .. $sw - 1) { 1211 for my $x (0 .. $sw - 1) {
1212 my $row = $map->[$x + $xofs];
749 for my $y (0 .. $sh - 1) { 1213 for my $y (0 .. $sh - 1) {
750 1214
751 my $cell = $map->[$x + $xofs][$y + $yofs] 1215 my $cell = $row->[$y + $yofs]
752 or next; 1216 or next;
753 1217
754 my $darkness = $cell->[0] * (1 / 255); 1218 my $dark = $cell->[0];
755 if ($darkness < 0) { 1219 if ($dark < 0) {
756 $darkness = 0.15; 1220 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1221 } else {
1222 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
757 } 1223 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759 1224
760 for my $num (grep $_, @$cell[1,2,3]) { 1225 for my $num (grep $_, @$cell[1,2,3]) {
761 my $tex = $::CONN->{face}[$num]{texture} || next; 1226 my $tex = $::CONN->{face}[$num]{texture} || next;
1227
1228 my ($w, $h) = @$tex{qw(w h)};
762 1229
763 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1230 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
764
765 my $w = $tex->{width};
766 my $h = $tex->{height};
767
768 my $px = ($x + 1) * 32 - $w;
769 my $py = ($y + 1) * 32 - $h;
770
771 glBegin GL_QUADS;
772 glTexCoord 0, 0; glVertex $px , $py;
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; 1231 }
777 } 1232 }
778 } 1233 }
779 }
780 1234
781# if (1) { # higher quality darkness 1235# if (1) { # higher quality darkness
782# $lighting =~ s/(.)/$1$1$1/gs; 1236# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1237# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784# 1238#
… …
786# 1240#
787# $lighting = $pb->get_pixels; 1241# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs; 1242# $lighting =~ s/(.)../$1/gs;
789# } 1243# }
790 1244
791 $lighting = new Crossfire::Client::Texture
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glColor 0, 0, 0, 0.75;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name};
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
808 glEnd;
809 1246
1247 $darkness = new CFClient::Texture
1248 w => $sw4,
1249 h => $sh,
1250 data => $darkness,
1251 internalformat => GL_ALPHA,
1252 format => GL_ALPHA;
1253
1254 glColor 0.45, 0.45, 0.45, 1;
1255 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1256
810 glDisable GL_TEXTURE_2D; 1257 glDisable GL_TEXTURE_2D;
811 glDisable GL_BLEND; 1258 glDisable GL_BLEND;
1259
1260 glEndList;
1261 }
1262
1263 glCallList $self->{list};
812} 1264}
813 1265
814my %DIR = ( 1266my %DIR = (
815 SDLK_KP8, [1, "north"], 1267 SDLK_KP8, [1, "north"],
816 SDLK_KP9, [2, "northeast"], 1268 SDLK_KP9, [2, "northeast"],
… …
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1312 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop"); 1313 $::CONN->send ("command run_stop");
862 } 1314 }
863} 1315}
864 1316
865package Crossfire::Client::Widget::Animator; 1317#############################################################################
1318
1319package CFClient::UI::Animator;
866 1320
867use SDL::OpenGL; 1321use SDL::OpenGL;
868 1322
869our @ISA = Crossfire::Client::Widget::Bin::; 1323our @ISA = CFClient::UI::Bin::;
870 1324
871sub moveto { 1325sub moveto {
872 my ($self, $x, $y) = @_; 1326 my ($self, $x, $y) = @_;
873 1327
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1328 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.2; 1329 $self->{speed} = 0.001;
876 $self->{time} = 1; 1330 $self->{time} = 1;
877 1331
878 ::animation_start $self; 1332 ::animation_start $self;
879} 1333}
880 1334
… …
895 1349
896sub _draw { 1350sub _draw {
897 my ($self) = @_; 1351 my ($self) = @_;
898 1352
899 glPushMatrix; 1353 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 1354 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 1355 $self->{children}[0]->draw;
902 glPopMatrix; 1356 glPopMatrix;
903} 1357}
904 1358
9051; 1359#############################################################################
906 1360
1361package CFClient::UI::Toplevel;
1362
1363our @ISA = CFClient::UI::Container::;
1364
1365sub size_request {
1366 ($::WIDTH, $::HEIGHT)
1367}
1368
1369sub size_allocate {
1370 my ($self, $w, $h) = @_;
1371
1372 $self->SUPER::size_allocate ($w, $h);
1373
1374 $_->size_allocate ($_->size_request)
1375 for @{$self->{children}};
1376}
1377
1378sub translate {
1379 my ($self, $x, $y) = @_;
1380
1381 ($x, $y)
1382}
1383
1384sub update {
1385 my ($self) = @_;
1386
1387 $self->size_allocate ($self->size_request);
1388 ::refresh ();
1389}
1390
1391sub add {
1392 my ($self, $widget) = @_;
1393
1394 $self->SUPER::add ($widget);
1395
1396 $widget->size_allocate ($widget->size_request);
1397}
1398
1399sub draw {
1400 my ($self) = @_;
1401
1402 $self->_draw;
1403}
1404
1405#############################################################################
1406
1407package CFClient::UI;
1408
1409$TOPLEVEL = new CFClient::UI::Toplevel;
1410
14111
1412

Diff Legend

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