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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC

… …
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use Crossfire::Client;
11#our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
16sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
40 $self->{y} = $y; 27 $self->{y} = $y;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $::FOCUS = $widget;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
… …
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 0.4;
86 glEnable GL_BLEND;
87 glBegin GL_QUADS;
88 glVertex 0, 0;
89 glVertex $self->{w} - 1, 0;
90 glVertex $self->{w} - 1, $self->{h} - 1;
91 glVertex 0, $self->{h} - 1;
92 glEnd;
93 glDisable GL_BLEND;
94 }
89 glPopMatrix; 95 glPopMatrix;
90} 96}
91 97
92sub _draw { 98sub _draw {
93 my ($widget) = @_; 99 my ($self) = @_;
100
101 warn "no draw defined for $self\n";
94} 102}
95 103
96sub bbox { 104sub bbox {
97 my ($self) = @_; 105 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 106 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 110 $self->{x} = $w,
103 $self->{y} = $h 111 $self->{y} = $h
104 ) 112 )
105} 113}
106 114
115sub find_widget {
116 my ($self, $x, $y) = @_;
117
118 return $self
119 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
120 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
121
122 ()
123}
124
107sub del_parent { $_[0]->{parent} = undef } 125sub del_parent { $_[0]->{parent} = undef }
108 126
109sub set_parent { 127sub set_parent {
110 my ($self, $par) = @_; 128 my ($self, $par) = @_;
111 129
… …
128 my ($self) = @_; 146 my ($self) = @_;
129 147
130 #$self->deactivate; 148 #$self->deactivate;
131} 149}
132 150
151#############################################################################
152
153package Crossfire::Client::Widget::Container;
154
155our @ISA = Crossfire::Client::Widget::;
156
157sub new {
158 my ($class, @widgets) = @_;
159
160 my $self = $class->SUPER::new (children => []);
161 $self->add ($_) for @widgets;
162
163 $self
164}
165
166sub add {
167 my ($self, $chld, $expand) = @_;
168
169 $chld->{expand} = $expand;
170 $chld->set_parent ($self);
171
172 @{$self->{children}} =
173 sort { $a->{z} <=> $b->{z} }
174 @{$self->{children}}, $chld;
175
176 $self->size_allocate ($self->{w}, $self->{h})
177 if $self->{w}; #TODO: check for "realised state"
178}
179
180sub remove {
181 my ($self, $widget) = @_;
182
183 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
184
185 $self->size_allocate ($self->{w}, $self->{h});
186}
187
188sub find_widget {
189 my ($self, $x, $y) = @_;
190
191 $x -= $self->{x};
192 $y -= $self->{y};
193
194 my $res;
195
196 for (reverse @{ $self->{children} }) {
197 $res = $_->find_widget ($x, $y)
198 and return $res;
199 }
200
201 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
202}
203
204sub _draw {
205 my ($self) = @_;
206
207 $_->draw for @{$self->{children}};
208}
209
210#############################################################################
211
133package Crossfire::Client::Widget::Bin; 212package Crossfire::Client::Widget::Bin;
134 213
135our @ISA = Crossfire::Client::Widget::; 214our @ISA = Crossfire::Client::Widget::Container::;
136 215
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
138
139sub get { $_[0]->{child} } 216sub child { $_[0]->{children}[0] }
140
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 217
147sub size_request { 218sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
149} 220}
150 221
151sub _draw { 222sub size_allocate {
152 my ($self) = @_; 223 my ($self, $w, $h) = @_;
153 224
154 $self->{child}->draw; 225 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h)
227 if $self->{children}[0]
155} 228}
229
230#############################################################################
156 231
157package Crossfire::Client::Widget::Toplevel; 232package Crossfire::Client::Widget::Toplevel;
158 233
234our @ISA = Crossfire::Client::Widget::Container::;
235
236sub update {
237 my ($self) = @_;
238
239 ::refresh ();
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
250#############################################################################
251
252package Crossfire::Client::Widget::Window;
253
159our @ISA = Crossfire::Client::Widget::; 254our @ISA = Crossfire::Client::Widget::Bin::;
160 255
161use SDL::OpenGL; 256use SDL::OpenGL;
162 257
163sub add { 258sub new {
164 my ($self, $chld) = @_; 259 my ($class, $x, $y, $z, $w, $h) = @_;
165 260
166 push @{$self->{childs}}, $chld; 261 my $self = $class->SUPER::new;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170 262
171 $chld->set_parent ($self); 263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 264}
181 265
182sub update { 266sub update {
183 my ($self) = @_; 267 my ($self) = @_;
184 ::refresh ();
185}
186 268
187sub _draw {
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 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
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; 269 $self->render_chld;
270 $self->SUPER::update;
215} 271}
216 272
217sub render_chld { 273sub render_chld {
218 my ($self) = @_; 274 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 275
222 $self->{texture} = 276 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl ( 277 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw } 278 $self->{w}, $self->{h}, sub { $self->child->draw }
225 ); 279 );
226 $self->{texture}->upload;
227} 280}
228 281
229sub size_request { 282sub size_allocate {
230 my ($self) = @_; 283 my ($self, $w, $h) = @_;
231 my $chld = $self->get 284
232 or return (0, 0); 285 $self->{w} = $w;
233 $chld->size_request 286 $self->{h} = $h;
287
288 $self->child->size_allocate ($w, $h);
289
290 $self->render_chld;
234} 291}
235 292
236sub _draw { 293sub _draw {
237 my ($self) = @_; 294 my ($self) = @_;
238 295
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 296 my ($w, $h) = ($self->w, $self->h);
240 297
241 my $tex = $self->{texture} 298 my $tex = $self->{texture}
242 or return; 299 or return;
243 300
244 glEnable GL_BLEND; 301 glEnable GL_BLEND;
… …
255 312
256 glDisable GL_BLEND; 313 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 314 glDisable GL_TEXTURE_2D;
258} 315}
259 316
317#############################################################################
318
260package Crossfire::Client::Widget::Frame; 319package Crossfire::Client::Widget::Frame;
261 320
262our @ISA = Crossfire::Client::Widget::Bin::; 321our @ISA = Crossfire::Client::Widget::Bin::;
263 322
264use SDL::OpenGL; 323use SDL::OpenGL;
265 324
266sub size_request { 325sub size_request {
267 my ($self) = @_; 326 my ($self) = @_;
268 my $chld = $self->get 327 my $chld = $self->child
269 or return (0, 0); 328 or return (0, 0);
270 329
271 $chld->move (2, 2); 330 $chld->move (2, 2);
272 331
273 map { $_ + 4 } $chld->size_request; 332 map { $_ + 4 } $chld->size_request;
274} 333}
275 334
335sub size_allocate {
336 my ($self, $w, $h) = @_;
337
338 $self->{w} = $w;
339 $self->{h} = $h;
340
341 $self->child->size_allocate ($w - 4, $h - 4);
342 $self->child->move (2, 2);
343}
344
276sub _draw { 345sub _draw {
277 my ($self) = @_; 346 my ($self) = @_;
278 347
279 my $chld = $self->get; 348 my $chld = $self->child;
280 349
281 my ($w, $h) = $chld->size_request; 350 my ($w, $h) = $chld->size_request;
282 351
283 glBegin GL_QUADS; 352 glBegin GL_QUADS;
284 glColor 0, 0, 0; 353 glColor 0, 0, 0;
… …
289 glEnd; 358 glEnd;
290 359
291 $chld->draw; 360 $chld->draw;
292} 361}
293 362
363#############################################################################
364
294package Crossfire::Client::Widget::FancyFrame; 365package Crossfire::Client::Widget::FancyFrame;
295 366
296our @ISA = Crossfire::Client::Widget::Frame::; 367our @ISA = Crossfire::Client::Widget::Bin::;
297 368
298use SDL::OpenGL; 369use SDL::OpenGL;
299 370
300sub new { 371my @tex =
301 my ($self, $theme) = @_;
302 $self = $self->SUPER::new;
303
304 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
307 ];
308 $self
309
310}
311 374
312sub size_request { 375sub size_request {
313 my ($self) = @_; 376 my ($self) = @_;
377
314 my ($w, $h) = $self->get->size_request; 378 my ($w, $h) = $self->SUPER::size_request;
315 379
316 $h += $self->{txts}->[1]->{height}; 380 $h += $tex[1]->{height};
317 $h += $self->{txts}->[4]->{height}; 381 $h += $tex[4]->{height};
318 $w += $self->{txts}->[2]->{width}; 382 $w += $tex[2]->{width};
319 $w += $self->{txts}->[3]->{width}; 383 $w += $tex[3]->{width};
320
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322 384
323 ($w, $h) 385 ($w, $h)
324} 386}
325 387
388sub size_allocate {
389 my ($self, $w, $h) = @_;
390
391 $self->SUPER::size_allocate ($w, $h);
392
393 $h -= $tex[1]->{height};
394 $h -= $tex[4]->{height};
395 $w -= $tex[2]->{width};
396 $w -= $tex[3]->{width};
397
398 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w;
400
401 $self->child->size_allocate ($w, $h);
402 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
403}
404
326sub _draw { 405sub _draw {
327 my ($self) = @_; 406 my ($self) = @_;
328 407
329 my ($w, $h) = $self->size_request; 408 my ($w, $h) = ($self->{w}, $self->{h});
330 my ($cw, $ch) = $self->get->size_request; 409 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
331 410
332 glEnable GL_BLEND; 411 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 412 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336 415
337
338 my $top = $self->{txts}->[1]; 416 my $top = $tex[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name}; 417 glBindTexture GL_TEXTURE_2D, $top->{name};
340 418
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS; 419 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0; 420 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height}; 421 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height}; 422 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0; 423 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd; 424 glEnd;
349 425
350 my $left = $self->{txts}->[3]; 426 my $left = $tex[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name}; 427 glBindTexture GL_TEXTURE_2D, $left->{name};
352 428
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS; 429 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height}; 430 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd; 434 glEnd;
361 435
362 my $right = $self->{txts}->[2]; 436 my $right = $tex[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name}; 437 glBindTexture GL_TEXTURE_2D, $right->{name};
364 438
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS; 439 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height}; 443 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd; 444 glEnd;
373 445
374 my $bottom = $self->{txts}->[4]; 446 my $bottom = $tex[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 447 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376 448
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS; 449 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h; 451 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h; 452 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd; 454 glEnd;
385 455
386 my $bg = $self->{txts}->[0]; 456 my $bg = $tex[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name}; 457 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390 461
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width}; 462 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height}; 463 my $rep_y = $ch / $bg->{height};
395 464
396 glBegin GL_QUADS; 465 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd; 470 glEnd;
402
403 $self->get->draw;
404 471
405 glDisable GL_BLEND; 472 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 473 glDisable GL_TEXTURE_2D;
474
475 $self->child->draw;
476
407} 477}
478
479#############################################################################
408 480
409package Crossfire::Client::Widget::Table; 481package Crossfire::Client::Widget::Table;
410 482
411our @ISA = Crossfire::Client::Widget::Bin::; 483our @ISA = Crossfire::Client::Widget::Bin::;
412 484
413use SDL::OpenGL; 485use SDL::OpenGL;
414 486
415sub add { 487sub add {
416 my ($self, $x, $y, $chld) = @_; 488 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x]; 489 my $old_chld = $self->{children}[$y][$x];
418 490
419 $self->{childs}[$y][$x] = $chld; 491 $self->{children}[$y][$x] = $chld;
420 $chld->set_parent ($self); 492 $chld->set_parent ($self);
421 $self->update; 493 $self->update;
422} 494}
423 495
424sub max_row_height { 496sub max_row_height {
425 my ($self, $row) = @_; 497 my ($self, $row) = @_;
426 498
427 my $hs = 0; 499 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 500 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi]; 501 my $c = $self->{children}->[$row]->[$xi];
430 if ($c) { 502 if ($c) {
431 my ($w, $h) = $c->size_request; 503 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h } 504 if ($hs < $h) { $hs = $h }
433 } 505 }
434 } 506 }
… …
437 509
438sub max_col_width { 510sub max_col_width {
439 my ($self, $col) = @_; 511 my ($self, $col) = @_;
440 512
441 my $ws = 0; 513 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 514 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col]; 515 my $c = ($self->{children}->[$yi] || [])->[$col];
444 if ($c) { 516 if ($c) {
445 my ($w, $h) = $c->size_request; 517 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w } 518 if ($ws < $w) { $ws = $w }
447 } 519 }
448 } 520 }
… …
452sub size_request { 524sub size_request {
453 my ($self) = @_; 525 my ($self) = @_;
454 526
455 my ($hs, $ws) = (0, 0); 527 my ($hs, $ws) = (0, 0);
456 528
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 529 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 $hs += $self->max_row_height ($yi); 530 $hs += $self->max_row_height ($yi);
459 } 531 }
460 532
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
462 my $wm = 0; 534 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 535 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi) 536 $wm += $self->max_col_width ($xi)
465 } 537 }
466 if ($ws < $wm) { $ws = $wm } 538 if ($ws < $wm) { $ws = $wm }
467 } 539 }
468 540
… …
471 543
472sub _draw { 544sub _draw {
473 my ($self) = @_; 545 my ($self) = @_;
474 546
475 my $y = 0; 547 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 548 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
477 my $x = 0; 549 my $x = 0;
478 550
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 551 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
480 552
481 my $c = $self->{childs}->[$yi]->[$xi]; 553 my $c = $self->{children}->[$yi]->[$xi];
482 if ($c) { 554 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request 555 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c; 556 $c->draw if $c;
485 } 557 }
486 558
… …
489 561
490 $y += $self->max_row_height ($yi); 562 $y += $self->max_row_height ($yi);
491 } 563 }
492} 564}
493 565
566#############################################################################
567
494package Crossfire::Client::Widget::VBox; 568package Crossfire::Client::Widget::VBox;
495 569
496our @ISA = Crossfire::Client::Widget::Bin::; 570our @ISA = Crossfire::Client::Widget::Container::;
497 571
498use SDL::OpenGL; 572use SDL::OpenGL;
499 573
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request { 574sub size_request {
508 my ($self) = @_; 575 my ($self) = @_;
509 576
510 my ($hs, $ws) = (0, 0); 577 my @alloc = map [$_->size_request], @{$self->{children}};
578
579 (
580 (List::Util::max map $_->[0], @alloc),
581 (List::Util::sum map $_->[1], @alloc),
582 )
583}
584
585sub size_allocate {
586 my ($self, $w, $h) = @_;
587
588 $self->w ($w);
589 $self->h ($h);
590
591 my $exp;
592 my @oth;
593 # find expand widget
511 for (@{$self->{childs} || []}) { 594 for (@{$self->{children}}) {
595 if ($_->{expand}) {
596 $exp = $_;
597 last;
598 }
599 push @oth, $_;
600 }
601
602 my ($ow, $oh);
603
604 # get sizes of other widgets
605 for (@oth) {
512 my ($w, $h) = $_->size_request; 606 my ($w, $h) = $_->size_request;
513 $hs += $h; 607 $oh += $h;
514 if ($ws < $w) { $ws = $w } 608 if ($ow < $w) { $ow = $w }
515 } 609 }
516 610
517 return ($ws, $hs); 611 my $y = 0;
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) { 612 for (@{$self->{children}}) {
525 $_->move (0, $y, 0); #TODO: move to size_request 613 $_->move (0, $y);
526 $_->draw; 614
615 if ($_ == $exp) {
616 $_->size_allocate ($w, $h - $oh);
617 $y += $h - $oh;
618 } else {
527 my ($w, $h) = $_->size_request; 619 my ($cw, $h) = $_->size_request;
620 $_->size_allocate ($w, $h);
528 $y += $h; 621 $y += $h;
622 }
529 } 623 }
530} 624}
625
626#############################################################################
531 627
532package Crossfire::Client::Widget::Label; 628package Crossfire::Client::Widget::Label;
533 629
534our @ISA = Crossfire::Client::Widget::; 630our @ISA = Crossfire::Client::Widget::;
535 631
… …
579 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name}; 678 glBindTexture GL_TEXTURE_2D, $tex->{name};
583 679
584 glColor 1, 1, 1, 0.6; # TODO color 680 glColor 1, 0, 0, 1; # TODO color
585 681
586 glBegin GL_QUADS; 682 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0; 683 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 684 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 685 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
592 688
593 glDisable GL_BLEND; 689 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D; 690 glDisable GL_TEXTURE_2D;
595} 691}
596 692
693#############################################################################
694
597package Crossfire::Client::Widget::TextEntry; 695package Crossfire::Client::Widget::TextEntry;
598 696
599our @ISA = Crossfire::Client::Widget::Label::; 697our @ISA = Crossfire::Client::Widget::Label::;
600 698
601use SDL; 699use SDL;
… …
619 $text .= chr $uni; 717 $text .= chr $uni;
620 } 718 }
621 $self->set_text ($text); 719 $self->set_text ($text);
622} 720}
623 721
624 722#############################################################################
625# XXX: TextView isn't neccessary with pango multiline text rendering
626package Crossfire::Client::Widget::TextView;
627
628use strict;
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_;
637 my $self = $class->SUPER::new ();
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646}
647
648#sub render_lines {
649# my ($self) = @_;
650#
651# $self->{txt_lines} = [];
652#
653# for (@{$self->{lines}}) {
654# push @{$self->{txt_lines}},
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687
688 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692 glTexCoord 1, 0; glVertex $tex->{width}, $y;
693 glEnd;
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711}
712 723
713package Crossfire::Client::Widget::MapWidget; 724package Crossfire::Client::Widget::MapWidget;
714 725
715use strict; 726use strict;
716 727
… …
725sub key_down { 736sub key_down {
726 print "MAPKEYDOWN\n"; 737 print "MAPKEYDOWN\n";
727} 738}
728 739
729sub key_up { 740sub key_up {
741}
742
743sub size_request {
744
745}
746
747sub size_allocate {
730} 748}
731 749
732sub _draw { 750sub _draw {
733 my ($self) = @_; 751 my ($self) = @_;
734 752
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 894 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 895 $::CONN->send ("command run_stop");
878 } 896 }
879} 897}
880 898
899#############################################################################
900
881package Crossfire::Client::Widget::Animator; 901package Crossfire::Client::Widget::Animator;
882 902
883use SDL::OpenGL; 903use SDL::OpenGL;
884 904
885our @ISA = Crossfire::Client::Widget::Bin::; 905our @ISA = Crossfire::Client::Widget::Bin::;
886 906
887sub moveto { 907sub moveto {
888 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
889 909
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 910 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 911 $self->{speed} = 0.2;
892 $self->{time} = 1; 912 $self->{time} = 1;
893 913
894 ::animation_start $self; 914 ::animation_start $self;
895} 915}
896 916
… …
912sub _draw { 932sub _draw {
913 my ($self) = @_; 933 my ($self) = @_;
914 934
915 glPushMatrix; 935 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 936 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw; 937 $self->{children}[0]->draw;
918 glPopMatrix; 938 glPopMatrix;
919} 939}
920 940
9211; 9411;
922 942

Diff Legend

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